[Python-apps-commits] r4857 - in packages/gaupol/trunk/debian (8 files)

[piotr at users.alioth.debian.org]

    Date: Thursday, February 25, 2010 @ 19:30:04
  Author: piotr
Revision: 4857

* Add --prefix=/usr to setup.py install call in order to fix FTBFS with
  python2.6 set as default (closes: 571487)
* Add use_packaged_configobj patch, add python-configobj to Depends and
  remove local copies of configobj.py and validate.py (closes: 555338)
* Package uses source format 3.0 quilt now
* Standards-Version bumped to 3.8.4 (no changes needed)

Added:
  packages/gaupol/trunk/debian/patches/
  packages/gaupol/trunk/debian/patches/series
  packages/gaupol/trunk/debian/patches/use_packaged_configobj.patch
  packages/gaupol/trunk/debian/source/
  packages/gaupol/trunk/debian/source/format
Modified:
  packages/gaupol/trunk/debian/changelog
  packages/gaupol/trunk/debian/control
  packages/gaupol/trunk/debian/rules

Modified: packages/gaupol/trunk/debian/changelog
===================================================================
--- packages/gaupol/trunk/debian/changelog	2010-02-24 23:07:28 UTC (rev 4856)
+++ packages/gaupol/trunk/debian/changelog	2010-02-25 19:30:04 UTC (rev 4857)
@@ -1,3 +1,14 @@
+gaupol (0.15-2) unstable; urgency=low
+
+  * Add --prefix=/usr to setup.py install call in order to fix FTBFS with
+    python2.6 set as default (closes: 571487)
+  * Add use_packaged_configobj patch, add python-configobj to Depends and
+    remove local copies of configobj.py and validate.py (closes: 555338)
+  * Package uses source format 3.0 quilt now
+  * Standards-Version bumped to 3.8.4 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Thu, 25 Feb 2010 20:00:01 +0100
+
 gaupol (0.15-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/gaupol/trunk/debian/control
===================================================================
--- packages/gaupol/trunk/debian/control	2010-02-24 23:07:28 UTC (rev 4856)
+++ packages/gaupol/trunk/debian/control	2010-02-25 19:30:04 UTC (rev 4857)
@@ -5,7 +5,7 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50), python, python-support (>= 0.6.4), python (>= 2.5.1)
 Build-Depends-Indep: intltool
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Homepage: http://home.gna.org/gaupol/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/gaupol/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/gaupol/trunk/
@@ -13,7 +13,7 @@
 Package: gaupol
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends},
+Depends: ${python:Depends}, ${misc:Depends}, python-configobj,
  python-gtk2 (>= 2.12), python-glade2 (>= 2.12), python-gobject (>= 2.12.3-2+b1)
 Recommends: python-enchant (>= 1.1.5-2), iso-codes, python-chardet
 Suggests: vlc | mplayer

Added: packages/gaupol/trunk/debian/patches/series
===================================================================
--- packages/gaupol/trunk/debian/patches/series	                        (rev 0)
+++ packages/gaupol/trunk/debian/patches/series	2010-02-25 19:30:04 UTC (rev 4857)
@@ -0,0 +1 @@
+use_packaged_configobj.patch

Added: packages/gaupol/trunk/debian/patches/use_packaged_configobj.patch
===================================================================
--- packages/gaupol/trunk/debian/patches/use_packaged_configobj.patch	                        (rev 0)
+++ packages/gaupol/trunk/debian/patches/use_packaged_configobj.patch	2010-02-25 19:30:04 UTC (rev 4857)
@@ -0,0 +1,14 @@
+# use configobj module from python-configobj package
+Index: gaupol-0.15/gaupol/gtk/conf/config.py
+===================================================================
+--- gaupol-0.15.orig/gaupol/gtk/conf/config.py
++++ gaupol-0.15/gaupol/gtk/conf/config.py
+@@ -21,7 +21,7 @@ import gaupol.gtk
+ import os
+ import sys
+ 
+-from . import configobj, validate
++import configobj, validate
+ 
+ 
+ class Config(configobj.ConfigObj):

Modified: packages/gaupol/trunk/debian/rules
===================================================================
--- packages/gaupol/trunk/debian/rules	2010-02-24 23:07:28 UTC (rev 4856)
+++ packages/gaupol/trunk/debian/rules	2010-02-25 19:30:04 UTC (rev 4857)
@@ -4,9 +4,12 @@
 	dh $@
 
 override_dh_auto_install:
-	python ./setup.py install --root=$(CURDIR)/debian/gaupol --install-lib=/usr/share/gaupol/lib/
+	python ./setup.py install --root=$(CURDIR)/debian/gaupol --install-lib=/usr/share/gaupol/lib/ --prefix=/usr
+	# python-configobj provides these files:
+	rm -f $(CURDIR)/debian/gaupol/usr/share/gaupol/lib/gaupol/gtk/conf/configobj.py*
+	rm -f $(CURDIR)/debian/gaupol/usr/share/gaupol/lib/gaupol/gtk/conf/validate.py*
 	# rename the binary instead of using --install-scripts (due to name conflict)
-	mv $(CURDIR)/debian/gaupol//usr/bin/gaupol $(CURDIR)/debian/gaupol/usr/share/gaupol/lib/run
+	mv $(CURDIR)/debian/gaupol/usr/bin/gaupol $(CURDIR)/debian/gaupol/usr/share/gaupol/lib/run
 	dh_link /usr/share/gaupol/lib/run /usr/bin/gaupol
 
 override_dh_installchangelogs:

Added: packages/gaupol/trunk/debian/source/format
===================================================================
--- packages/gaupol/trunk/debian/source/format	                        (rev 0)
+++ packages/gaupol/trunk/debian/source/format	2010-02-25 19:30:04 UTC (rev 4857)
@@ -0,0 +1 @@
+3.0 (quilt)