[Python-apps-commits] r4106 - in packages/jokosher/trunk/debian (14 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Wed Nov 11 21:33:36 UTC 2009
Date: Wednesday, November 11, 2009 @ 21:33:20
Author: dktrkranz
Revision: 4106
Switch to quilt
Added:
packages/jokosher/trunk/debian/patches/desktop_file.patch
packages/jokosher/trunk/debian/patches/hard-code-omf-location.patch
packages/jokosher/trunk/debian/patches/load_extensions_from_unpacked_eggs.patch
packages/jokosher/trunk/debian/patches/series
packages/jokosher/trunk/debian/patches/update_mime_database.patch
Modified:
packages/jokosher/trunk/debian/README.source
packages/jokosher/trunk/debian/changelog
packages/jokosher/trunk/debian/control
packages/jokosher/trunk/debian/rules
Deleted:
packages/jokosher/trunk/debian/patches/00list
packages/jokosher/trunk/debian/patches/10_update_mime_database.dpatch
packages/jokosher/trunk/debian/patches/30_desktop_file.dpatch
packages/jokosher/trunk/debian/patches/40_load_extensions_from_unpacked_eggs.dpatch
packages/jokosher/trunk/debian/patches/60-hard-code-omf-location.dpatch
Modified: packages/jokosher/trunk/debian/README.source
===================================================================
--- packages/jokosher/trunk/debian/README.source 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/README.source 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,38 +1,58 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
+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 get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
+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:
- debian/rules patch
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ break
+ fi
+ done
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
+ quilt push -a
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
+The last patch listed in debian/patches/series will become the current
+patch.
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
+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:
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
+ quilt add <file>
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
-10 Aug 2008.
+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/jokosher/trunk/debian/changelog
===================================================================
--- packages/jokosher/trunk/debian/changelog 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/changelog 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,8 +1,9 @@
jokosher (0.11.3-2) UNRELEASED; urgency=low
* Update my e-mail address.
+ * Switch to quilt as patch system.
- -- Luca Falavigna <dktrkranz at debian.org> Wed, 11 Nov 2009 22:26:42 +0100
+ -- Luca Falavigna <dktrkranz at debian.org> Wed, 11 Nov 2009 22:32:35 +0100
jokosher (0.11.3-1) unstable; urgency=low
Modified: packages/jokosher/trunk/debian/control
===================================================================
--- packages/jokosher/trunk/debian/control 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/control 2009-11-11 21:33:20 UTC (rev 4106)
@@ -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), dpatch, python (>= 2.4)
+Build-Depends: debhelper (>= 7.0.50), python (>= 2.4), quilt (>= 0.46-7)
Build-Depends-Indep: python-support (>= 0.5.3), unzip
Homepage: http://www.jokosher.org
Vcs-Svn: svn://svn.debian.org/python-apps/packages/jokosher/trunk/
Deleted: packages/jokosher/trunk/debian/patches/00list
===================================================================
--- packages/jokosher/trunk/debian/patches/00list 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/patches/00list 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,4 +0,0 @@
-10_update_mime_database
-30_desktop_file
-40_load_extensions_from_unpacked_eggs
-60-hard-code-omf-location.dpatch
Deleted: packages/jokosher/trunk/debian/patches/10_update_mime_database.dpatch
===================================================================
--- packages/jokosher/trunk/debian/patches/10_update_mime_database.dpatch 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/patches/10_update_mime_database.dpatch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_update_mime_database.dpatch by Florian Ragwitz <rafl at debian.org>
-## DP: Don't call update-{mime,desktop}-database at build-time.
-
- at DPATCH@
-diff -urNad jokosher-0.11.1~/setup.py jokosher-0.11.1/setup.py
---- jokosher-0.11.1~/setup.py 2009-04-16 23:24:58.000000000 +0200
-+++ jokosher-0.11.1/setup.py 2009-04-18 03:00:01.000000000 +0200
-@@ -98,22 +98,6 @@
- print "Updating the scrollkeeper index..."
- call(["scrollkeeper-update", "-o", installroot + omfdir])
-
--# Update the mime types
--if os.geteuid() == 0 and dist != None:
-- print "Updating the mime-types...."
--
-- #update the mimetypes database
-- try:
-- call(["update-mime-database", "/usr/share/mime/"])
-- except:
-- pass
--
-- #update the .desktop file database
-- try:
-- call(["update-desktop-database"])
-- except:
-- pass
--
- print "\nInstallation finished! You can now run Jokosher by typing 'jokosher' or through your applications menu icon."
-
- ## To uninstall manually delete these files/folders:
Deleted: packages/jokosher/trunk/debian/patches/30_desktop_file.dpatch
===================================================================
--- packages/jokosher/trunk/debian/patches/30_desktop_file.dpatch 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/patches/30_desktop_file.dpatch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_desktop_file.dpatch by Luca Falavigna <dktrkranz at ubuntu.com>
-## DP: Adhere to Freedesktop.org standards by removing deprecated entries.
-
- at DPATCH@
-diff -urNad jokosher-0.11.1~/bin/jokosher.desktop jokosher-0.11.1/bin/jokosher.desktop
---- jokosher-0.11.1~/bin/jokosher.desktop 2009-03-17 04:07:00.000000000 +0100
-+++ jokosher-0.11.1/bin/jokosher.desktop 2009-04-18 15:09:59.000000000 +0200
-@@ -8,5 +8,5 @@
- Terminal=false
- Type=Application
- MimeType=application/x-jokosher;
--Categories=Application;AudioVideo;
-+Categories=AudioVideo;
- GenericName[en_CA]=Jokosher audio editor
Deleted: packages/jokosher/trunk/debian/patches/40_load_extensions_from_unpacked_eggs.dpatch
===================================================================
--- packages/jokosher/trunk/debian/patches/40_load_extensions_from_unpacked_eggs.dpatch 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/patches/40_load_extensions_from_unpacked_eggs.dpatch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_load_extensions_from_unpacked_eggs.dpatch by Piotr Ożarowski <piotr at debian.org>
-## DP: add support for unpacked Eggs
-
- at DPATCH@
-diff -urNad jokosher-0.11.1~/Jokosher/ExtensionManager.py jokosher-0.11.1/Jokosher/ExtensionManager.py
---- jokosher-0.11.1~/Jokosher/ExtensionManager.py 2009-03-17 04:06:57.000000000 +0100
-+++ jokosher-0.11.1/Jokosher/ExtensionManager.py 2009-05-10 21:14:02.517018670 +0200
-@@ -223,6 +223,46 @@
-
- #_____________________________________________________________________
-
-+ def LoadExtensionsFromEggs(self, directory):
-+ """
-+ Tries to load Extensions fron a given directory.
-+
-+ Parameters:
-+ directory -- full path to the directory containing Eggs.
-+
-+ Returns:
-+ True -- the Extension was successfully loaded.
-+ False -- an error ocurred while trying to load the Extension,
-+ or the Extension has been disabled via the ExtensionManagerDialog.
-+ """
-+ Globals.debug("\timporting extensions from directory", directory)
-+ pkg_resources.working_set.add_entry(directory)
-+ dist_generator = pkg_resources.find_distributions(directory)
-+ for dist in dist_generator:
-+ try:
-+ extension_class = dist.load_entry_point("jokosher.extensions", "extension")
-+ # create an instance of the class
-+ extension = extension_class()
-+ filename = dist.egg_name()
-+ except Exception, e :
-+ Globals.debug("\t\t...failed.")
-+ Globals.debug(e)
-+ return False
-+
-+ # try and register the extension - continue if failed
-+ if not self.register(extension, filename, directory, False):
-+ Globals.debug("\tcannot register extension ", filename)
-+ continue
-+
-+ # if we're still here then start the extension, if its not in the extensions_blacklist
-+ if extension.EXTENSION_NAME not in Globals.settings.extensions['extensions_blacklist']:
-+ if not self.StartExtension(self.loadedExtensions[len(self.loadedExtensions)-1]["filename"]):
-+ continue
-+
-+ return True
-+
-+ #_____________________________________________________________________
-+
- def StopExtension(self, filename):
- """
- Stops the given Extension.
-@@ -343,11 +383,16 @@
- if not os.path.isdir(exten_dir):
- continue
- for filename in os.listdir(exten_dir):
-- if filename.endswith(".egg") or filename.endswith(".py"):
-+ if filename.endswith('.py'):
- self.LoadExtensionFromFile(filename, exten_dir)
- # don't block the gui when loading many extensions
- while gtk.events_pending():
- gtk.main_iteration()
-+ # handle Eggs (zipped or unpacked) here
-+ self.LoadExtensionsFromEggs(exten_dir)
-+ # don't block the gui when loading many extensions
-+ while gtk.events_pending():
-+ gtk.main_iteration()
-
- #_____________________________________________________________________
-
Deleted: packages/jokosher/trunk/debian/patches/60-hard-code-omf-location.dpatch
===================================================================
--- packages/jokosher/trunk/debian/patches/60-hard-code-omf-location.dpatch 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/patches/60-hard-code-omf-location.dpatch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60-hard-code-omf-location.dpatch by Luca Falavigna <dktrkranz at ubuntu.com>
-## DP: Fix help menu.
-
- at DPATCH@
-diff -urNad jokosher-0.11.2~/help/jokosher/jokosher-C.omf jokosher-0.11.2/help/jokosher/jokosher-C.omf
---- jokosher-0.11.2~/help/jokosher/jokosher-C.omf 2009-03-17 02:59:39.000000000 +0000
-+++ jokosher-0.11.2/help/jokosher/jokosher-C.omf 2009-05-13 12:46:22.000000000 +0000
-@@ -15,7 +15,7 @@
- <description>User manual for the Jokosher multi-track audio editor.</description>
- <type>user's guide</type>
- <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-- <identifier url="file://PATH_PLACEHOLDER"/>
-+ <identifier url="file://usr/share/gnome/help/jokosher/C/jokosher.xml"/>
- <language code="C"/>
- <relation seriesid="aba9e4e4-7f6b-11db-890b-f503d8beae45"/>
- <rights type="GNU GPL" license.version="2" holder="(Jokosher Documentation Team)"/>
Added: packages/jokosher/trunk/debian/patches/desktop_file.patch
===================================================================
--- packages/jokosher/trunk/debian/patches/desktop_file.patch (rev 0)
+++ packages/jokosher/trunk/debian/patches/desktop_file.patch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -0,0 +1,15 @@
+Description: Adhere to Freedesktop.org standards by removing deprecated entries
+Origin: Debian
+Forwarded: https://bugs.launchpad.net/jokosher/+bug/385921
+
+Index: jokosher-0.11.3/bin/jokosher.desktop
+===================================================================
+--- jokosher-0.11.3.orig/bin/jokosher.desktop 2009-11-11 22:17:13.704632027 +0100
++++ jokosher-0.11.3/bin/jokosher.desktop 2009-11-11 22:17:06.596632492 +0100
+@@ -8,5 +8,5 @@
+ Terminal=false
+ Type=Application
+ MimeType=application/x-jokosher;
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
+ GenericName[en_CA]=Jokosher audio editor
Added: packages/jokosher/trunk/debian/patches/hard-code-omf-location.patch
===================================================================
--- packages/jokosher/trunk/debian/patches/hard-code-omf-location.patch (rev 0)
+++ packages/jokosher/trunk/debian/patches/hard-code-omf-location.patch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -0,0 +1,17 @@
+Description: Fix help menu
+Origin: Debian
+Forwarded: not-needed
+
+Index: jokosher-0.11.3/help/jokosher/jokosher-C.omf
+===================================================================
+--- jokosher-0.11.3.orig/help/jokosher/jokosher-C.omf 2009-11-11 22:18:46.424631151 +0100
++++ jokosher-0.11.3/help/jokosher/jokosher-C.omf 2009-11-11 22:18:40.428633787 +0100
+@@ -15,7 +15,7 @@
+ <description>User manual for the Jokosher multi-track audio editor.</description>
+ <type>user's guide</type>
+ <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
+- <identifier url="file://PATH_PLACEHOLDER"/>
++ <identifier url="file://usr/share/gnome/help/jokosher/C/jokosher.xml"/>
+ <language code="C"/>
+ <relation seriesid="aba9e4e4-7f6b-11db-890b-f503d8beae45"/>
+ <rights type="GNU GPL" license.version="2" holder="(Jokosher Documentation Team)"/>
Added: packages/jokosher/trunk/debian/patches/load_extensions_from_unpacked_eggs.patch
===================================================================
--- packages/jokosher/trunk/debian/patches/load_extensions_from_unpacked_eggs.patch (rev 0)
+++ packages/jokosher/trunk/debian/patches/load_extensions_from_unpacked_eggs.patch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -0,0 +1,73 @@
+Description: Add support for unpacked Eggs
+Origin: Debian
+Forwarded: https://bugs.launchpad.net/jokosher/+bug/385930
+
+Index: jokosher-0.11.3/Jokosher/ExtensionManager.py
+===================================================================
+--- jokosher-0.11.3.orig/Jokosher/ExtensionManager.py 2009-11-11 22:18:03.640628491 +0100
++++ jokosher-0.11.3/Jokosher/ExtensionManager.py 2009-11-11 22:17:57.032635666 +0100
+@@ -223,6 +223,46 @@
+
+ #_____________________________________________________________________
+
++ def LoadExtensionsFromEggs(self, directory):
++ """
++ Tries to load Extensions fron a given directory.
++
++ Parameters:
++ directory -- full path to the directory containing Eggs.
++
++ Returns:
++ True -- the Extension was successfully loaded.
++ False -- an error ocurred while trying to load the Extension,
++ or the Extension has been disabled via the ExtensionManagerDialog.
++ """
++ Globals.debug("\timporting extensions from directory", directory)
++ pkg_resources.working_set.add_entry(directory)
++ dist_generator = pkg_resources.find_distributions(directory)
++ for dist in dist_generator:
++ try:
++ extension_class = dist.load_entry_point("jokosher.extensions", "extension")
++ # create an instance of the class
++ extension = extension_class()
++ filename = dist.egg_name()
++ except Exception, e :
++ Globals.debug("\t\t...failed.")
++ Globals.debug(e)
++ return False
++
++ # try and register the extension - continue if failed
++ if not self.register(extension, filename, directory, False):
++ Globals.debug("\tcannot register extension ", filename)
++ continue
++
++ # if we're still here then start the extension, if its not in the extensions_blacklist
++ if extension.EXTENSION_NAME not in Globals.settings.extensions['extensions_blacklist']:
++ if not self.StartExtension(self.loadedExtensions[len(self.loadedExtensions)-1]["filename"]):
++ continue
++
++ return True
++
++ #_____________________________________________________________________
++
+ def StopExtension(self, filename):
+ """
+ Stops the given Extension.
+@@ -343,11 +383,16 @@
+ if not os.path.isdir(exten_dir):
+ continue
+ for filename in os.listdir(exten_dir):
+- if filename.endswith(".egg") or filename.endswith(".py"):
++ if filename.endswith('.py'):
+ self.LoadExtensionFromFile(filename, exten_dir)
+ # don't block the gui when loading many extensions
+ while gtk.events_pending():
+ gtk.main_iteration()
++ # handle Eggs (zipped or unpacked) here
++ self.LoadExtensionsFromEggs(exten_dir)
++ # don't block the gui when loading many extensions
++ while gtk.events_pending():
++ gtk.main_iteration()
+
+ #_____________________________________________________________________
+
Added: packages/jokosher/trunk/debian/patches/series
===================================================================
--- packages/jokosher/trunk/debian/patches/series (rev 0)
+++ packages/jokosher/trunk/debian/patches/series 2009-11-11 21:33:20 UTC (rev 4106)
@@ -0,0 +1,4 @@
+update_mime_database.patch
+desktop_file.patch
+load_extensions_from_unpacked_eggs.patch
+hard-code-omf-location.patch
Added: packages/jokosher/trunk/debian/patches/update_mime_database.patch
===================================================================
--- packages/jokosher/trunk/debian/patches/update_mime_database.patch (rev 0)
+++ packages/jokosher/trunk/debian/patches/update_mime_database.patch 2009-11-11 21:33:20 UTC (rev 4106)
@@ -0,0 +1,31 @@
+Description: Don't call update-{mime,desktop}-database at build-time
+Origin: Debian
+Forwarded: not-needed
+
+Index: jokosher-0.11.3/setup.py
+===================================================================
+--- jokosher-0.11.3.orig/setup.py 2009-11-11 22:16:40.544634331 +0100
++++ jokosher-0.11.3/setup.py 2009-11-11 22:16:36.416634140 +0100
+@@ -98,22 +98,6 @@
+ print "Updating the scrollkeeper index..."
+ call(["scrollkeeper-update", "-o", installroot + omfdir])
+
+-# Update the mime types
+-if os.geteuid() == 0 and dist != None:
+- print "Updating the mime-types...."
+-
+- #update the mimetypes database
+- try:
+- call(["update-mime-database", "/usr/share/mime/"])
+- except:
+- pass
+-
+- #update the .desktop file database
+- try:
+- call(["update-desktop-database"])
+- except:
+- pass
+-
+ print "\nInstallation finished! You can now run Jokosher by typing 'jokosher' or through your applications menu icon."
+
+ ## To uninstall manually delete these files/folders:
Modified: packages/jokosher/trunk/debian/rules
===================================================================
--- packages/jokosher/trunk/debian/rules 2009-11-11 21:30:21 UTC (rev 4105)
+++ packages/jokosher/trunk/debian/rules 2009-11-11 21:33:20 UTC (rev 4106)
@@ -1,12 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
-
-clean: unpatch
-build: patch-stamp
-
%:
- dh $@
+ dh --with quilt $@
override_dh_auto_install:
dh_auto_install -- --install-scripts=/usr/share/jokosher --install-lib=/usr/share/jokosher
More information about the Python-apps-commits
mailing list