r30928 - in /desktop/unstable/esound/debian: changelog compat control control.in esound-common.install libesd0-dev.install libesd0.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Oct 21 22:51:09 UTC 2011 

Author: biebl
Date: Fri Oct 21 22:51:08 2011
New Revision: 30928

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30928
Log:
* Transition to multiarch, thanks Steve. Closes: #645978
* Drop the libtool .la file, since we break existing references anyway.

Modified:
    desktop/unstable/esound/debian/changelog
    desktop/unstable/esound/debian/compat
    desktop/unstable/esound/debian/control
    desktop/unstable/esound/debian/control.in
    desktop/unstable/esound/debian/esound-common.install
    desktop/unstable/esound/debian/libesd0-dev.install
    desktop/unstable/esound/debian/libesd0.install
    desktop/unstable/esound/debian/rules

Modified: desktop/unstable/esound/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/changelog?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/changelog [utf-8] (original)
+++ desktop/unstable/esound/debian/changelog [utf-8] Fri Oct 21 22:51:08 2011
@@ -1,6 +1,8 @@
 esound (0.2.41-10) UNRELEASED; urgency=low
 
   * Switch to dpkg source format 3.0 (quilt).
+  * Transition to multiarch, thanks Steve. Closes: #645978
+  * Drop the libtool .la file, since we break existing references anyway.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 22 Oct 2011 00:44:12 +0200
 

Modified: desktop/unstable/esound/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/compat?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/compat [utf-8] (original)
+++ desktop/unstable/esound/debian/compat [utf-8] Fri Oct 21 22:51:08 2011
@@ -1,1 +1,1 @@
-5
+9

Modified: desktop/unstable/esound/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/control?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/control [utf-8] (original)
+++ desktop/unstable/esound/debian/control [utf-8] Fri Oct 21 22:51:08 2011
@@ -13,14 +13,15 @@
                libasound2-dev [linux-any],
                libwrap0-dev,
                pkg-config,
-               debhelper (>> 5),
-               cdbs,
+               debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools (>= 0.7)
 Build-Depends-Indep: docbook-utils,
                      docbook-xml
 
 Package: esound-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Conflicts: libesd-alsa0
 Description: Enlightened Sound Daemon - Common files
@@ -31,6 +32,8 @@
 
 Package: libesd0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -45,6 +48,7 @@
 
 Package: libesd0-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libesd0 (= ${binary:Version}),

Modified: desktop/unstable/esound/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/control.in?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/control.in [utf-8] (original)
+++ desktop/unstable/esound/debian/control.in [utf-8] Fri Oct 21 22:51:08 2011
@@ -8,14 +8,15 @@
                libasound2-dev [linux-any],
                libwrap0-dev,
                pkg-config,
-               debhelper (>> 5),
-               cdbs,
+               debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools (>= 0.7)
 Build-Depends-Indep: docbook-utils,
                      docbook-xml
 
 Package: esound-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Conflicts: libesd-alsa0
 Description: Enlightened Sound Daemon - Common files
@@ -26,6 +27,8 @@
 
 Package: libesd0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -40,6 +43,7 @@
 
 Package: libesd0-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libesd0 (= ${binary:Version}),

Modified: desktop/unstable/esound/debian/esound-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/esound-common.install?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/esound-common.install [utf-8] (original)
+++ desktop/unstable/esound/debian/esound-common.install [utf-8] Fri Oct 21 22:51:08 2011
@@ -1,1 +1,1 @@
-debian/tmp/etc
+etc

Modified: desktop/unstable/esound/debian/libesd0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/libesd0-dev.install?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/libesd0-dev.install [utf-8] (original)
+++ desktop/unstable/esound/debian/libesd0-dev.install [utf-8] Fri Oct 21 22:51:08 2011
@@ -1,8 +1,7 @@
-debian/tmp/usr/lib/libesd.so
-debian/tmp/usr/lib/libesd.la
-debian/tmp/usr/lib/libesd.a
-debian/tmp/usr/include
-debian/tmp/usr/bin/esd-config
-debian/tmp/usr/share/aclocal
-debian/tmp/usr/share/man/man1/esd-config.1
-debian/tmp/usr/lib/pkgconfig
+usr/lib/*/libesd.so
+usr/lib/*/libesd.a
+usr/include
+usr/bin/esd-config
+usr/share/aclocal
+usr/share/man/man1/esd-config.1
+usr/lib/*/pkgconfig

Modified: desktop/unstable/esound/debian/libesd0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/libesd0.install?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/libesd0.install [utf-8] (original)
+++ desktop/unstable/esound/debian/libesd0.install [utf-8] Fri Oct 21 22:51:08 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libesd.so.*
+usr/lib/*/libesd.so.*

Modified: desktop/unstable/esound/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/rules?rev=30928&op=diff
==============================================================================
--- desktop/unstable/esound/debian/rules [utf-8] (original)
+++ desktop/unstable/esound/debian/rules [utf-8] Fri Oct 21 22:51:08 2011
@@ -6,7 +6,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-ipv6 --with-libwrap
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-ipv6 --with-libwrap \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libesd0 (>= 0.2.35)"
 DEB_DH_MAKESHLIBS_ARGS_esound-clients := --no-act

More information about the pkg-gnome-commits mailing list