r21218 - in /packages/unstable/hotwire/debian: changelog control control.in patches/ rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Sep  1 18:41:19 2009
New Revision: 21218

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21218
Log:
* debian/control:
  - Downgrade python-gtksourceview2 dependency to recommends.
  - Depend on ${misc:Depends}.
  - Move imagemagick and intltool to build-depends-indep.
* debian/rules:
  - Stop calling dh_desktop, it's a no-op now.
  - Reorder a bit.

Removed:
    packages/unstable/hotwire/debian/patches/
Modified:
    packages/unstable/hotwire/debian/changelog
    packages/unstable/hotwire/debian/control
    packages/unstable/hotwire/debian/control.in
    packages/unstable/hotwire/debian/rules

Modified: packages/unstable/hotwire/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/changelog?rev=21218&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/changelog [utf-8] (original)
+++ packages/unstable/hotwire/debian/changelog [utf-8] Tue Sep  1 18:41:19 2009
@@ -1,4 +1,4 @@
-hotwire (0.721-2) UNRELEASED; urgency=low
+hotwire (0.721-2) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Depend on dbus-x11. Closes: 508219.
@@ -6,9 +6,15 @@
     Closes: #541558.
 
   [ Emilio Pozuelo Monfort ]
-  * Recommend python-gtksourceview2.
+  * debian/control:
+    - Downgrade python-gtksourceview2 dependency to recommends.
+    - Depend on ${misc:Depends}.
+    - Move imagemagick and intltool to build-depends-indep.
+  * debian/rules:
+    - Stop calling dh_desktop, it's a no-op now.
+    - Reorder a bit.
 
- -- Josselin Mouette <joss at debian.org>  Fri, 23 Jan 2009 15:52:07 +0100
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 01 Sep 2009 20:30:48 +0200
 
 hotwire (0.721-1) unstable; urgency=low
 

Modified: packages/unstable/hotwire/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/control?rev=21218&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/control [utf-8] (original)
+++ packages/unstable/hotwire/debian/control [utf-8] Tue Sep  1 18:41:19 2009
@@ -2,26 +2,26 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
 Standards-Version: 3.8.0
 Build-Depends: cdbs (>= 0.4.52),
                python-support,
                gnome-pkg-tools (>= 0.10),
                python (>= 2.4),
-               debhelper (>= 5.0.51),
-               intltool,
-               imagemagick
+               debhelper (>= 5.0.51)
+Build-Depends-Indep: intltool,
+                     imagemagick
 
 Package: hotwire
 Architecture: all
 Depends: ${python:Depends},
+         ${misc:Depends},
          python-gnome2,
          python-gtk2,
          python-gobject,
          python-dbus,
          python-vte,
          python-cairo,
-         python-gtksourceview2,
          python (>= 2.5) | python-pysqlite2,
          dbus-x11
 Recommends: python-gnomedesktop,

Modified: packages/unstable/hotwire/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/control.in?rev=21218&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/control.in [utf-8] (original)
+++ packages/unstable/hotwire/debian/control.in [utf-8] Tue Sep  1 18:41:19 2009
@@ -8,20 +8,20 @@
                python-support,
                gnome-pkg-tools (>= 0.10),
                python (>= 2.4),
-               debhelper (>= 5.0.51),
-               intltool,
-               imagemagick
+               debhelper (>= 5.0.51)
+Build-Depends-Indep: intltool,
+                     imagemagick
 
 Package: hotwire
 Architecture: all
 Depends: ${python:Depends},
+         ${misc:Depends},
          python-gnome2,
          python-gtk2,
          python-gobject,
          python-dbus,
          python-vte,
          python-cairo,
-         python-gtksourceview2,
          python (>= 2.5) | python-pysqlite2,
          dbus-x11
 Recommends: python-gnomedesktop,

Modified: packages/unstable/hotwire/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/hotwire/debian/rules?rev=21218&op=diff
==============================================================================
--- packages/unstable/hotwire/debian/rules [utf-8] (original)
+++ packages/unstable/hotwire/debian/rules [utf-8] Tue Sep  1 18:41:19 2009
@@ -6,14 +6,14 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 binary-install/hotwire::
-	convert -crop 22x22+1+1 debian/hotwire/usr/share/icons/hicolor/24x24/apps/hotwire.png debian/hotwire/usr/share/icons/hicolor/22x22/apps/hotwire.png
+	convert -crop 22x22+1+1 \
+		debian/hotwire/usr/share/icons/hicolor/24x24/apps/hotwire.png \
+		debian/hotwire/usr/share/icons/hicolor/22x22/apps/hotwire.png
 	sed -i "1 s,python2..,python," debian/hotwire/usr/bin/*
-# We need to refactor gnome.mk into gnome-autotools.mk and gnome.mk.
-	dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)
+	# We need to refactor gnome.mk into gnome-autotools.mk and gnome.mk.
 	dh_icons -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)
-
-include /usr/share/cdbs/1/class/python-distutils.mk