r33782 - in /desktop/unstable/libgnome-keyring/debian: changelog control.in libgnome-keyring-dev.install patches/00git_introspection.patch patches/99_ltmain_as-needed.patch patches/series rules watch

jordi at users.alioth.debian.org jordi at users.alioth.debian.org
Fri Mar 30 15:19:01 UTC 2012 

Author: jordi
Date: Fri Mar 30 15:19:01 2012
New Revision: 33782

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33782
Log:
* New upstream release.
* Remove 00git_introspection.patch, merged upstream.
* Update 99_ltmain_as-needed.patch to dh-autoreconf's version.
* Update to debhelper v9.
* Bump Standards-Version to 3.9.3, with no further changes.
* Watch for .xz tarballs.
* Update Vcs-* URLs.
* Stop configuring with --enable-static and drop .a files.
* Pass -c4 to dh_makeshlibs.

Removed:
    desktop/unstable/libgnome-keyring/debian/patches/00git_introspection.patch
Modified:
    desktop/unstable/libgnome-keyring/debian/changelog
    desktop/unstable/libgnome-keyring/debian/control.in
    desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install
    desktop/unstable/libgnome-keyring/debian/patches/99_ltmain_as-needed.patch
    desktop/unstable/libgnome-keyring/debian/patches/series
    desktop/unstable/libgnome-keyring/debian/rules
    desktop/unstable/libgnome-keyring/debian/watch

Modified: desktop/unstable/libgnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/changelog?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/changelog [utf-8] Fri Mar 30 15:19:01 2012
@@ -1,3 +1,17 @@
+libgnome-keyring (3.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove 00git_introspection.patch, merged upstream.
+  * Update 99_ltmain_as-needed.patch to dh-autoreconf's version.
+  * Update to debhelper v9.
+  * Bump Standards-Version to 3.9.3, with no further changes.
+  * Watch for .xz tarballs.
+  * Update Vcs-* URLs.
+  * Stop configuring with --enable-static and drop .a files.
+  * Pass -c4 to dh_makeshlibs.
+
+ -- Jordi Mallach <jordi at debian.org>  Fri, 30 Mar 2012 16:12:59 +0200
+
 libgnome-keyring (3.2.2-2) unstable; urgency=low
 
   * Add gobject-introspection support: (Closes: #632617, LP: #802173)

Modified: desktop/unstable/libgnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/control.in?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/control.in [utf-8] Fri Mar 30 15:19:01 2012
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.93~),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
@@ -17,9 +17,9 @@
                libgirepository1.0-dev (>= 1.30),
                libglib2.0-doc,
                gnome-keyring
-Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/libgnome-keyring/
+Standards-Version: 3.9.3
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgnome-keyring/
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/libgnome-keyring/
 Homepage: http://live.gnome.org/GnomeKeyring
 
 Package: libgnome-keyring-dev

Modified: desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/libgnome-keyring-dev.install [utf-8] Fri Mar 30 15:19:01 2012
@@ -1,5 +1,4 @@
 usr/include/gnome-keyring*
-usr/lib/*/libgnome-keyring.a
 usr/lib/*/libgnome-keyring.so
 usr/lib/*/pkgconfig/gnome-keyring*.pc
 usr/share/gtk-doc/html/gnome-keyring*

Modified: desktop/unstable/libgnome-keyring/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/patches/99_ltmain_as-needed.patch?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/patches/99_ltmain_as-needed.patch [utf-8] Fri Mar 30 15:19:01 2012
@@ -1,24 +1,25 @@
-Index: libgnome-keyring-3.2.0/ltmain.sh
-===================================================================
---- libgnome-keyring-3.2.0.orig/ltmain.sh	2011-09-18 07:51:26.000000000 +0200
-+++ libgnome-keyring-3.2.0/ltmain.sh	2011-09-29 16:20:54.279718782 +0200
-@@ -5787,6 +5787,11 @@
+Bug-Debian: http://bugs.debian.org/347650
+Last-Update: 2011-06-14
+
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5800,6 +5800,11 @@ func_mode_link ()
  	arg=$func_stripname_result
  	;;
  
-+      -Wl,--as-needed)
++      -Wl,--as-needed|-Wl,--no-as-needed)
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
-+      
++
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -6147,6 +6152,15 @@
+@@ -6163,6 +6168,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in
-+	-Wl,--as-needed)
++	-Wl,--as-needed|-Wl,--no-as-needed)
 +	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -27,6 +28,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
  	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"

Modified: desktop/unstable/libgnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/patches/series?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/patches/series [utf-8] Fri Mar 30 15:19:01 2012
@@ -1,2 +1,1 @@
-00git_introspection.patch
 99_ltmain_as-needed.patch

Modified: desktop/unstable/libgnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/rules?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/rules [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/rules [utf-8] Fri Mar 30 15:19:01 2012
@@ -8,8 +8,9 @@
 
 LDFLAGS := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static \
-                             --enable-gtk-doc \
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
                              --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
+DEB_DH_MAKESHLIBS_ARGS_libgnome-keyring0 += -V -- -c4
+
 DEB_MAKE_CHECK_TARGET := check || true

Modified: desktop/unstable/libgnome-keyring/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome-keyring/debian/watch?rev=33782&op=diff
==============================================================================
--- desktop/unstable/libgnome-keyring/debian/watch [utf-8] (original)
+++ desktop/unstable/libgnome-keyring/debian/watch [utf-8] Fri Mar 30 15:19:01 2012
@@ -1,3 +1,3 @@
 version=3
 http://ftp.gnome.org/pub/GNOME/sources/libgnome-keyring/([\d\.]+[02468])/ \
-        libgnome-keyring-(.*)\.tar\.bz2
+        libgnome-keyring-(.*)\.tar\.xz

More information about the pkg-gnome-commits mailing list