r37794 - in /desktop/unstable/startup-notification: ./ debian/changelog debian/compat debian/control debian/control.in debian/libstartup-notification0-dev.install debian/libstartup-notification0.install debian/rules debian/source/

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Mon May 20 07:54:56 UTC 2013


Author: smcv
Date: Mon May 20 07:54:56 2013
New Revision: 37794

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37794
Log:
* Team upload
* Merge from experimental
* Add a reference to #642418 in the 0.12-2 changelog
* Team upload
* Upgrade to debhelper 9, for compressed debug symbols (when added)
* Convert to multi-arch (based on Riku Voipio's work in Ubuntu;
  Closes: #642418, LP: #910856)
* Use 3.0 (quilt) format instead of CDBS simple-patchsys
  (there are currently no patches anyway)

Added:
    desktop/unstable/startup-notification/debian/source/
      - copied from r37793, desktop/experimental/startup-notification/debian/source/
Modified:
    desktop/unstable/startup-notification/   (props changed)
    desktop/unstable/startup-notification/debian/changelog
    desktop/unstable/startup-notification/debian/compat
    desktop/unstable/startup-notification/debian/control
    desktop/unstable/startup-notification/debian/control.in
    desktop/unstable/startup-notification/debian/libstartup-notification0-dev.install
    desktop/unstable/startup-notification/debian/libstartup-notification0.install
    desktop/unstable/startup-notification/debian/rules

Propchange: desktop/unstable/startup-notification/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/startup-notification:36178-37793

Modified: desktop/unstable/startup-notification/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/changelog?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/changelog [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/changelog [utf-8] Mon May 20 07:54:56 2013
@@ -1,3 +1,22 @@
+startup-notification (0.12-3) UNRELEASED; urgency=low
+
+  * Team upload
+  * Merge from experimental
+  * Add a reference to #642418 in the 0.12-2 changelog
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 20 May 2013 08:53:00 +0100
+
+startup-notification (0.12-2) experimental; urgency=low
+
+  * Team upload
+  * Upgrade to debhelper 9, for compressed debug symbols (when added)
+  * Convert to multi-arch (based on Riku Voipio's work in Ubuntu;
+    Closes: #642418, LP: #910856)
+  * Use 3.0 (quilt) format instead of CDBS simple-patchsys
+    (there are currently no patches anyway)
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 25 Oct 2012 13:18:31 +0100
+
 startup-notification (0.12-1) unstable; urgency=low
 
   * Add Vcs-{Svn,Browser} control fields.

Modified: desktop/unstable/startup-notification/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/compat?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/compat [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/compat [utf-8] Mon May 20 07:54:56 2013
@@ -1,1 +1,1 @@
-5
+9

Modified: desktop/unstable/startup-notification/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/control?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/control [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/control [utf-8] Mon May 20 07:54:56 2013
@@ -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/unstable/startup-notification/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/control.in?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/control.in [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/control.in [utf-8] Mon May 20 07:54:56 2013
@@ -4,8 +4,8 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
 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,
@@ -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/unstable/startup-notification/debian/libstartup-notification0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/libstartup-notification0-dev.install?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/libstartup-notification0-dev.install [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/libstartup-notification0-dev.install [utf-8] Mon May 20 07:54:56 2013
@@ -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/unstable/startup-notification/debian/libstartup-notification0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/libstartup-notification0.install?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/libstartup-notification0.install [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/libstartup-notification0.install [utf-8] Mon May 20 07:54:56 2013
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libstartup-notification-1.so.*
+debian/tmp/usr/lib/*/libstartup-notification-1.so.*

Modified: desktop/unstable/startup-notification/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/startup-notification/debian/rules?rev=37794&op=diff
==============================================================================
--- desktop/unstable/startup-notification/debian/rules [utf-8] (original)
+++ desktop/unstable/startup-notification/debian/rules [utf-8] Mon May 20 07:54:56 2013
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -15,3 +14,5 @@
 LDFLAGS += -Wl,-O1
 
 DEB_DH_MAKESHLIBS_ARGS_ALL = -- -c4
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/${DEB_HOST_MULTIARCH}




More information about the pkg-gnome-commits mailing list