r21216 - in /packages/unstable/meld/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Sep  1 18:24:30 2009
New Revision: 21216

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21216
Log:
* debian/control.in:
  - Stop recommending python-gnome2-desktop, meld doesn't use any module
    from python-gnome-desktop. Closes: #541557.
  - Stop depending on python-gnome2, recommend it since meld may use
    the gnomevfs module, and recommend python-gconf for the config.
    Closes: #533748.
  - Standards-Version is 3.8.3, no changes needed.
  - Remove dh_scrollkeeper call, it's deprecated now.
  - Build depend on python rather than python-dev.

Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/control
    packages/unstable/meld/debian/control.in
    packages/unstable/meld/debian/rules

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=21216&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Tue Sep  1 18:24:30 2009
@@ -1,3 +1,17 @@
+meld (1.3.0-2) unstable; urgency=low
+
+  * debian/control.in:
+    - Stop recommending python-gnome2-desktop, meld doesn't use any module
+      from python-gnome-desktop. Closes: #541557.
+    - Stop depending on python-gnome2, recommend it since meld may use
+      the gnomevfs module, and recommend python-gconf for the config.
+      Closes: #533748.
+    - Standards-Version is 3.8.3, no changes needed.
+    - Remove dh_scrollkeeper call, it's deprecated now.
+    - Build depend on python rather than python-dev.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 01 Sep 2009 20:16:33 +0200
+
 meld (1.3.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #528327)

Modified: packages/unstable/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control?rev=21216&op=diff
==============================================================================
--- packages/unstable/meld/debian/control [utf-8] (original)
+++ packages/unstable/meld/debian/control [utf-8] Tue Sep  1 18:24:30 2009
@@ -5,12 +5,12 @@
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools
-Build-Depends-Indep: python-dev,
+Build-Depends-Indep: python,
                      python-support (>= 0.4.0),
                      intltool,
                      scrollkeeper
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
-Standards-Version: 3.8.0
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Loic Minier <lool at dooz.org>
+Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 
 Package: meld
@@ -19,7 +19,9 @@
          ${misc:Depends},
          python-gtk2 (>= 2.4),
          python-glade2 (>= 2.4)
-Recommends: python-gtksourceview2, yelp
+Recommends: yelp,
+            python-gnome2,
+            python-gconf
 XB-Python-Version: ${python:Versions}
 Description: graphical tool to diff and merge files
  Meld is a tool which allows the user to see the changes in, and merge between,

Modified: packages/unstable/meld/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control.in?rev=21216&op=diff
==============================================================================
--- packages/unstable/meld/debian/control.in [utf-8] (original)
+++ packages/unstable/meld/debian/control.in [utf-8] Tue Sep  1 18:24:30 2009
@@ -5,12 +5,12 @@
 Build-Depends: debhelper (>= 5),
                cdbs,
                gnome-pkg-tools
-Build-Depends-Indep: python-dev,
+Build-Depends-Indep: python,
                      python-support (>= 0.4.0),
                      intltool,
                      scrollkeeper
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 XS-Python-Version: >= 2.3
 
 Package: meld
@@ -18,9 +18,10 @@
 Depends: ${python:Depends},
          ${misc:Depends},
          python-gtk2 (>= 2.4),
-         python-glade2 (>= 2.4),
-         python-gnome2
-Recommends: python-gnome2-desktop, yelp
+         python-glade2 (>= 2.4)
+Recommends: yelp,
+            python-gnome2,
+            python-gconf
 XB-Python-Version: ${python:Versions}
 Description: graphical tool to diff and merge files
  Meld is a tool which allows the user to see the changes in, and merge between,

Modified: packages/unstable/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/rules?rev=21216&op=diff
==============================================================================
--- packages/unstable/meld/debian/rules [utf-8] (original)
+++ packages/unstable/meld/debian/rules [utf-8] Tue Sep  1 18:24:30 2009
@@ -14,9 +14,6 @@
 
 binary-install/meld::
 	dh_pysupport -p$(cdbs_curpkg)
-	dh_scrollkeeper -p$(cdbs_curpkg)
 
 binary-post-install/meld::
 	rm -rf debian/$(cdbs_curpkg)/usr/share/application-registry
-	# scrollkeeper stuff
-	rm -rf debian/$(cdbs_curpkg)/usr/var