[Python-apps-commits] r4061 - in packages/pythoncad/trunk/debian (7 files)

Sat Oct 31 10:19:21 UTC 2009

Date: Saturday, October 31, 2009 @ 10:19:20
  Author: dktrkranz
Revision: 4061

Do not look for gtkpycad.png in script current working directory, use a relative path instead

Added:
  packages/pythoncad/trunk/debian/README.source
  packages/pythoncad/trunk/debian/patches/
  packages/pythoncad/trunk/debian/patches/image_path.patch
  packages/pythoncad/trunk/debian/patches/series
Modified:
  packages/pythoncad/trunk/debian/changelog
  packages/pythoncad/trunk/debian/control
  packages/pythoncad/trunk/debian/rules

Added: packages/pythoncad/trunk/debian/README.source
===================================================================

--- packages/pythoncad/trunk/debian/README.source	                        (rev 0)
+++ packages/pythoncad/trunk/debian/README.source	2009-10-31 10:19:20 UTC (rev 4061)
@@ -0,0 +1,58 @@
+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
+                break
+        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/pythoncad/trunk/debian/changelog
===================================================================
--- packages/pythoncad/trunk/debian/changelog	2009-10-30 11:38:09 UTC (rev 4060)
+++ packages/pythoncad/trunk/debian/changelog	2009-10-31 10:19:20 UTC (rev 4061)
@@ -1,9 +1,15 @@
 pythoncad (0.1.37-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Remove patches, they've been included upstream.
+  * debian/patches/as_reserved:
+    - Removed, applied upstream.
+  * debian/patches/desktop_file:
+    - Removed, applied upstream.
+  * debian/patches/image_path.patch:
+    - Do not look for gtkpycad.png in script current working directory,
+      use a relative path instead.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 29 Oct 2009 23:14:46 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 31 Oct 2009 10:45:31 +0100
 
 pythoncad (0.1.36-1) unstable; urgency=low
 

Modified: packages/pythoncad/trunk/debian/control
===================================================================
--- packages/pythoncad/trunk/debian/control	2009-10-30 11:38:09 UTC (rev 4060)
+++ packages/pythoncad/trunk/debian/control	2009-10-31 10:19:20 UTC (rev 4061)
@@ -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)
+Build-Depends: debhelper (>= 7.3.0), quilt (>= 0.46-7)
 Build-Depends-Indep: python (>= 2.4), python-support (>= 0.5.3)
 Standards-Version: 3.8.3
 Homepage: http://www.pythoncad.org

Added: packages/pythoncad/trunk/debian/patches/image_path.patch
===================================================================
--- packages/pythoncad/trunk/debian/patches/image_path.patch	                        (rev 0)
+++ packages/pythoncad/trunk/debian/patches/image_path.patch	2009-10-31 10:19:20 UTC (rev 4061)
@@ -0,0 +1,16 @@
+Description: Do not look for gtkpycad.png in script current working directory, use a relative path instead
+Origin: Debian
+
+Index: pythoncad-0.1.37/PythonCAD/Interface/Gtk/gtkimage.py
+===================================================================
+--- pythoncad-0.1.37.orig/PythonCAD/Interface/Gtk/gtkimage.py	2009-10-31 10:40:02.205649445 +0100
++++ pythoncad-0.1.37/PythonCAD/Interface/Gtk/gtkimage.py	2009-10-31 10:40:50.185646015 +0100
+@@ -154,7 +154,7 @@
+         self.__image = image
+         self.__window = gtk.Window()
+         self.__window.set_title("Untitled")
+-        self.__window.set_icon_from_file("gtkpycad.png")
++        self.__window.set_icon_from_file("/usr/share/pixmaps/gtkpycad.xpm")
+         self.__window.connect("destroy", self.__destroyEvent)
+         self.__window.connect("event", self.__windowEvent)
+         self.__window.connect("key_press_event", self.__keyPressEvent)

Added: packages/pythoncad/trunk/debian/patches/series
===================================================================
--- packages/pythoncad/trunk/debian/patches/series	                        (rev 0)
+++ packages/pythoncad/trunk/debian/patches/series	2009-10-31 10:19:20 UTC (rev 4061)
@@ -0,0 +1 @@
+image_path.patch

Modified: packages/pythoncad/trunk/debian/rules
===================================================================
--- packages/pythoncad/trunk/debian/rules	2009-10-30 11:38:09 UTC (rev 4060)
+++ packages/pythoncad/trunk/debian/rules	2009-10-31 10:19:20 UTC (rev 4061)
@@ -4,12 +4,8 @@
 TAG = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/.*\./R/')
 
 %:
-	dh $@
+	dh --buildsystem=python_distutils --with quilt $@
 
-clean:
-	rm -fr build
-	dh $@
-
 override_dh_auto_install:
 	dh_auto_install -- --install-scripts=/usr/share/pythoncad --install-lib=/usr/share/pythoncad
 


