r30288 - in /desktop/experimental/file-roller/debian: changelog control.in patches/11_search_as_you_type.patch patches/12_disable_deprecated.patch patches/99_ltmain_as-needed.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Oct 13 20:35:23 UTC 2011 

Author: biebl
Date: Thu Oct 13 20:35:23 2011
New Revision: 30288

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30288
Log:
Revert last commit

Removed:
    desktop/experimental/file-roller/debian/patches/12_disable_deprecated.patch
Modified:
    desktop/experimental/file-roller/debian/changelog
    desktop/experimental/file-roller/debian/control.in
    desktop/experimental/file-roller/debian/patches/11_search_as_you_type.patch
    desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch
    desktop/experimental/file-roller/debian/patches/series

Modified: desktop/experimental/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/changelog?rev=30288&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/changelog [utf-8] (original)
+++ desktop/experimental/file-roller/debian/changelog [utf-8] Thu Oct 13 20:35:23 2011
@@ -1,4 +1,4 @@
-file-roller (3.2.0-1) UNRELEASED; urgency=low
+file-roller (3.0.2-2) UNRELEASED; urgency=low
 
   [ Josselin Mouette ]
   * file-roller.mime: dropped. We don’t do necromancy anymore.
@@ -8,15 +8,7 @@
   * debian/control.in:
     - Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
 
-  [ Andreas Henriksson ]
-  * New upstream release.
-    + debian/control.in: Bump glib build dependency according to configure.ac
-    + debian/patches/*: refreshed.
-    + debian/patches/12_disable_deprecated.patch: Added for the (not given)
-      --disable-deprecated configure switch to be taken into consideration
-      in ./copy-n-paste/Makefile.{am,in}
-
- -- Andreas Henriksson <andreas at fatal.se>  Mon, 10 Oct 2011 00:07:54 +0200
+ -- Michael Biebl <biebl at debian.org>  Wed, 05 Oct 2011 03:11:25 +0200
 
 file-roller (3.0.2-1) experimental; urgency=low
 

Modified: desktop/experimental/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control.in?rev=30288&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control.in [utf-8] (original)
+++ desktop/experimental/file-roller/debian/control.in [utf-8] Thu Oct 13 20:35:23 2011
@@ -6,7 +6,7 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.12),
-               libglib2.0-dev (>= 2.29.14),
+               libglib2.0-dev (>= 2.25.5),
                libgtk-3-dev (>= 3.0.2),
                libmagic-dev,
                libnautilus-extension-dev (>= 2.91.0),

Modified: desktop/experimental/file-roller/debian/patches/11_search_as_you_type.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/11_search_as_you_type.patch?rev=30288&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/11_search_as_you_type.patch [utf-8] (original)
+++ desktop/experimental/file-roller/debian/patches/11_search_as_you_type.patch [utf-8] Thu Oct 13 20:35:23 2011
@@ -11,11 +11,11 @@
  src/fr-window.c |    2 --
  1 files changed, 0 insertions(+), 2 deletions(-)
 
-Index: file-roller-3.2.0/src/fr-window.c
+Index: file-roller-3.0.2/src/fr-window.c
 ===================================================================
---- file-roller-3.2.0.orig/src/fr-window.c	2011-09-23 18:03:00.000000000 +0200
-+++ file-roller-3.2.0/src/fr-window.c	2011-10-09 23:54:09.000000000 +0200
-@@ -5609,8 +5609,6 @@
+--- file-roller-3.0.2.orig/src/fr-window.c	2011-05-08 18:07:17.000000000 +0200
++++ file-roller-3.0.2/src/fr-window.c	2011-06-12 20:00:18.965801024 +0200
+@@ -5619,8 +5619,6 @@
  
  	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (window->priv->list_view), TRUE);
  	add_file_list_columns (window, GTK_TREE_VIEW (window->priv->list_view));

Modified: desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch?rev=30288&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch [utf-8] Thu Oct 13 20:35:23 2011
@@ -1,8 +1,8 @@
-Index: file-roller-3.2.0/ltmain.sh
+Index: file-roller-2.26.2/ltmain.sh
 ===================================================================
---- file-roller-3.2.0.orig/ltmain.sh	2011-09-01 12:52:25.000000000 +0200
-+++ file-roller-3.2.0/ltmain.sh	2011-10-09 23:54:58.000000000 +0200
-@@ -5787,6 +5787,11 @@
+--- file-roller-2.26.2.orig/ltmain.sh	2009-06-11 23:34:22.708328005 +0200
++++ file-roller-2.26.2/ltmain.sh	2009-06-11 23:35:55.291494639 +0200
+@@ -4716,6 +4716,11 @@ func_mode_link ()
  	arg=$func_stripname_result
  	;;
  
@@ -14,7 +14,7 @@
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -6147,6 +6152,15 @@
+@@ -5070,6 +5075,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in

Modified: desktop/experimental/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/series?rev=30288&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/series [utf-8] (original)
+++ desktop/experimental/file-roller/debian/patches/series [utf-8] Thu Oct 13 20:35:23 2011
@@ -1,3 +1,2 @@
 11_search_as_you_type.patch
-12_disable_deprecated.patch
 99_ltmain_as-needed.patch

More information about the pkg-gnome-commits mailing list