[Python-apps-commits] r4074 - in packages/kupfer/trunk/debian (8 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Sun Nov 1 21:35:58 UTC 2009
Date: Sunday, November 1, 2009 @ 21:35:57
Author: dktrkranz
Revision: 4074
Reintroduce kupfer-activate.sh, required for some features, also
reintroduce debian_path.patch to adjust file locations.
Added:
packages/kupfer/trunk/debian/README.source
packages/kupfer/trunk/debian/patches/
packages/kupfer/trunk/debian/patches/debian_path.patch
packages/kupfer/trunk/debian/patches/series
Modified:
packages/kupfer/trunk/debian/changelog
packages/kupfer/trunk/debian/control
packages/kupfer/trunk/debian/links
packages/kupfer/trunk/debian/rules
Added: packages/kupfer/trunk/debian/README.source
===================================================================
--- packages/kupfer/trunk/debian/README.source (rev 0)
+++ packages/kupfer/trunk/debian/README.source 2009-11-01 21:35:57 UTC (rev 4074)
@@ -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/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog 2009-11-01 20:14:43 UTC (rev 4073)
+++ packages/kupfer/trunk/debian/changelog 2009-11-01 21:35:57 UTC (rev 4074)
@@ -1,3 +1,10 @@
+kupfer (0+c17-2) unstable; urgency=low
+
+ * Reintroduce kupfer-activate.sh, required for some features, also
+ reintroduce debian_path.patch to adjust file locations.
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 01 Nov 2009 21:30:35 +0100
+
kupfer (0+c17-1) unstable; urgency=low
* New upstream release.
Modified: packages/kupfer/trunk/debian/control
===================================================================
--- packages/kupfer/trunk/debian/control 2009-11-01 20:14:43 UTC (rev 4073)
+++ packages/kupfer/trunk/debian/control 2009-11-01 21:35:57 UTC (rev 4074)
@@ -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), waf
+Build-Depends: debhelper (>= 7.0.50), waf, quilt (>= 0.46-7)
Build-Depends-Indep: python-support (>= 0.5.3), python (>= 2.5), gettext, intltool, python-docutils, rst2man
Standards-Version: 3.8.3
XS-Python-Version: >= 2.5
Modified: packages/kupfer/trunk/debian/links
===================================================================
--- packages/kupfer/trunk/debian/links 2009-11-01 20:14:43 UTC (rev 4073)
+++ packages/kupfer/trunk/debian/links 2009-11-01 21:35:57 UTC (rev 4074)
@@ -1 +1 @@
-usr/share/kupfer/kupfer.py usr/bin/kupfer
+usr/share/kupfer/kupfer-activate.sh usr/bin/kupfer
Added: packages/kupfer/trunk/debian/patches/debian_path.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/debian_path.patch (rev 0)
+++ packages/kupfer/trunk/debian/patches/debian_path.patch 2009-11-01 21:35:57 UTC (rev 4074)
@@ -0,0 +1,40 @@
+Description: Adjust path to match Debian packaging
+Origin: Debian
+Forwarded: not-needed
+
+Index: kupfer-0+c17/data/kupfer.desktop.in.in
+===================================================================
+--- kupfer-0+c17.orig/data/kupfer.desktop.in.in 2009-11-01 21:28:08.184210116 +0100
++++ kupfer-0+c17/data/kupfer.desktop.in.in 2009-11-01 21:28:13.536207000 +0100
+@@ -4,7 +4,7 @@
+ _GenericName=Application Launcher
+ _Comment=Convenient command and access tool for applications and documents
+ Icon=search
+-Exec=@KUPFER@ %f
++Exec=kupfer %f
+ Type=Application
+ Categories=Utility;
+ StartupNotify=true
+Index: kupfer-0+c17/kupfer-activate.sh
+===================================================================
+--- kupfer-0+c17.orig/kupfer-activate.sh 2009-11-01 21:28:08.036202415 +0100
++++ kupfer-0+c17/kupfer-activate.sh 2009-11-01 21:28:13.536207000 +0100
+@@ -17,4 +17,4 @@
+
+ test \( $KUPFER_HAS_CLIARGS = 0 -a $KUPFER_HAS_OPTIONS != 0 \) && dbus-send --print-reply --dest=se.kaizer.kupfer /interface se.kaizer.kupfer.Listener.PutText string:"$PWD" string:"$*" >/dev/null 2>&1
+
+-test $KUPFER_RUNNING != 0 && exec ${PYTHON} -m kupfer.__init__ $* || ${PYTHON} -c "import gtk.gdk; gtk.gdk.notify_startup_complete()"
++test $KUPFER_RUNNING != 0 && exec /usr/share/kupfer/kupfer.py $* || ${PYTHON} -c "import gtk.gdk; gtk.gdk.notify_startup_complete()"
+Index: kupfer-0+c17/wscript
+===================================================================
+--- kupfer-0+c17.orig/wscript 2009-11-01 21:28:37.120208071 +0100
++++ kupfer-0+c17/wscript 2009-11-01 21:29:10.472194771 +0100
+@@ -168,7 +168,7 @@
+ binary_subst_file = "kupfer-activate.sh"
+ bin = bld.new_task_gen("subst",
+ source = binary_subst_file,
+- target = "data/kupfer",
++ target = "data/kupfer-activate.sh",
+ install_path = "${BINDIR}",
+ chmod = 0755,
+ dict = {"PYTHON": bld.env["PYTHON"]}
Added: packages/kupfer/trunk/debian/patches/series
===================================================================
--- packages/kupfer/trunk/debian/patches/series (rev 0)
+++ packages/kupfer/trunk/debian/patches/series 2009-11-01 21:35:57 UTC (rev 4074)
@@ -0,0 +1 @@
+debian_path.patch
Modified: packages/kupfer/trunk/debian/rules
===================================================================
--- packages/kupfer/trunk/debian/rules 2009-11-01 20:14:43 UTC (rev 4073)
+++ packages/kupfer/trunk/debian/rules 2009-11-01 21:35:57 UTC (rev 4074)
@@ -1,12 +1,12 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh --with quilt $@
clean:
waf distclean
rm -fr build
- dh $@
+ dh --with quilt $@
override_dh_auto_configure:
PYTHONDIR=/usr/share/kupfer waf configure --prefix=/usr --bindir=/usr/share/kupfer --no-runtime-deps
@@ -17,10 +17,6 @@
rst2html Documentation/Manual.rst build/manual.html
rst2man Documentation/Quickstart.rst build/kupfer.1
-override_dh_install:
- dh_install
- sed -i 's|/usr/share/kupfer/||' $(CURDIR)/debian/kupfer/usr/share/applications/kupfer.desktop
-
override_dh_installchangelogs:
dh_installchangelogs NEWS
More information about the Python-apps-commits
mailing list