[Python-apps-commits] r4098 - in packages/bleachbit/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Tuesday, November 10, 2009 @ 21:56:52
  Author: dktrkranz
Revision: 4098

Use debhelper buildsystem feature

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

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2009-11-10 21:46:56 UTC (rev 4097)
+++ packages/bleachbit/trunk/debian/changelog	2009-11-10 21:56:52 UTC (rev 4098)
@@ -2,8 +2,9 @@
 
   * New upstream release.
   * Refresh patches for new upstream release.
+  * Use debhelper buildsystem feature.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Tue, 10 Nov 2009 22:46:29 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 10 Nov 2009 22:48:59 +0100
 
 bleachbit (0.7.0-1) unstable; urgency=low
 

Modified: packages/bleachbit/trunk/debian/control
===================================================================
--- packages/bleachbit/trunk/debian/control	2009-11-10 21:46:56 UTC (rev 4097)
+++ packages/bleachbit/trunk/debian/control	2009-11-10 21:56:52 UTC (rev 4098)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Luca Falavigna <dktrkranz at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.3.0), quilt (>= 0.46-7)
 Build-Depends-Indep: python-support (>= 0.5.3), python (>= 2.4), gettext
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/bleachbit/trunk/

Modified: packages/bleachbit/trunk/debian/install
===================================================================
--- packages/bleachbit/trunk/debian/install	2009-11-10 21:46:56 UTC (rev 4097)
+++ packages/bleachbit/trunk/debian/install	2009-11-10 21:56:52 UTC (rev 4098)
@@ -1,6 +1,6 @@
-bleachbit.desktop	usr/share/applications
-bleachbit-root.desktop	usr/share/applications
-cleaners/*.xml		usr/share/bleachbit/cleaners
-debian/bleachbit.xpm	usr/share/pixmaps
+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-11-10 21:46:56 UTC (rev 4097)
+++ packages/bleachbit/trunk/debian/rules	2009-11-10 21:56:52 UTC (rev 4098)
@@ -1,21 +1,16 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh --buildsystem=python_distutils --with quilt $@
 
-clean:
-	find -name "*.pyc" -delete
-	rm -fr build bleachbit-root.desktop
-	dh --with quilt $@
-
 override_dh_auto_install:
-	python setup.py install --root=$(CURDIR)/debian/bleachbit --install-lib=/usr/share/bleachbit
+	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 > bleachbit-root.desktop && \
-	sed -i 's/TryExec=bleachbit/TryExec=su-to-root/' bleachbit-root.desktop && \
-	sed -i 's/Exec=bleachbit/Exec=su-to-root -X -c bleachbit/' bleachbit-root.desktop
+	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