[Python-apps-commits] r4588 - in packages/bleachbit/trunk/debian (7 files)

[dktrkranz at users.alioth.debian.org]

    Date: Sunday, January 24, 2010 @ 20:27:24
  Author: dktrkranz
Revision: 4588

Switch to format 3.0 (quilt)

Added:
  packages/bleachbit/trunk/debian/source/
  packages/bleachbit/trunk/debian/source/format
Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/control
  packages/bleachbit/trunk/debian/patches/desktop_file.patch
  packages/bleachbit/trunk/debian/rules
Deleted:
  packages/bleachbit/trunk/debian/README.source

Deleted: packages/bleachbit/trunk/debian/README.source
===================================================================
--- packages/bleachbit/trunk/debian/README.source	2010-01-24 20:20:56 UTC (rev 4587)
+++ packages/bleachbit/trunk/debian/README.source	2010-01-24 20:27:24 UTC (rev 4588)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2010-01-24 20:20:56 UTC (rev 4587)
+++ packages/bleachbit/trunk/debian/changelog	2010-01-24 20:27:24 UTC (rev 4588)
@@ -4,8 +4,9 @@
     - Point local_cleaners_dir to personal_cleaners_dir. The former is
       not useful when BleachBit is installed system-wide, this way users
       are not bothered for new cleaners each time (Closes: #565359).
+  * Switch to format 3.0 (quilt).
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sun, 24 Jan 2010 21:17:53 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 24 Jan 2010 21:26:44 +0100
 
 bleachbit (0.7.2-1) unstable; urgency=low
 

Modified: packages/bleachbit/trunk/debian/control
===================================================================
--- packages/bleachbit/trunk/debian/control	2010-01-24 20:20:56 UTC (rev 4587)
+++ packages/bleachbit/trunk/debian/control	2010-01-24 20:27:24 UTC (rev 4588)
@@ -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.3.0), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.3.0)
 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/patches/desktop_file.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/desktop_file.patch	2010-01-24 20:20:56 UTC (rev 4587)
+++ packages/bleachbit/trunk/debian/patches/desktop_file.patch	2010-01-24 20:27:24 UTC (rev 4588)
@@ -6,7 +6,7 @@
 ===================================================================
 --- bleachbit-0.7.1.orig/bleachbit.desktop	2009-11-10 22:39:33.581078600 +0100
 +++ bleachbit-0.7.1/bleachbit.desktop	2009-11-10 22:42:57.329068306 +0100
-@@ -65,6 +65,5 @@
+@@ -74,6 +74,5 @@
  Exec=bleachbit
  Icon=bleachbit
  Categories=GTK;System;

Modified: packages/bleachbit/trunk/debian/rules
===================================================================
--- packages/bleachbit/trunk/debian/rules	2010-01-24 20:20:56 UTC (rev 4587)
+++ packages/bleachbit/trunk/debian/rules	2010-01-24 20:27:24 UTC (rev 4588)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --buildsystem=python_distutils --with quilt $@
+	dh --buildsystem=python_distutils $@
 
 override_dh_auto_install:
 	dh_auto_install -- --install-lib=/usr/share/bleachbit

Added: packages/bleachbit/trunk/debian/source/format
===================================================================
--- packages/bleachbit/trunk/debian/source/format	                        (rev 0)
+++ packages/bleachbit/trunk/debian/source/format	2010-01-24 20:27:24 UTC (rev 4588)
@@ -0,0 +1 @@
+3.0 (quilt)