Package: startup-notification
Version: 0.12-1
Severity: normal
User: [email protected]
Usertags: multiarch
Tags: patch

Hi,

The following patch converts startup-notification to multiarch directories and 
adds
needed Multi-Arch: stanzas to control.in file. This package was really simple 
to convert,
If only all libraries were this simple..

http://wiki.debian.org/Multiarch/Implementation

Riku
diff -urN orig/startup-notification-0.12//debian/changelog startup-notification-0.12//debian/changelog
--- orig/startup-notification-0.12//debian/changelog	2011-09-22 17:09:44.000000000 +0300
+++ startup-notification-0.12//debian/changelog	2011-09-22 17:21:56.771537318 +0300
@@ -1,3 +1,9 @@
+startup-notification (0.12-1.1) experimental; urgency=low
+
+  * Convert to multiarch 
+
+ -- Riku Voipio <[email protected]>  Thu, 22 Sep 2011 17:21:33 +0300
+
 startup-notification (0.12-1) unstable; urgency=low
 
   * Add Vcs-{Svn,Browser} control fields.
diff -urN orig/startup-notification-0.12//debian/control.in startup-notification-0.12//debian/control.in
--- orig/startup-notification-0.12//debian/control.in	2011-09-22 17:09:44.000000000 +0300
+++ startup-notification-0.12//debian/control.in	2011-09-22 17:15:48.281537148 +0300
@@ -4,21 +4,22 @@
 Maintainer: Josselin Mouette <[email protected]>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.9.2
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 5), 
+Build-Depends: cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3), 
                libx11-dev, 
                libxt-dev, 
                pkg-config,
                libxcb1-dev,
                libx11-xcb-dev,
                libxcb-util0-dev,
-               gnome-pkg-tools, 
-               dpkg-dev (>= 1.13.19)
+               gnome-pkg-tools 
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/startup-notification/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/
 
 Package: libstartup-notification0
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for program launch feedback (shared library)
@@ -31,6 +32,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)
diff -urN orig/startup-notification-0.12//debian/libstartup-notification0-dev.install startup-notification-0.12//debian/libstartup-notification0-dev.install
--- orig/startup-notification-0.12//debian/libstartup-notification0-dev.install	2011-09-22 17:09:44.000000000 +0300
+++ startup-notification-0.12//debian/libstartup-notification0-dev.install	2011-09-22 17:16:05.041537156 +0300
@@ -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
diff -urN orig/startup-notification-0.12//debian/libstartup-notification0.install startup-notification-0.12//debian/libstartup-notification0.install
--- orig/startup-notification-0.12//debian/libstartup-notification0.install	2011-09-22 17:09:44.000000000 +0300
+++ startup-notification-0.12//debian/libstartup-notification0.install	2011-09-22 17:16:09.911537158 +0300
@@ -1 +1 @@
-debian/tmp/usr/lib/libstartup-notification-1.so.*
+debian/tmp/usr/lib/*/libstartup-notification-1.so.*
diff -urN orig/startup-notification-0.12//debian/rules startup-notification-0.12//debian/rules
--- orig/startup-notification-0.12//debian/rules	2011-09-22 17:09:44.000000000 +0300
+++ startup-notification-0.12//debian/rules	2011-09-22 17:16:34.421537170 +0300
@@ -15,3 +15,5 @@
 LDFLAGS += -Wl,-O1
 
 DEB_DH_MAKESHLIBS_ARGS_ALL = -- -c4
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)

Reply via email to