[Python-apps-commits] r5347 - in packages/gaupol/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Friday, June 4, 2010 @ 13:28:07
  Author: piotr
Revision: 5347

* New upstream release
* Minimum versions bumped:
  - Python to 2.6
  - python-gtk to 2.16
  - python-enchant to 1.4
* Add python-aeidon binary package
* use_packaged_configobj.patch dropped, gaupol uses JSON now
* python-glade2 and python-configobj removed from Depends, no longer needed

Modified:
  packages/gaupol/trunk/debian/changelog
  packages/gaupol/trunk/debian/control
  packages/gaupol/trunk/debian/pyversions
  packages/gaupol/trunk/debian/rules
Deleted:
  packages/gaupol/trunk/debian/patches/

Modified: packages/gaupol/trunk/debian/changelog
===================================================================
--- packages/gaupol/trunk/debian/changelog	2010-06-03 19:40:10 UTC (rev 5346)
+++ packages/gaupol/trunk/debian/changelog	2010-06-04 13:28:07 UTC (rev 5347)
@@ -1,3 +1,16 @@
+gaupol (0.16-1) experimental; urgency=low
+
+  * New upstream release
+  * Minimum versions bumped:
+    - Python to 2.6
+    - python-gtk to 2.16
+    - python-enchant to 1.4
+  * Add python-aeidon binary package
+  * use_packaged_configobj.patch dropped, gaupol uses JSON now
+  * python-glade2 and python-configobj removed from Depends, no longer needed
+
+ -- Piotr Ożarowski <piotr at debian.org>  Fri, 04 Jun 2010 09:34:45 +0200
+
 gaupol (0.15.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/gaupol/trunk/debian/control
===================================================================
--- packages/gaupol/trunk/debian/control	2010-06-03 19:40:10 UTC (rev 5346)
+++ packages/gaupol/trunk/debian/control	2010-06-04 13:28:07 UTC (rev 5347)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 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: debhelper (>= 7.0.50), python-support (>= 0.6.4), python (>= 2.6)
 Build-Depends-Indep: intltool
 Standards-Version: 3.8.4
 Homepage: http://home.gna.org/gaupol/
@@ -13,8 +13,9 @@
 Package: gaupol
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, python-configobj,
- python-gtk2 (>= 2.12), python-glade2 (>= 2.12), python-gobject (>= 2.12.3-2+b1)
+Depends: ${python:Depends}, ${misc:Depends}, python-aeidon,
+ python-gtk2 (>= 2.16), python-gobject (>= 2.12.3-2+b1),
+ python (>= 2.6) | python-simplejson
 Recommends: python-enchant (>= 1.1.5-2), iso-codes, python-chardet
 Suggests: vlc | mplayer
 Description: subtitle editor for text-based subtitle files
@@ -34,3 +35,13 @@
    * TMPlayer (.txt)
  .
  VobSubs (image-based subtitles used in DVDs) are NOT supported.
+
+Package: python-aeidon
+Architecture: all
+Section: python
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}
+Recommends: python-enchant (>= 1.4), iso-codes, 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/pyversions
===================================================================
--- packages/gaupol/trunk/debian/pyversions	2010-06-03 19:40:10 UTC (rev 5346)
+++ packages/gaupol/trunk/debian/pyversions	2010-06-04 13:28:07 UTC (rev 5347)
@@ -1 +1 @@
-2.5.1-
+2.6-

Modified: packages/gaupol/trunk/debian/rules
===================================================================
--- packages/gaupol/trunk/debian/rules	2010-06-03 19:40:10 UTC (rev 5346)
+++ packages/gaupol/trunk/debian/rules	2010-06-04 13:28:07 UTC (rev 5347)
@@ -3,14 +3,20 @@
 %:
 	dh $@
 
+#export PYVER=$(shell dpkg --compare-versions `pyversions -vd` gt 2.5 || echo 2.6)
 override_dh_auto_install:
-	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*
+	python$(PYVER) ./setup.py --without-aeidon --without-iso-codes 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/lib/run
-	dh_link /usr/share/gaupol/lib/run /usr/bin/gaupol
+	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
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS