r12684 - in /desktop/unstable/file-roller/debian: changelog control control.in patches/01_menu_change.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 21 23:18:07 2007
New Revision: 12684

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12684
Log:
* Only copy gnome-doc-utils.make if configure.in is present.
* New upstream release.
  + Allows to create archives starting with "#". Closes: #424873.
  + Uses file content to guess the MIME type. Closes: #352875.
* Minor build-depend fixes.

Modified:
    desktop/unstable/file-roller/debian/changelog
    desktop/unstable/file-roller/debian/control
    desktop/unstable/file-roller/debian/control.in
    desktop/unstable/file-roller/debian/patches/01_menu_change.patch
    desktop/unstable/file-roller/debian/rules

Modified: desktop/unstable/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/changelog?rev=12684&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/changelog (original)
+++ desktop/unstable/file-roller/debian/changelog Fri Sep 21 23:18:07 2007
@@ -1,4 +1,4 @@
-file-roller (2.18.4-2) UNRELEASED; urgency=low
+file-roller (2.20.0-1) unstable; urgency=low
 
   [ Loic Minier ]
   * Build-depend on gnome-pkg-tools >= 0.12 and call desktop-check-mime-types
@@ -11,9 +11,14 @@
   * Regenerate gnome-doc-utils.make if it is missing. As we already
     build-depend on gnome-doc-utils, just copy it from /usr/share.
     Closes: #442563.
+  * Only copy gnome-doc-utils.make if configure.in is present.
   * Move menu entry to "Applications/File Management".
-
- -- Josselin Mouette <joss at debian.org>  Thu, 20 Sep 2007 18:52:05 +0200
+  * New upstream release.
+    + Allows to create archives starting with "#". Closes: #424873.
+    + Uses file content to guess the MIME type. Closes: #352875.
+  * Minor build-depend fixes.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 22 Sep 2007 01:08:46 +0200
 
 file-roller (2.18.4-1) unstable; urgency=low
 

Modified: desktop/unstable/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control?rev=12684&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control (original)
+++ desktop/unstable/file-roller/debian/control Fri Sep 21 23:18:07 2007
@@ -16,7 +16,10 @@
                gnome-pkg-tools (>= 0.12),
                gnome-doc-utils (>= 0.3.2),
                libgnomevfs2-dev (>= 2.10.0),
-               libglade2-dev (>= 2.4.0)
+               libglade2-dev (>= 2.4.0),
+               libgnome2-dev (>= 2.6.0),
+               libgconf2-dev,
+               intltool (>= 0.35.0)
 Standards-Version: 3.7.2
 
 Package: file-roller

Modified: desktop/unstable/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/control.in?rev=12684&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/control.in (original)
+++ desktop/unstable/file-roller/debian/control.in Fri Sep 21 23:18:07 2007
@@ -16,7 +16,10 @@
                gnome-pkg-tools (>= 0.12),
                gnome-doc-utils (>= 0.3.2),
                libgnomevfs2-dev (>= 2.10.0),
-               libglade2-dev (>= 2.4.0)
+               libglade2-dev (>= 2.4.0),
+               libgnome2-dev (>= 2.6.0),
+               libgconf2-dev,
+               intltool (>= 0.35.0)
 Standards-Version: 3.7.2
 
 Package: file-roller

Modified: desktop/unstable/file-roller/debian/patches/01_menu_change.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/patches/01_menu_change.patch?rev=12684&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/patches/01_menu_change.patch (original)
+++ desktop/unstable/file-roller/debian/patches/01_menu_change.patch Fri Sep 21 23:18:07 2007
@@ -1,8 +1,8 @@
-Index: file-roller-2.18.0/data/file-roller.desktop.in.in
+Index: file-roller-2.20.0/data/file-roller.desktop.in.in
 ===================================================================
---- file-roller-2.18.0.orig/data/file-roller.desktop.in.in	2007-03-12 20:25:30.000000000 +0100
-+++ file-roller-2.18.0/data/file-roller.desktop.in.in	2007-03-17 11:48:43.000000000 +0100
-@@ -8,6 +8,7 @@
+--- file-roller-2.20.0.orig/data/file-roller.desktop.in.in	2007-09-17 21:40:09.000000000 +0200
++++ file-roller-2.20.0/data/file-roller.desktop.in.in	2007-09-22 00:58:08.246237319 +0200
+@@ -9,6 +9,7 @@
  Terminal=false
  Type=Application
  Icon=file-roller

Modified: desktop/unstable/file-roller/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/file-roller/debian/rules?rev=12684&op=diff
==============================================================================
--- desktop/unstable/file-roller/debian/rules (original)
+++ desktop/unstable/file-roller/debian/rules Fri Sep 21 23:18:07 2007
@@ -23,4 +23,6 @@
 	desktop-check-mime-types
 
 clean::
-	test -f gnome-doc-utils.make || cp /usr/share/gnome-doc-utils/gnome-doc-utils.make .
+	if [ -f configure.in ] && [ ! -f gnome-doc-utils.make ]; then \
+		cp /usr/share/gnome-doc-utils/gnome-doc-utils.make . ; \
+	fi