r22456 - in /desktop/unstable/meta-gnome2/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov 27 10:55:40 2009
New Revision: 22456

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22456
Log:
* Drop gnome-mount on Linux.
* Replace policykit-doc and policykit-gnome-doc by policykit-1-doc.

Modified:
    desktop/unstable/meta-gnome2/debian/changelog
    desktop/unstable/meta-gnome2/debian/control
    desktop/unstable/meta-gnome2/debian/control.in

Modified: desktop/unstable/meta-gnome2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/changelog?rev=22456&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/changelog [utf-8] Fri Nov 27 10:55:40 2009
@@ -1,6 +1,8 @@
 meta-gnome2 (1:2.28+4) UNRELEASED; urgency=low
 
   * Demote g-v-m to recommends. Closes: #317810.
+  * Drop gnome-mount on Linux.
+  * Replace policykit-doc and policykit-gnome-doc by policykit-1-doc.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 22 Nov 2009 02:59:01 +0100
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=22456&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/control [utf-8] Fri Nov 27 10:55:40 2009
@@ -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: meta-gnome2
 Section: gnome
 Priority: optional
@@ -142,7 +147,7 @@
          zenity (>= 2.28),
          libgnome2-perl (>= 1.042),
          desktop-base,
-         gnome-mount (>= 0.8),
+         gnome-mount (>= 0.8) [!linux-any],
          policykit-1-gnome,
          gksu
 Recommends: gnome-accessibility,
@@ -400,8 +405,7 @@
             libcanberra-doc (>= 0.12),
             libtelepathy-glib-doc (>= 0.9),
             libxml2-doc (>= 2.7.3),
-            policykit-doc (>= 0.9),
-            policykit-gnome-doc (>= 0.9.2),
+            policykit-1-doc (>= 0.9),
             libgdl-1-common,
             libnotify-doc
 Suggests: gnome-core-devel,

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=22456&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/control.in [utf-8] Fri Nov 27 10:55:40 2009
@@ -142,7 +142,7 @@
          zenity (>= 2.28),
          libgnome2-perl (>= 1.042),
          desktop-base,
-         gnome-mount (>= 0.8),
+         gnome-mount (>= 0.8) [!linux-any],
          policykit-1-gnome,
          gksu
 Recommends: gnome-accessibility,
@@ -400,8 +400,7 @@
             libcanberra-doc (>= 0.12),
             libtelepathy-glib-doc (>= 0.9),
             libxml2-doc (>= 2.7.3),
-            policykit-doc (>= 0.9),
-            policykit-gnome-doc (>= 0.9.2),
+            policykit-1-doc (>= 0.9),
             libgdl-1-common,
             libnotify-doc
 Suggests: gnome-core-devel,