[Python-apps-commits] r5371 - in packages/gaupol/trunk/debian (changelog control rules)

[piotr at users.alioth.debian.org]

    Date: Wednesday, June 9, 2010 @ 21:59:29
  Author: piotr
Revision: 5371

* New upstream release
* Move iso-codes from python-aeidon's Recommends to Depends
* Use "setup.py clean install" instead of "find ..." hack

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-06-09 11:59:00 UTC (rev 5370)
+++ packages/gaupol/trunk/debian/changelog	2010-06-09 21:59:29 UTC (rev 5371)
@@ -1,3 +1,11 @@
+gaupol (0.16.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Move iso-codes from python-aeidon's Recommends to Depends
+  * Use "setup.py clean install" instead of "find ..." hack
+
+ -- Piotr Ożarowski <piotr at debian.org>  Wed, 09 Jun 2010 23:04:35 +0200
+
 gaupol (0.16-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/gaupol/trunk/debian/control
===================================================================
--- packages/gaupol/trunk/debian/control	2010-06-09 11:59:00 UTC (rev 5370)
+++ packages/gaupol/trunk/debian/control	2010-06-09 21:59:29 UTC (rev 5371)
@@ -14,8 +14,7 @@
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, ${misc:Depends}, python-aeidon,
- python-gtk2 (>= 2.16), python-gobject (>= 2.12.3-2+b1),
- python (>= 2.6) | python-simplejson
+ python-gtk2 (>= 2.16), python-gobject (>= 2.12.3-2+b1)
 Recommends: python-enchant (>= 1.1.5-2), iso-codes, python-chardet
 Suggests: vlc | mplayer
 Description: subtitle editor for text-based subtitle files
@@ -40,8 +39,8 @@
 Architecture: all
 Section: python
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}
-Recommends: python-enchant (>= 1.4), iso-codes, python-chardet
+Depends: ${python:Depends}, ${misc:Depends}, iso-codes
+Recommends: python-enchant (>= 1.4), python-chardet
 Description: reading, writing and manipulating text-based subtitle files
  aeidon is separate from the gaupol package, which provides a subtitle editor
  application with a GTK+ user interface.

Modified: packages/gaupol/trunk/debian/rules
===================================================================
--- packages/gaupol/trunk/debian/rules	2010-06-09 11:59:00 UTC (rev 5370)
+++ packages/gaupol/trunk/debian/rules	2010-06-09 21:59:29 UTC (rev 5371)
@@ -5,18 +5,16 @@
 
 #export PYVER=$(shell dpkg --compare-versions `pyversions -vd` gt 2.5 || echo 2.6)
 override_dh_auto_install:
-	python$(PYVER) ./setup.py --without-aeidon --without-iso-codes install\
+	python$(PYVER) ./setup.py --without-aeidon --without-iso-codes clean install\
 	  --root=$(CURDIR)/debian/gaupol --prefix=/usr\
        	  --install-lib=/usr/share/gaupol/
-	# --without-aeidon doesn't work
-	find $(CURDIR)/debian/gaupol -type d -name aeidon | xargs rm -rf
 	# 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/run
 	dh_link /usr/share/gaupol/run /usr/bin/gaupol
 	python$(PYVER) ./setup.py --with-aeidon --without-gaupol --without-iso-codes\
-	  install --prefix=/usr --root=$(CURDIR)/debian/python-aeidon
-	# --without-gaupol doesn't work
-	find $(CURDIR)/debian/python-aeidon -type d -name gaupol | xargs rm -rf
+	  clean install --prefix=/usr --root=$(CURDIR)/debian/python-aeidon
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
+
+override_dh_auto_build: