r31378 - in /desktop/experimental/file-roller/debian: changelog control control.in patches/01_package_names.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Sun Nov 13 21:41:31 2011
New Revision: 31378

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31378
Log:
* Demote rpm2cpio to Suggests.
* Add 01_package_names.patch to fix PK package name matches for xz and
  rpm files.

Added:
    desktop/experimental/file-roller/debian/patches/01_package_names.patch
Modified:
    desktop/experimental/file-roller/debian/changelog
    desktop/experimental/file-roller/debian/control
    desktop/experimental/file-roller/debian/control.in
    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=31378&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/changelog [utf-8] (original)
+++ desktop/experimental/file-roller/debian/changelog [utf-8] Sun Nov 13 21:41:31 2011
@@ -3,8 +3,11 @@
   * New upstream release.
   * Enable PackageKit support.
   * Bump Build-Depends to libglib2.0-dev (>= 2.29.14).
-
- -- Jordi Mallach <jordi at debian.org>  Sun, 13 Nov 2011 09:20:30 +0100
+  * Demote rpm2cpio to Suggests.
+  * Add 01_package_names.patch to fix PK package name matches for xz and
+    rpm files.
+
+ -- Jordi Mallach <jordi at debian.org>  Sun, 13 Nov 2011 22:39:33 +0100
 
 file-roller (3.0.2-2) unstable; urgency=low
 

Modified: desktop/experimental/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control?rev=31378&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control [utf-8] (original)
+++ desktop/experimental/file-roller/debian/control [utf-8] Sun Nov 13 21:41:31 2011
@@ -32,26 +32,26 @@
          p7zip-full,
          nautilus-data (>= 3.0)
 Replaces: gnome-icon-theme (<< 2.14)
-Recommends: rpm2cpio,
-            gnome-icon-theme (>= 2.18),
+Recommends: gnome-icon-theme (>= 2.18),
             gvfs
-Suggests: lha,
-          unrar | p7zip-rar,
-          sharutils,
-          ncompress,
+Suggests: arj,
           binutils,
           cpio,
-          unace,
+          lha,
           lzip,
           lzma,
           lzop,
+          ncompress,
+          rpm2cpio,
           rzip,
+          sharutils,
+          unace,
           unalz,
+          unrar | p7zip-rar,
           unzip,
+          xz-utils,
           zip,
-          zoo,
-          xz-utils,
-          arj
+          zoo
 Description: archive manager for GNOME
  File-roller is an archive manager for the GNOME environment. It allows you to:
  .

Modified: desktop/experimental/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control.in?rev=31378&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control.in [utf-8] (original)
+++ desktop/experimental/file-roller/debian/control.in [utf-8] Sun Nov 13 21:41:31 2011
@@ -27,26 +27,26 @@
          p7zip-full,
          nautilus-data (>= 3.0)
 Replaces: gnome-icon-theme (<< 2.14)
-Recommends: rpm2cpio,
-            gnome-icon-theme (>= 2.18),
+Recommends: gnome-icon-theme (>= 2.18),
             gvfs
-Suggests: lha,
-          unrar | p7zip-rar,
-          sharutils,
-          ncompress,
+Suggests: arj,
           binutils,
           cpio,
-          unace,
+          lha,
           lzip,
           lzma,
           lzop,
+          ncompress,
+          rpm2cpio,
           rzip,
+          sharutils,
+          unace,
           unalz,
+          unrar | p7zip-rar,
           unzip,
+          xz-utils,
           zip,
-          zoo,
-          xz-utils,
-          arj
+          zoo
 Description: archive manager for GNOME
  File-roller is an archive manager for the GNOME environment. It allows you to:
  .

Added: desktop/experimental/file-roller/debian/patches/01_package_names.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/01_package_names.patch?rev=31378&op=file
==============================================================================
--- desktop/experimental/file-roller/debian/patches/01_package_names.patch (added)
+++ desktop/experimental/file-roller/debian/patches/01_package_names.patch [utf-8] Sun Nov 13 21:41:31 2011
@@ -1,0 +1,22 @@
+Index: file-roller-3.2.1/data/packages.match
+===================================================================
+--- file-roller-3.2.1.orig/data/packages.match	2011-11-13 22:16:29.224463195 +0100
++++ file-roller-3.2.1/data/packages.match	2011-11-13 22:29:40.556431917 +0100
+@@ -15,7 +15,7 @@
+ p7zip-full=
+ p7zip-rar=
+ rar=
+-rpm=
++rpm=rpm2cpio
+ rzip=
+ tar=
+ unace=
+@@ -23,7 +23,7 @@
+ unrar=
+ unstaff=
+ unzip=
+-xz=
++xz=xz-utils
+ zip=
+ zoo=
+ 

Modified: desktop/experimental/file-roller/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/series?rev=31378&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/series [utf-8] (original)
+++ desktop/experimental/file-roller/debian/patches/series [utf-8] Sun Nov 13 21:41:31 2011
@@ -1,2 +1,3 @@
+01_package_names.patch
 11_search_as_you_type.patch
 99_ltmain_as-needed.patch