r28093 - in /desktop/unstable/libgnome/debian: changelog control control.in libgnome2-common.gconf-defaults patches/00_as-needed.patch patches/02_path_max.patch patches/series rules source/ source/format watch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun May 29 07:52:08 UTC 2011 

Author: joss
Date: Sun May 29 07:52:08 2011
New Revision: 28093

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28093
Log:
* New upstream release.
* Switch to 3.0 quilt format.
* Watch for tar.bz2 files.
* Build-depend on libcanberra instead of libesd.
* 00_as-needed.patch, 02_path_max.patch: refreshed.
* libgnome2-common.gconf-defaults: set default cursor theme to 
  Adwaita, to match the default in gsettings-desktop-schemas. In GNOME 
  3, g-s-d uses GSettings to read the theme, while metacity/mutter 
  still use GConf.

Added:
    desktop/unstable/libgnome/debian/patches/series
    desktop/unstable/libgnome/debian/source/
    desktop/unstable/libgnome/debian/source/format
Modified:
    desktop/unstable/libgnome/debian/changelog
    desktop/unstable/libgnome/debian/control
    desktop/unstable/libgnome/debian/control.in
    desktop/unstable/libgnome/debian/libgnome2-common.gconf-defaults
    desktop/unstable/libgnome/debian/patches/00_as-needed.patch
    desktop/unstable/libgnome/debian/patches/02_path_max.patch
    desktop/unstable/libgnome/debian/rules
    desktop/unstable/libgnome/debian/watch

Modified: desktop/unstable/libgnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/changelog?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnome/debian/changelog [utf-8] Sun May 29 07:52:08 2011
@@ -1,3 +1,17 @@
+libgnome (2.32.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to 3.0 quilt format.
+  * Watch for tar.bz2 files.
+  * Build-depend on libcanberra instead of libesd.
+  * 00_as-needed.patch, 02_path_max.patch: refreshed.
+  * libgnome2-common.gconf-defaults: set default cursor theme to 
+    Adwaita, to match the default in gsettings-desktop-schemas. In GNOME 
+    3, g-s-d uses GSettings to read the theme, while metacity/mutter 
+    still use GConf.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 29 May 2011 09:52:02 +0200
+
 libgnome (2.30.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/libgnome/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/control?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/control [utf-8] (original)
+++ desktop/unstable/libgnome/debian/control [utf-8] Sun May 29 07:52:08 2011
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: libgnome
 Section: devel
 Priority: optional
@@ -10,8 +15,7 @@
                libpopt-dev,
                intltool (>= 0.40.0),
                libgconf2-dev (>= 2.7.92),
-               libesd0-dev (>= 0.2.26),
-               libaudiofile-dev (>= 0.2.3),
+               libcanberra-dev,
                libglib2.0-dev (>= 2.16.0),
                cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),

Modified: desktop/unstable/libgnome/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/control.in?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgnome/debian/control.in [utf-8] Sun May 29 07:52:08 2011
@@ -10,8 +10,7 @@
                libpopt-dev,
                intltool (>= 0.40.0),
                libgconf2-dev (>= 2.7.92),
-               libesd0-dev (>= 0.2.26),
-               libaudiofile-dev (>= 0.2.3),
+               libcanberra-dev,
                libglib2.0-dev (>= 2.16.0),
                cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),

Modified: desktop/unstable/libgnome/debian/libgnome2-common.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/libgnome2-common.gconf-defaults?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/libgnome2-common.gconf-defaults [utf-8] (original)
+++ desktop/unstable/libgnome/debian/libgnome2-common.gconf-defaults [utf-8] Sun May 29 07:52:08 2011
@@ -1,1 +1,2 @@
 /desktop/gnome/applications/browser/exec	epiphany-browser
+/desktop/gnome/peripherals/mouse/cursor_theme	Adwaita

Modified: desktop/unstable/libgnome/debian/patches/00_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/patches/00_as-needed.patch?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/patches/00_as-needed.patch [utf-8] (original)
+++ desktop/unstable/libgnome/debian/patches/00_as-needed.patch [utf-8] Sun May 29 07:52:08 2011
@@ -1,9 +1,9 @@
-Index: nautilus-2.18.1/ltmain.sh
+Index: libgnome-2.32.1/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
-@@ -1794,6 +1794,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- libgnome-2.32.1.orig/ltmain.sh	2011-01-31 14:36:30.000000000 +0100
++++ libgnome-2.32.1/ltmain.sh	2011-05-29 09:48:18.339100812 +0200
+@@ -5787,6 +5787,11 @@ func_mode_link ()
+ 	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=
-@@ -2134,6 +2139,15 @@
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -6147,6 +6152,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in

Modified: desktop/unstable/libgnome/debian/patches/02_path_max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/patches/02_path_max.patch?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/patches/02_path_max.patch [utf-8] (original)
+++ desktop/unstable/libgnome/debian/patches/02_path_max.patch [utf-8] Sun May 29 07:52:08 2011
@@ -1,8 +1,10 @@
---- libgnome-2.10.0/libgnome/gnome-program.c.orig	2005-06-08 00:56:37.044243608 +0200
-+++ libgnome-2.10.0/libgnome/gnome-program.c	2005-06-08 00:57:11.757966320 +0200
-@@ -54,6 +54,10 @@
- #include "gnome-i18n.h"
- #include "gnome-url.h"
+Index: libgnome-2.32.1/libgnome/gnome-program.c
+===================================================================
+--- libgnome-2.32.1.orig/libgnome/gnome-program.c	2010-02-07 19:04:26.000000000 +0100
++++ libgnome-2.32.1/libgnome/gnome-program.c	2011-05-29 09:48:34.451179579 +0200
+@@ -64,6 +64,10 @@
+ 
+ #define GNOME_PROGRAM_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GNOME_TYPE_PROGRAM, GnomeProgramPrivate))
  
 +#ifndef PATH_MAX
 +#define PATH_MAX 4096

Added: desktop/unstable/libgnome/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/patches/series?rev=28093&op=file
==============================================================================
--- desktop/unstable/libgnome/debian/patches/series (added)
+++ desktop/unstable/libgnome/debian/patches/series [utf-8] Sun May 29 07:52:08 2011
@@ -1,0 +1,2 @@
+00_as-needed.patch
+02_path_max.patch

Modified: desktop/unstable/libgnome/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/rules?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/rules [utf-8] (original)
+++ desktop/unstable/libgnome/debian/rules [utf-8] Sun May 29 07:52:08 2011
@@ -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/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk

Added: desktop/unstable/libgnome/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/source/format?rev=28093&op=file
==============================================================================
--- desktop/unstable/libgnome/debian/source/format (added)
+++ desktop/unstable/libgnome/debian/source/format [utf-8] Sun May 29 07:52:08 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: desktop/unstable/libgnome/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnome/debian/watch?rev=28093&op=diff
==============================================================================
--- desktop/unstable/libgnome/debian/watch [utf-8] (original)
+++ desktop/unstable/libgnome/debian/watch [utf-8] Sun May 29 07:52:08 2011
@@ -1,4 +1,4 @@
 version=2
 http://ftp.gnome.org/pub/GNOME/sources/libgnome/([\d\.]+)[02468]/ \
-	libgnome-(.*)\.tar\.gz \
+	libgnome-(.*)\.tar\.bz2 \
 	debian uupdate

More information about the pkg-gnome-commits mailing list