[Python-apps-commits] r4066 - in packages/kupfer/trunk/debian (9 files)

Sat Oct 31 12:10:52 UTC 2009

Date: Saturday, October 31, 2009 @ 12:10:48
  Author: dktrkranz
Revision: 4066

Do not use D-Bus to launch kupfer, keep it simple!

Modified:
  packages/kupfer/trunk/debian/changelog
  packages/kupfer/trunk/debian/control
  packages/kupfer/trunk/debian/install
  packages/kupfer/trunk/debian/kupfer.py
  packages/kupfer/trunk/debian/links
  packages/kupfer/trunk/debian/rules
Deleted:
  packages/kupfer/trunk/debian/README.source
  packages/kupfer/trunk/debian/patches/
  packages/kupfer/trunk/debian/se.kaizer.kupfer.service

Deleted: packages/kupfer/trunk/debian/README.source
===================================================================

--- packages/kupfer/trunk/debian/README.source	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/README.source	2009-10-31 12:10:48 UTC (rev 4066)
@@ -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/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/changelog	2009-10-31 12:10:48 UTC (rev 4066)
@@ -1,10 +1,13 @@
 kupfer (0+c17-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Do not use D-Bus to launch kupfer, keep it simple!
   * debian/patches/no_buildtime_depends.patch:
-    - No longer useful, pass --no-runtime-deps to waf configure instead.
+    - No longer needed, pass --no-runtime-deps to waf configure instead.
+  * debian/patches/debian_wrappers.patch:
+    - No longer needed due to packaging refactoring.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 31 Oct 2009 11:56:03 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 31 Oct 2009 12:29:05 +0100
 
 kupfer (0+c16-1) unstable; urgency=low
 

Modified: packages/kupfer/trunk/debian/control
===================================================================
--- packages/kupfer/trunk/debian/control	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/control	2009-10-31 12:10:48 UTC (rev 4066)
@@ -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), waf
+Build-Depends: debhelper (>= 7.0.50), waf
 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/install
===================================================================
--- packages/kupfer/trunk/debian/install	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/install	2009-10-31 12:10:48 UTC (rev 4066)
@@ -1,2 +1 @@
-debian/se.kaizer.kupfer.service	usr/share/dbus-1/services
-debian/kupfer.py		usr/share/kupfer
+debian/kupfer.py	usr/share/kupfer

Modified: packages/kupfer/trunk/debian/kupfer.py
===================================================================
--- packages/kupfer/trunk/debian/kupfer.py	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/kupfer.py	2009-10-31 12:10:48 UTC (rev 4066)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 from kupfer import main
 main.main()

Modified: packages/kupfer/trunk/debian/links
===================================================================
--- packages/kupfer/trunk/debian/links	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/links	2009-10-31 12:10:48 UTC (rev 4066)
@@ -1 +1 @@
-usr/share/kupfer/kupfer-activate.sh	usr/bin/kupfer
+usr/share/kupfer/kupfer.py	usr/bin/kupfer

Modified: packages/kupfer/trunk/debian/rules
===================================================================
--- packages/kupfer/trunk/debian/rules	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/rules	2009-10-31 12:10:48 UTC (rev 4066)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@
 
 clean:
 	waf distclean
 	rm -fr build
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_configure:
 	PYTHONDIR=/usr/share/kupfer waf configure --prefix=/usr --bindir=/usr/share/kupfer --no-runtime-deps
@@ -16,6 +16,7 @@
 	rm -f $(CURDIR)/debian/kupfer/usr/share/kupfer/art/COPYING
 	rst2html Documentation/Manual.rst build/manual.html
 	rst2man Documentation/Quickstart.rst build/kupfer.1
+	sed -i 's|/usr/share/kupfer/kupfer|/usr/bin/kupfer|' $(CURDIR)debian/kupfer/usr/share/applications/kupfer.desktop
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

Deleted: packages/kupfer/trunk/debian/se.kaizer.kupfer.service
===================================================================
--- packages/kupfer/trunk/debian/se.kaizer.kupfer.service	2009-10-31 10:57:26 UTC (rev 4065)
+++ packages/kupfer/trunk/debian/se.kaizer.kupfer.service	2009-10-31 12:10:48 UTC (rev 4066)
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=se.kaizer.kupfer
-Exec=/usr/share/kupfer/kupfer.py


