X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=debian%2Frules;h=4ff16bbb5661881d36ff210505954387cfb05dbe;hb=2a3258edf777ccf031a5146672d063a020221cca;hp=b21dd92dd3f53857ba5c04fe22a4c94951838612;hpb=9e8d18de54fb7e483d6a041c40b781e34fa630ca;p=pkg%2Fbeep.git

diff --git a/debian/rules b/debian/rules
index b21dd92..4ff16bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules file for beep
-# copyright 2002++ by Gerfried Fuchs <rhonda@debian.at>
-# Licenced the same way as beep itself
+# copyright 2002-2011 by Rhonda D'Vine <rhonda@debian.org>
+# Licenced under WTFPLv2
 
 PKG1 = beep
 TMP1 = $(CURDIR)/debian/$(PKG1)
@@ -34,11 +34,13 @@ include /usr/share/quilt/quilt.make
 clean: unpatch
 	$(checkdir)
 	$(checkroot)
-	-rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp
+	-rm -rf $(TMP1) $(TMP2) debian/$(PKG1).substvars debian/$(PKG2).substvars debian/files build-stamp
 	[ ! -f beep ] || $(MAKE) clean
 
 
-build: build-stamp
+build: build-arch
+build-arch: build-stamp
+build-indep:
 build-stamp: patch
 	$(checkdir)
 	$(MAKE) FLAGS="$(FLAGS)"
@@ -48,7 +50,7 @@ build-stamp: patch
 install: build
 	$(checkdir)
 	$(checkroot)
-	-rm -rf $(TMP1) $(TMP2) debian/substvars
+	-rm -rf $(TMP1) $(TMP2) debian/$(PKG1).substvars debian/$(PKG2).substvars
 	$(INSTALL_DIR) $(TMP1)
 	cd $(TMP1) && $(INSTALL_DIR) usr/bin usr/share/man/man1 \
 		usr/share/doc/$(PKG1)
@@ -77,8 +79,7 @@ binary-indep: build
 binary-arch: build install
 	$(checkdir)
 	$(checkroot)
-	$(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP1)/usr/share/lintian/overrides \
-		$(TMP2)/DEBIAN
+	$(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP2)/DEBIAN
 	$(INSTALL_FILE) debian/README.Debian debian/copyright \
 		$(TMP1)/usr/share/doc/$(PKG1)
 	$(INSTALL_FILE) debian/changelog \
@@ -86,17 +87,17 @@ binary-arch: build install
 	gzip -9 $(TMP1)/usr/share/doc/$(PKG1)/changelog.Debian
 	$(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \
 		$(TMP1)/DEBIAN
-	$(INSTALL_FILE) debian/overrides \
-		$(TMP1)/usr/share/lintian/overrides/$(PKG1)
 	po2debconf debian/templates > $(TMP1)/DEBIAN/templates
-	dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP1)/usr/bin/beep
-	dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG1) \
+	dpkg-shlibdeps -Tdebian/$(PKG1).substvars -dDepends $(TMP1)/usr/bin/beep
+	dpkg-gencontrol -ldebian/changelog -isp -Tdebian/$(PKG1).substvars -p$(PKG1) \
 		-P$(TMP1)
 	cd $(TMP1) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
 		xargs -r0 md5sum > DEBIAN/md5sums
 	dpkg --build $(TMP1) ..
-	dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -p$(PKG2) \
-		-P$(TMP2) -n$(PKG2)_$(VERSION)_$(ARCH).udeb
+	dpkg-shlibdeps -Tdebian/$(PKG2).substvars -dDepends -tudeb \
+		$(TMP2)/usr/bin/beep
+	dpkg-gencontrol -ldebian/changelog -isp -Tdebian/$(PKG2).substvars -p$(PKG2) \
+		-P$(TMP2) -UHomepage -n$(PKG2)_$(VERSION)_$(ARCH).udeb
 	dpkg --build $(TMP2) ../$(PKG2)_$(VERSION)_$(ARCH).udeb