[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.0.0-1-3-gc87a2bf

[Stefan Ebner]

The following commit has been merged in the master branch:
commit c87a2bf4a6a545ec3f11b3a7f3ea0282153ce77b
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Fri Oct 2 22:46:51 2009 +0200

    naughty pandas ate laneys ponies \o/

diff --git a/debian/changelog b/debian/changelog
index 4a042ab..1c2312b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 tomboy (1.0.0-2) UNRELEASED; urgency=low
 
+  [ Iain Lane ]
   * debian/rules: Update the translation template after the build, doesn't
     affect Debian but is required for Ubuntu. Reduces the delta.
 
- -- Iain Lane <laney at ubuntu.com>  Wed, 30 Sep 2009 21:06:20 +0100
+  [ Stefan Ebner ]
+  * debian/rules:
+    + Directly convert and install the icon
+    + Remove debian/clean
+    + Remove debian/tomboy.install
+
+ -- Stefan Ebner <sebner at ubuntu.com>  Fri, 02 Oct 2009 22:46:01 +0200
 
 tomboy (1.0.0-1) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 346e2af..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tomboy-16.xpm
-debian/tomboy-32.xpm
diff --git a/debian/rules b/debian/rules
index 16f6465..870efea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,8 @@ override_dh_auto_configure: autoreconf-stamp
 
 override_dh_auto_install:
 	dh_auto_install -- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	convert $(CURDIR)/data/icons/hicolor_apps_16x16_tomboy.png $(CURDIR)/debian/tomboy-16.xpm
-	convert $(CURDIR)/data/icons/hicolor_apps_32x32_tomboy.png $(CURDIR)/debian/tomboy-32.xpm
+	convert $(CURDIR)/data/icons/hicolor_apps_16x16_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-16.xpm
+	convert $(CURDIR)/data/icons/hicolor_apps_32x32_tomboy.png $(CURDIR)/debian/tomboy/usr/share/pixmaps/tomboy-32.xpm
 	cp debian/PrintNotes.dll.config debian/tomboy/usr/lib/tomboy/addins
 	rm -rf debian/tomboy/usr/lib/tomboy/*.la
 	# crush it good
diff --git a/debian/tomboy.install b/debian/tomboy.install
deleted file mode 100644
index 5d50fb6..0000000
--- a/debian/tomboy.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tomboy-16.xpm usr/share/pixmaps
-debian/tomboy-32.xpm usr/share/pixmaps

-- 
Tomboy - desktop note taking program using Wiki style links