[med-svn] r4684 - in trunk/packages/epigrass/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2010-03-25 09:06:45 +0000 (Thu, 25 Mar 2010)
New Revision: 4684

Modified:
   trunk/packages/epigrass/trunk/debian/changelog
   trunk/packages/epigrass/trunk/debian/control
   trunk/packages/epigrass/trunk/debian/orig-tar.sh
   trunk/packages/epigrass/trunk/debian/patches/series
   trunk/packages/epigrass/trunk/debian/rules
Log:
Try to update to new version but needs python-sqlobjects >= 0.12 which is not yet available in Debian.  Bug about this filed.


Modified: trunk/packages/epigrass/trunk/debian/changelog
===================================================================
--- trunk/packages/epigrass/trunk/debian/changelog	2010-03-25 05:07:46 UTC (rev 4683)
+++ trunk/packages/epigrass/trunk/debian/changelog	2010-03-25 09:06:45 UTC (rev 4684)
@@ -1,3 +1,20 @@
+epigrass (2.0.1~dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * Standards-Version: 3.8.4 (no changes needed)
+  * debian/orig-tar.sh: Do not only exclude sourceless PDF file
+    but also remove cruft (*.pyc, *~) from tarball which is deleted
+    by clean target anyway and breaks build process if it remains in
+    tarball
+  * debian/patches/series: Do not apply setup.diff any more because
+    the affected line is commented in new upstream setup.py so it
+    seems to become useless
+  * Standards-Version: 3.8.4 (no changes needed)
+  * Depends: python-sqlobject (>= 0.12)
+    ATTENTION: THIS VERSION IS NOT YET IN DEBIAN, WISHLIST BUG FILED.
+
+ -- Andreas Tille <tille at debian.org>  Thu, 25 Mar 2010 08:04:17 +0100
+
 epigrass (2.0b3~dfsg-2) unstable; urgency=low
 
   * Fixed watch file

Modified: trunk/packages/epigrass/trunk/debian/control
===================================================================
--- trunk/packages/epigrass/trunk/debian/control	2010-03-25 05:07:46 UTC (rev 4683)
+++ trunk/packages/epigrass/trunk/debian/control	2010-03-25 09:06:45 UTC (rev 4684)
@@ -7,8 +7,8 @@
            Charles Plessy <plessy at debian.org>,
            Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, python,
- python-setuptools, python-central (>= 0.6.0), quilt
-Standards-Version: 3.8.3
+ python-setuptools, python-central (>= 0.6.0), quilt, python-virtualenv
+Standards-Version: 3.8.4
 XS-Python-Version: current
 Homepage: http://epigrass.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/epigrass/trunk/
@@ -17,7 +17,7 @@
 Package: epigrass
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-sqlobject, python-visual, python-qt4-gl, python-qwt5-qt4 (>= 5.2.0),
+ python-sqlobject (>= 0.12), python-visual, python-qt4-gl, python-qwt5-qt4 (>= 5.2.0),
  python-numpy, python-gdal, python-visual, python-formencode, python-mysqldb,
  python-pysqlite2, python-matplotlib
 XB-Python-Version: ${python:Versions}

Modified: trunk/packages/epigrass/trunk/debian/orig-tar.sh
===================================================================
--- trunk/packages/epigrass/trunk/debian/orig-tar.sh	2010-03-25 05:07:46 UTC (rev 4683)
+++ trunk/packages/epigrass/trunk/debian/orig-tar.sh	2010-03-25 09:06:45 UTC (rev 4684)
@@ -7,7 +7,9 @@
 tar -x -z -f $3
 rm -f $3
 DFSGTARBALL=`echo $3 | sed 's/\(_[0-9.b]\+\)\(.orig.tar.gz\)/\1~dfsg\2/'`
-tar -c -z -f $DFSGTARBALL --exclude '*.pdf' $DIR
+# make sure the removed files will not show up in epigrass.egg-info/SOURCES.txt
+cd $DIR/epigrass.egg-info; sed -i -e '/\.pdf$/d' -e '/\.pyc$/d' -e '/~$/d' SOURCES.txt ; cd ../..
+tar -c -z -f $DFSGTARBALL --exclude '*.pdf' --exclude '*.pyc' --exclude '*~' $DIR
 rm -rf $DIR
 
 # move to directory 'tarballs'

Modified: trunk/packages/epigrass/trunk/debian/patches/series
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/series	2010-03-25 05:07:46 UTC (rev 4683)
+++ trunk/packages/epigrass/trunk/debian/patches/series	2010-03-25 09:06:45 UTC (rev 4684)
@@ -1,3 +1,2 @@
 sqlite3.diff
 desktop.diff
-setup.diff

Modified: trunk/packages/epigrass/trunk/debian/rules
===================================================================
--- trunk/packages/epigrass/trunk/debian/rules	2010-03-25 05:07:46 UTC (rev 4683)
+++ trunk/packages/epigrass/trunk/debian/rules	2010-03-25 09:06:45 UTC (rev 4684)
@@ -9,6 +9,12 @@
 
 LIBDIR := /usr/share/pyshared/
 
+clean::
+	rm -f setuptools-0.6c9-py2.5.egg
+
+binary/epigrass::
+	ln -s /usr/share/pyshared/support-files/setuptools-0.6c9-py2.5.egg
+
 binary-predeb/epigrass::
 	$(RM) $(DEB_DESTDIR)/usr/bin/epigrass.py
 	chmod +x $(DEB_DESTDIR)/usr/bin/epigrass