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

[pochu-guest at users.alioth.debian.org]

    Date: Saturday, March 29, 2008 @ 20:37:16
  Author: pochu-guest
Revision: 883

  - Remove get-orig-source rule, as from now on we will use upstream
    tarballs.
  - Build-Depend on python2.5 and change XS-Python-Versions to >= 2.5
    so that the package is built with python2.5, as it fails with
    python2.4's distutils. Depend on "python (>= 2.4) | ${python:Depends}".
    This hack will be removed once python2.5 is the default python version.

Modified:
  packages/emesene/trunk/debian/changelog
  packages/emesene/trunk/debian/control
  packages/emesene/trunk/debian/rules

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-03-29 19:57:22 UTC (rev 882)
+++ packages/emesene/trunk/debian/changelog	2008-03-29 20:37:16 UTC (rev 883)
@@ -5,11 +5,10 @@
   * debian/patches/01_setup_py_update_get_orig_source.patch:
     - Removed, not needed anymore as we aren't using get-orig-source.
   * debian/rules:
-    - don't move the po/ folder in get-orig-source, as it's now installed in
-      $PREFIX/share/locale by setup.py.
+    - Remove get-orig-source rule, as from now on we will use upstream
+      tarballs.
     - Remove python-patchsys include.
     - Run dh_icons and dh_desktop
-    - Build the package with python2.5, as with python2.4 it FTBFS.
   * debian/copyright:
     - Updated.
   * debian/watch:
@@ -17,11 +16,14 @@
   * debian/emesene-launcher:
     - Update for the new Controller.py location.
   * debian/control:
-    - Build-Depend on python2.5.
+    - Build-Depend on python2.5 and change XS-Python-Versions to >= 2.5
+      so that the package is built with python2.5, as it fails with
+      python2.4's distutils. Depend on "python (>= 2.4) | ${python:Depends}".
+      This hack will be removed once python2.5 is the default python version.
     - Wrap Build-Depends.
     - Build-Depend on debhelper >= 5.0.51~ for dh_icons
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 29 Mar 2008 20:56:21 +0100
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 29 Mar 2008 21:35:19 +0100
 
 emesene (1.0~r1137-1) unstable; urgency=low
 

Modified: packages/emesene/trunk/debian/control
===================================================================
--- packages/emesene/trunk/debian/control	2008-03-29 19:57:22 UTC (rev 882)
+++ packages/emesene/trunk/debian/control	2008-03-29 20:37:16 UTC (rev 883)
@@ -8,14 +8,14 @@
                python2.5
 Build-Depends-Indep: python-central (>= 0.5.6)
 Standards-Version: 3.7.3
-XS-Python-Version: >=2.4
+XS-Python-Version: >=2.5
 Homepage: http://www.emesene.org/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/emesene/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/emesene/?op=log
 
 Package: emesene
 Architecture: all
-Depends: ${python:Depends},
+Depends: python (>= 2.4) | ${python:Depends},
          python-gtk2 (>= 2.10),
          python-cairo,
          python-gobject

Modified: packages/emesene/trunk/debian/rules
===================================================================
--- packages/emesene/trunk/debian/rules	2008-03-29 19:57:22 UTC (rev 882)
+++ packages/emesene/trunk/debian/rules	2008-03-29 20:37:16 UTC (rev 883)
@@ -7,10 +7,7 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=usr/share/emesene
-DEB_PYTHON_COMPILE_VERSION := 2.5 # let's workaround a ftbfs with distutils from python2.4
 
-SVN_REVISION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*~r([^-]+).*,\1,p')
-
 install/emesene::
 	install -m755 $(CURDIR)/debian/emesene-launcher $(CURDIR)/debian/emesene/usr/bin/emesene
 	chmod +x debian/emesene/usr/share/emesene/Controller.py
@@ -21,25 +18,3 @@
 
 clean::
 	rm -rf build
-
-get-orig-source:
-	# Get the source
-	svn export -r $(SVN_REVISION) https://emesene.svn.sourceforge.net/svnroot/emesene/trunk/emesene $(CURDIR)/emesene-1.0~r$(SVN_REVISION)
-
-	# Move the code to workaround a distutils' bug which will fail with the modules in ./ and not in ./src
-	mkdir $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/src
-	mv $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/*py $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/src/
-	mv $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/hotmlog.htm $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/src/
-	mv $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/src/setup.py $(CURDIR)/emesene-1.0~r$(SVN_REVISION)
-	mv $(CURDIR)/emesene-1.0~r$(SVN_REVISION)/abstract \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/conversation_themes \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/emesenelib \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/plugins_base \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/smilies \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/sound_themes \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/themes \
-		$(CURDIR)/emesene-1.0~r$(SVN_REVISION)/src
-
-	# Making the tarball
-	tar czf emesene_1.0~r$(SVN_REVISION).orig.tar.gz emesene-1.0~r$(SVN_REVISION)
-	rm -rf emesene-1.0~r$(SVN_REVISION)