Imported Debian patch 1.2.2-24

diff --git a/debian/changelog b/debian/changelog
index 576a841945b16a1fd4d3fe5b65733ef9f9b80a18..b80f9bcf225fb3520899c0725d350c3d165e7aea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+beep (1.2.2-24) unstable; urgency=low
+
+  * Apply patch from Frans Pop for making beep-udeb depend on libc6-udeb
+    instead of libc6 (closes: #562001)
+  * Bump Standards-Version to 3.8.3.
+
+ -- Gerfried Fuchs <rhonda@debian.at>  Mon, 21 Dec 2009 23:20:38 +0100
+
 beep (1.2.2-23) unstable; urgency=low
 
   * Updated translation:

diff --git a/debian/control b/debian/control
index c42456e3b3cf8b9e2e6d8ebd97fef63775c5c404..fc9d41f3b3282c96f1a20582cd6b613add5f4fce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Gerfried Fuchs <rhonda@debian.at>
 Build-Depends: po-debconf, patch, quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://johnath.com/beep/
 
 Package: beep

diff --git a/debian/rules b/debian/rules
index 9b0ba2a8f20d7b43738bce4db4a11c6eb48ed56a..8e970f6cd798d71e7156c790d3c001565f4eb125 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ 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
 
 
@@ -48,7 +48,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)
@@ -86,13 +86,15 @@ binary-arch: build install
        $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \
                $(TMP1)/DEBIAN
        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) \
+       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