[Python-apps-commits] r5078 - in packages/indywiki/trunk/debian (7 files)

Sun Apr 4 10:17:16 UTC 2010

Date: Sunday, April 4, 2010 @ 10:17:10
  Author: sez-guest
Revision: 5078

indywiki/0.9.9.1-5

  * Bump Standards-Version to 3.8.4 (no changes)
  * Switch dpkg-source format to 3.0 (quilt)
    * debian/control: drop Depends: quilt
    * debian/rules: drop patch-related stuff
  * Revise debian/rules to use dh overrides and depend on debhelper >= 7.0.50~
  * Apply python 2.6 fixes (thanks to Jonathan Wiltshire for the patch)
      - do not install the indywiki script in /usr/local/ (Closes: #571476)
      - bump the minimum python-support dependency to 0.90
  * Add missing ${misc:Depends}
  * Add DEP-3 headers to patches

Modified:
  packages/indywiki/trunk/debian/changelog
  packages/indywiki/trunk/debian/control
  packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff
  packages/indywiki/trunk/debian/patches/fix-imports.diff
  packages/indywiki/trunk/debian/patches/non-native.diff
  packages/indywiki/trunk/debian/rules
  packages/indywiki/trunk/debian/source/format

Modified: packages/indywiki/trunk/debian/changelog
===================================================================

--- packages/indywiki/trunk/debian/changelog	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/changelog	2010-04-04 10:17:10 UTC (rev 5078)
@@ -1,8 +1,17 @@
-indywiki (0.9.9.1-5) UNRELEASED; urgency=low
+indywiki (0.9.9.1-5) unstable; urgency=low
 
-  * Added a README.source, as required by Debian Policy Manual section 4.14
+  * Bump Standards-Version to 3.8.4 (no changes)
+  * Switch dpkg-source format to 3.0 (quilt)
+    * debian/control: drop Depends: quilt
+    * debian/rules: drop patch-related stuff
+  * Revise debian/rules to use dh overrides and depend on debhelper >= 7.0.50~
+  * Apply python 2.6 fixes (thanks to Jonathan Wiltshire for the patch)
+      - do not install the indywiki script in /usr/local/ (Closes: #571476)
+      - bump the minimum python-support dependency to 0.90
+  * Add missing ${misc:Depends}
+  * Add DEP-3 headers to patches
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sun, 15 Nov 2009 10:53:35 -0500
+ -- Serafeim Zanikolas <serzan at hellug.gr>  Sun, 28 Feb 2010 13:02:34 +0100
 
 indywiki (0.9.9.1-4) unstable; urgency=low
 

Modified: packages/indywiki/trunk/debian/control
===================================================================
--- packages/indywiki/trunk/debian/control	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/control	2010-04-04 10:17:10 UTC (rev 5078)
@@ -3,15 +3,16 @@
 Priority: optional
 Maintainer: Serafeim Zanikolas <serzan at hellug.gr>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 6), python, python-support (>= 0.6), quilt, python-setuptools
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~), python, python-support (>= 0.90), python-setuptools
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/indywiki/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/indywiki/trunk/
 Homepage: http://indywiki.sf.net
 
 Package: indywiki
 Architecture: all
-Depends: ${python:Depends}, python-pkg-resources, python-qt4, python-nodebox-web
+Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-qt4,
+         python-nodebox-web
 Description: visual Wikipedia browser
  Indywiki provides a visually-driven and intuitive way of browsing Wikipedia.
  Indywiki's window is split in two parts, one with images related to the

Modified: packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff
===================================================================
--- packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/patches/do-nothing-on-bg-colour-cancel.diff	2010-04-04 10:17:10 UTC (rev 5078)
@@ -1,3 +1,6 @@
+# Description: don't change the background colour when "cancel" is pressed
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Last-Update: 2010-02-28
 diff -u indywiki/src/indywiki/indywiki.py indywiki-0.9.9/src/indywiki/indywiki.py
 --- indywiki/src/indywiki/indywiki.py	2008-06-29 00:24:28.000000000 +0100
 +++ indywiki-0.9.9/src/indywiki/indywiki.py	2008-06-29 00:24:00.000000000 +0100

Modified: packages/indywiki/trunk/debian/patches/fix-imports.diff
===================================================================
--- packages/indywiki/trunk/debian/patches/fix-imports.diff	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/patches/fix-imports.diff	2010-04-04 10:17:10 UTC (rev 5078)
@@ -1,3 +1,6 @@
+# Description: fix imports of the nodebox-web library
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Last-Update: 2010-02-28
 diff -ru indywiki/src/indywiki/config.py indywiki-0.9.9/src/indywiki/config.py
 --- indywiki/src/indywiki/config.py	2008-05-12 10:35:29.000000000 +0100
 +++ indywiki-0.9.9/src/indywiki/config.py	2008-05-16 23:31:22.000000000 +0100

Modified: packages/indywiki/trunk/debian/patches/non-native.diff
===================================================================
--- packages/indywiki/trunk/debian/patches/non-native.diff	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/patches/non-native.diff	2010-04-04 10:17:10 UTC (rev 5078)
@@ -1,3 +1,7 @@
+# Description: don't change the background colour when "cancel" is pressed
+# Author: Serafeim Zanikolas <serzan at hellug.gr>
+# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488464
+# Last-Update: 2010-02-28
 Index: indywiki/src/indywiki/indywiki.py
 ===================================================================
 --- indywiki.orig/src/indywiki/indywiki.py	2009-02-22 14:37:21.000000000 +0000

Modified: packages/indywiki/trunk/debian/rules
===================================================================
--- packages/indywiki/trunk/debian/rules	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/rules	2010-04-04 10:17:10 UTC (rev 5078)
@@ -2,45 +2,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+%:
+	dh $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	python setup.py clean --all
-	rm -rf src/indywiki*egg-info
-	dh_clean
-
-build: build-stamp
-	rm -rf src/indywiki/web1 # remove embedded code
-	python setup.py build
-
-build-stamp: patch
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	python setup.py install --root="$(CURDIR)/debian/indywiki" --no-compile
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_link
-	dh_installchangelogs
-	dh_install --list-missing
-	dh_installdocs
+override_dh_compress:
 	dh_installman debian/indywiki.1
-	dh_pysupport
-	dh_fixperms
+	# remove embedded copy of the nodebox-web library
+	rm -rf debian/indywiki/usr/share/pyshared/indywiki/web1/
 	dh_compress
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build install
-# nothing for a python package
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Modified: packages/indywiki/trunk/debian/source/format
===================================================================
--- packages/indywiki/trunk/debian/source/format	2010-04-03 12:38:00 UTC (rev 5077)
+++ packages/indywiki/trunk/debian/source/format	2010-04-04 10:17:10 UTC (rev 5078)
@@ -1 +1 @@
-1.0
+3.0 (quilt)


