r36179 - in /desktop/experimental/startup-notification/debian: changelog control control.in libstartup-notification0-dev.install libstartup-notification0.install rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Thu Oct 25 11:57:44 2012
New Revision: 36179

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36179
Log:
Convert to multi-arch (based on Riku Voipio's work in Ubuntu; LP: #910856)

Modified:
    desktop/experimental/startup-notification/debian/changelog
    desktop/experimental/startup-notification/debian/control
    desktop/experimental/startup-notification/debian/control.in
    desktop/experimental/startup-notification/debian/libstartup-notification0-dev.install
    desktop/experimental/startup-notification/debian/libstartup-notification0.install
    desktop/experimental/startup-notification/debian/rules

Modified: desktop/experimental/startup-notification/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/startup-notification/debian/changelog?rev=36179&op=diff
==============================================================================
--- desktop/experimental/startup-notification/debian/changelog [utf-8] (original)
+++ desktop/experimental/startup-notification/debian/changelog [utf-8] Thu Oct 25 11:57:44 2012
@@ -1,6 +1,7 @@
 startup-notification (0.12-2) UNRELEASED; urgency=low
 
   * Upgrade to debhelper 9, for compressed debug symbols (when added)
+  * Convert to multi-arch (based on Riku Voipio's work in Ubuntu; LP: #910856)
 
  -- Simon McVittie <smcv at debian.org>  Thu, 25 Oct 2012 12:48:57 +0100
 

Modified: desktop/experimental/startup-notification/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/startup-notification/debian/control?rev=36179&op=diff
==============================================================================
--- desktop/experimental/startup-notification/debian/control [utf-8] (original)
+++ desktop/experimental/startup-notification/debian/control [utf-8] Thu Oct 25 11:57:44 2012
@@ -9,8 +9,8 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Loic Minier <lool at dooz.org>
 Standards-Version: 3.9.2
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5), 
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9), 
                libx11-dev, 
                libxt-dev, 
                pkg-config,
@@ -23,6 +23,8 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/
 
 Package: libstartup-notification0
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -36,6 +38,7 @@
 
 Package: libstartup-notification0-dev
 Section: libdevel
+Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends}, libstartup-notification0 (= ${binary:Version}), libx11-dev, pkg-config
 Description: library for program launch feedback (development headers)

Modified: desktop/experimental/startup-notification/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/startup-notification/debian/control.in?rev=36179&op=diff
==============================================================================
--- desktop/experimental/startup-notification/debian/control.in [utf-8] (original)
+++ desktop/experimental/startup-notification/debian/control.in [utf-8] Thu Oct 25 11:57:44 2012
@@ -4,7 +4,7 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.2
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9), 
                libx11-dev, 
                libxt-dev, 
@@ -18,6 +18,8 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/
 
 Package: libstartup-notification0
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -31,6 +33,7 @@
 
 Package: libstartup-notification0-dev
 Section: libdevel
+Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends}, libstartup-notification0 (= ${binary:Version}), libx11-dev, pkg-config
 Description: library for program launch feedback (development headers)

Modified: desktop/experimental/startup-notification/debian/libstartup-notification0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/startup-notification/debian/libstartup-notification0-dev.install?rev=36179&op=diff
==============================================================================
--- desktop/experimental/startup-notification/debian/libstartup-notification0-dev.install [utf-8] (original)
+++ desktop/experimental/startup-notification/debian/libstartup-notification0-dev.install [utf-8] Thu Oct 25 11:57:44 2012
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libstartup-notification-1.a
-debian/tmp/usr/lib/libstartup-notification-1.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/libstartup-notification-1.a
+debian/tmp/usr/lib/*/libstartup-notification-1.so
+debian/tmp/usr/lib/*/pkgconfig
 debian/tmp/usr/include/startup-notification-1.0

Modified: desktop/experimental/startup-notification/debian/libstartup-notification0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/startup-notification/debian/libstartup-notification0.install?rev=36179&op=diff
==============================================================================
--- desktop/experimental/startup-notification/debian/libstartup-notification0.install [utf-8] (original)
+++ desktop/experimental/startup-notification/debian/libstartup-notification0.install [utf-8] Thu Oct 25 11:57:44 2012
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libstartup-notification-1.so.*
+debian/tmp/usr/lib/*/libstartup-notification-1.so.*

Modified: desktop/experimental/startup-notification/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/startup-notification/debian/rules?rev=36179&op=diff
==============================================================================
--- desktop/experimental/startup-notification/debian/rules [utf-8] (original)
+++ desktop/experimental/startup-notification/debian/rules [utf-8] Thu Oct 25 11:57:44 2012
@@ -15,3 +15,5 @@
 LDFLAGS += -Wl,-O1
 
 DEB_DH_MAKESHLIBS_ARGS_ALL = -- -c4
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/${DEB_HOST_MULTIARCH}