r26307 - in /desktop/experimental/gnome-control-center/debian: changelog control control.in rules source/ source/format

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sat Jan 15 17:44:52 2011
New Revision: 26307

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26307
Log:
* debian/control.in:
  - Drop gnome-control-center breaks/replaces against gnome-media(-common),
    they seem unneeded.
  - capplets-data replaces gnome-media-common.
* debian/control.in,
  debian/rules,
  debian/source/format:
  - Switch to source format 3.0 (quilt).

Added:
    desktop/experimental/gnome-control-center/debian/source/
    desktop/experimental/gnome-control-center/debian/source/format
Modified:
    desktop/experimental/gnome-control-center/debian/changelog
    desktop/experimental/gnome-control-center/debian/control
    desktop/experimental/gnome-control-center/debian/control.in
    desktop/experimental/gnome-control-center/debian/rules

Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=26307&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Sat Jan 15 17:44:52 2011
@@ -1,3 +1,16 @@
+gnome-control-center (1:2.91.5-2) UNRELEASED; urgency=low
+
+  * debian/control.in:
+    - Drop gnome-control-center breaks/replaces against gnome-media(-common),
+      they seem unneeded.
+    - capplets-data replaces gnome-media-common.
+  * debian/control.in,
+    debian/rules,
+    debian/source/format:
+    - Switch to source format 3.0 (quilt).
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 15 Jan 2011 15:33:30 +0000
+
 gnome-control-center (1:2.91.5-1) experimental; urgency=low
 
   * New upstream release

Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=26307&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Sat Jan 15 17:44:52 2011
@@ -12,7 +12,6 @@
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
                gnome-common,
-               quilt,
                dpkg-dev (>= 1.13.19),
                debhelper (>= 5.0.0),
                docbook-to-man,
@@ -60,8 +59,6 @@
             mousetweaks,
             iso-codes
 Conflicts: gnome-session (<< 2.22.0)
-Replaces: gnome-media-common (<< 2.91), gnome-media (<< 2.91)
-Breaks: gnome-media-common (<< 2.91)
 Suggests: libcanberra-gtk-module,
           gnome-screensaver | xscreensaver,
           x11-xserver-utils,
@@ -87,6 +84,7 @@
 Section: gnome
 Depends: ${misc:Depends}
 Recommends: gnome-control-center (>= ${source:Version})
+Replaces: gnome-media-common (<< 2.91)
 Breaks: gnome-control-center (<< ${source:Version})
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by

Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=26307&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Sat Jan 15 17:44:52 2011
@@ -7,7 +7,6 @@
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
                gnome-common,
-               quilt,
                dpkg-dev (>= 1.13.19),
                debhelper (>= 5.0.0),
                docbook-to-man,
@@ -55,8 +54,6 @@
             mousetweaks,
             iso-codes
 Conflicts: gnome-session (<< 2.22.0)
-Replaces: gnome-media-common (<< 2.91), gnome-media (<< 2.91)
-Breaks: gnome-media-common (<< 2.91)
 Suggests: libcanberra-gtk-module,
           gnome-screensaver | xscreensaver,
           x11-xserver-utils,
@@ -82,6 +79,7 @@
 Section: gnome
 Depends: ${misc:Depends}
 Recommends: gnome-control-center (>= ${source:Version})
+Replaces: gnome-media-common (<< 2.91)
 Breaks: gnome-control-center (<< ${source:Version})
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by

Modified: desktop/experimental/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/rules?rev=26307&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/rules [utf-8] Sat Jan 15 17:44:52 2011
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.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
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_AUTO_UPDATE_LIBTOOL=pre
 DEB_AUTO_UPDATE_ACLOCAL=1.11

Added: desktop/experimental/gnome-control-center/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/source/format?rev=26307&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/source/format (added)
+++ desktop/experimental/gnome-control-center/debian/source/format [utf-8] Sat Jan 15 17:44:52 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)