[Python-apps-commits] r4223 - in packages/bleachbit/trunk/debian (changelog install rules)

[dktrkranz at users.alioth.debian.org]

    Date: Wednesday, December 2, 2009 @ 21:12:13
  Author: dktrkranz
Revision: 4223

No longer generate bleachbit-root.desktop in build directory

Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/install
  packages/bleachbit/trunk/debian/rules

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2009-12-02 20:39:55 UTC (rev 4222)
+++ packages/bleachbit/trunk/debian/changelog	2009-12-02 21:12:13 UTC (rev 4223)
@@ -3,8 +3,12 @@
   * New upstream release.
   * debian/patches/GUI_relative_imports.patch:
     - Removed, applied upstream.
+  * debian/install, debian/rules:
+    - No longer generate bleachbit-root.desktop in build directory, this
+      way build is automatically removed during clean. Generate .desktop
+      file into the correct location directly.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 02 Dec 2009 21:39:21 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 02 Dec 2009 22:07:28 +0100
 
 bleachbit (0.7.1-1) unstable; urgency=low
 

Modified: packages/bleachbit/trunk/debian/install
===================================================================
--- packages/bleachbit/trunk/debian/install	2009-12-02 20:39:55 UTC (rev 4222)
+++ packages/bleachbit/trunk/debian/install	2009-12-02 21:12:13 UTC (rev 4223)
@@ -1,5 +1,4 @@
 bleachbit.desktop		usr/share/applications
-build/bleachbit-root.desktop	usr/share/applications
 cleaners/*.xml			usr/share/bleachbit/cleaners
 debian/bleachbit.xpm		usr/share/pixmaps
 

Modified: packages/bleachbit/trunk/debian/rules
===================================================================
--- packages/bleachbit/trunk/debian/rules	2009-12-02 20:39:55 UTC (rev 4222)
+++ packages/bleachbit/trunk/debian/rules	2009-12-02 21:12:13 UTC (rev 4223)
@@ -7,14 +7,14 @@
 	dh_auto_install -- --install-lib=/usr/share/bleachbit
 	make -C po install DESTDIR=$(CURDIR)/debian/bleachbit
 
-	# Automatically generate .desktop file to invoke BleachBit as superuser
-	sed -e 's/Name=BleachBit/Name=BleachBit \(as root\)/' bleachbit.desktop > build/bleachbit-root.desktop && \
-	sed -i 's/TryExec=bleachbit/TryExec=su-to-root/' build/bleachbit-root.desktop && \
-	sed -i 's/Exec=bleachbit/Exec=su-to-root -X -c bleachbit/' build/bleachbit-root.desktop
-
 override_dh_install:
 	# Do not install Windows-specific cleaners
 	dh_install $(addprefix -X,$(notdir $(shell grep -l os=.windows. cleaners/*.xml | xargs ls)))
+	# Automatically generate .desktop file to invoke BleachBit as superuser
+	sed -e "s/Name=BleachBit/Name=BleachBit \(as root\)/; \
+		s/TryExec=bleachbit/TryExec=su-to-root/; \
+		s/Exec=bleachbit/Exec=su-to-root -X -c bleachbit/" \
+		bleachbit.desktop > debian/bleachbit/usr/share/applications/bleachbit-root.desktop
 
 override_dh_fixperms:
 	dh_fixperms