r15120 - in /desktop/unstable/metacity/debian: changelog patches/99_ltmain_as-needed.patch rules

[slomo at users.alioth.debian.org]

Author: slomo
Date: Fri Mar 14 13:08:37 2008
New Revision: 15120

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15120
Log:
* New upstream stable release:
  + debian/rules:
    - Drop check-dist include.
    - Update shlibs to >= 2.22.0 because of new API.

Added:
    desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/rules

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=15120&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog (original)
+++ desktop/unstable/metacity/debian/changelog Fri Mar 14 13:08:37 2008
@@ -1,4 +1,4 @@
-metacity (1:2.21.21-1) UNRELEASED; urgency=low
+metacity (1:2.22.0-1) unstable; urgency=low
 
   [ Bradley Smith ]
   * New upstream development release.
@@ -6,7 +6,13 @@
   [ Sam Morris ]
   * Build-depend on libxcomposite-dev for composite manager.
 
- -- Bradley Smith <brad at brad-smith.co.uk>  Thu, 14 Feb 2008 20:58:15 +0000
+  [ Sebastian Dröge ]
+  * New upstream stable release:
+    + debian/rules:
+      - Drop check-dist include.
+      - Update shlibs to >= 2.22.0 because of new API.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 14 Mar 2008 13:54:19 +0100
 
 metacity (1:2.21.5-1) experimental; urgency=low
 

Added: desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch?rev=15120&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch Fri Mar 14 13:08:37 2008
@@ -1,0 +1,30 @@
+--- ltmain.sh	2007-08-14 18:43:36.000000000 +0100
++++ ltmain.sh.new	2007-12-20 12:07:00.000000000 +0000
+@@ -1793,6 +1793,11 @@
+ 	IFS="$save_ifs"
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
++        
++       -Wl,--as-needed)
++        deplibs="$deplibs $arg"
++        continue
++        ;;
+ 
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+@@ -2137,6 +2142,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++        -Wl,--as-needed)
++          if test "$linkmode,$pass" = "prog,link"; then
++            compile_deplibs="$deplib $compile_deplibs"
++            finalize_deplibs="$deplib $finalize_deplibs"
++          else
++            deplibs="$deplib $deplibs"
++          fi
++          continue
++          ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

Modified: desktop/unstable/metacity/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/rules?rev=15120&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/rules (original)
+++ desktop/unstable/metacity/debian/rules Fri Mar 14 13:08:37 2008
@@ -6,11 +6,10 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-startup-notification=yes
-DEB_DH_MAKESHLIBS_ARGS_libmetacity0 += -V 'libmetacity0 (>= 1:2.19.5)'
+DEB_DH_MAKESHLIBS_ARGS_libmetacity0 += -V 'libmetacity0 (>= 1:2.22.0)'
 DEB_INSTALL_DOCS_metacity += doc/theme-format.txt
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed