[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.2-1-4-ga4c1f48

[Iain Lane]

The following commit has been merged in the master branch:
commit a4c1f48ef85934db89fbd15f7d01e2e119fbaef7
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue May 4 18:06:58 2010 +0100

    Minor cleanups
    
    * debian/rules: Don't byte compile python helpers as this causes them to
      appear in the prefs window twice (and the compiled ones don't work)
    * debian/control: Add dep on librsvg2-common to fix installability when this
      isn't otherwise available.

diff --git a/debian/changelog b/debian/changelog
index 5fefc48..bb74912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ docky (2.0.3.1-1) UNRELEASED; urgency=low
     + GMail: fix exception when reloading (LP: #573991)
     + CLOCK: popup menu must always show icons (LP: #574003)
     + helpers crash when dbus isn't available (LP: #540688)
+  * debian/rules: Don't byte compile python helpers as this causes them to
+    appear in the prefs window twice (and the compiled ones don't work) 
+  * debian/control: Add dep on librsvg2-common to fix installability when this
+    isn't otherwise available.
 
  -- Iain Lane <laney at ubuntu.com>  Tue, 04 May 2010 16:15:39 +0100
 
diff --git a/debian/control b/debian/control
index 668a916..d225c9c 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends: ${shlibs:Depends},
  ${misc:Depends},
  ${cli:Depends},
  ${python:Depends},
+ librsvg2-common,
  python-docky
 Description: Elegant, powerful, clean dock
  A full fledged dock application that makes opening common applications and
diff --git a/debian/rules b/debian/rules
index 478b334..0702016 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 include /usr/share/cli-common/cli.make
 
 override_dh_pysupport:
-	dh_pysupport usr/share/docky/helpers
+# Don't byte compile helpers — causes broken ones to also show up in prefs
 
 override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc

-- 
docky