r24791 - in /desktop/unstable/gnome-desktop/debian: changelog patches/99_ltmain_as-needed.patch patches/series rules source/ source/format

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 02:34:57 2010
New Revision: 24791

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24791
Log:
* Switch to source format 3.0 (quilt)
  - Add debian/source/format.
  - Add debian/patches/series.
  - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk from debian/rules.
  - Refresh debian/patches/99_ltmain_as-needed.patch.

Added:
    desktop/unstable/gnome-desktop/debian/patches/series
    desktop/unstable/gnome-desktop/debian/source/
    desktop/unstable/gnome-desktop/debian/source/format
Modified:
    desktop/unstable/gnome-desktop/debian/changelog
    desktop/unstable/gnome-desktop/debian/patches/99_ltmain_as-needed.patch
    desktop/unstable/gnome-desktop/debian/rules

Modified: desktop/unstable/gnome-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/changelog?rev=24791&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/changelog [utf-8] Sat Jul 17 02:34:57 2010
@@ -1,6 +1,11 @@
 gnome-desktop (2.30.2-1) UNRELEASED; urgency=low
 
   * New upstream stable release.
+  * Switch to source format 3.0 (quilt)
+    - Add debian/source/format.
+    - Add debian/patches/series.
+    - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk from debian/rules.
+    - Refresh debian/patches/99_ltmain_as-needed.patch.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 17 Jul 2010 04:30:00 +0200
 

Modified: desktop/unstable/gnome-desktop/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/patches/99_ltmain_as-needed.patch?rev=24791&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/patches/99_ltmain_as-needed.patch [utf-8] Sat Jul 17 02:34:57 2010
@@ -1,9 +1,9 @@
-Index: nautilus-2.18.1/ltmain.sh
+Index: b/ltmain.sh
 ===================================================================
---- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- a/ltmain.sh	2010-06-22 03:42:15.000000000 +0200
++++ b/ltmain.sh	2010-07-17 04:32:56.584418726 +0200
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
  	;;
  
 +      -Wl,--as-needed)
@@ -12,9 +12,9 @@
 +	;;
 +      
        -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2124,6 +2129,15 @@
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5067,6 +5072,15 @@
  	lib=
  	found=no
  	case $deplib in

Added: desktop/unstable/gnome-desktop/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/patches/series?rev=24791&op=file
==============================================================================
--- desktop/unstable/gnome-desktop/debian/patches/series (added)
+++ desktop/unstable/gnome-desktop/debian/patches/series [utf-8] Sat Jul 17 02:34:57 2010
@@ -1,0 +1,1 @@
+99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/rules?rev=24791&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/rules [utf-8] Sat Jul 17 02:34:57 2010
@@ -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/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk

Added: desktop/unstable/gnome-desktop/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/source/format?rev=24791&op=file
==============================================================================
--- desktop/unstable/gnome-desktop/debian/source/format (added)
+++ desktop/unstable/gnome-desktop/debian/source/format [utf-8] Sat Jul 17 02:34:57 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)