[med-svn] r8339 - trunk/packages/epigrass/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-10-28 13:20:52 +0000 (Fri, 28 Oct 2011)
New Revision: 8339

Modified:
   trunk/packages/epigrass/trunk/debian/changelog
   trunk/packages/epigrass/trunk/debian/compat
   trunk/packages/epigrass/trunk/debian/control
   trunk/packages/epigrass/trunk/debian/epigrass.install
   trunk/packages/epigrass/trunk/debian/rules
Log:
Fix Dependencies; packaging updates incl. switching to dh_python2


Modified: trunk/packages/epigrass/trunk/debian/changelog
===================================================================
--- trunk/packages/epigrass/trunk/debian/changelog	2011-10-28 12:24:03 UTC (rev 8338)
+++ trunk/packages/epigrass/trunk/debian/changelog	2011-10-28 13:20:52 UTC (rev 8339)
@@ -1,3 +1,14 @@
+epigrass (2.0.4-2) unstable; urgency=low
+
+  * debian/control: Depends: python-pkg-resources
+    Closes: #640098
+  * Standards-Version: 3.9.2 (no changes needed)
+  * Fixed Vcs fields
+  * Debhelper 8 (control+compat)
+  * debian/rules: Switch to dh_python2
+
+ -- Andreas Tille <tille at debian.org>  Fri, 28 Oct 2011 14:54:25 +0200
+
 epigrass (2.0.4-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/epigrass/trunk/debian/compat
===================================================================
--- trunk/packages/epigrass/trunk/debian/compat	2011-10-28 12:24:03 UTC (rev 8338)
+++ trunk/packages/epigrass/trunk/debian/compat	2011-10-28 13:20:52 UTC (rev 8339)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/epigrass/trunk/debian/control
===================================================================
--- trunk/packages/epigrass/trunk/debian/control	2011-10-28 12:24:03 UTC (rev 8338)
+++ trunk/packages/epigrass/trunk/debian/control	2011-10-28 13:20:52 UTC (rev 8339)
@@ -6,19 +6,19 @@
            Varun Hiremath <varun at debian.org>,
            Charles Plessy <plessy at debian.org>,
            Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), cdbs, python,
+Build-Depends: debhelper (>= 8), python (>= 2.6),
  python-setuptools, python-support, quilt, python-virtualenv
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://epigrass.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/epigrass/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/epigrass/trunk/?rev=0&sc=0
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/epigrass/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/epigrass/trunk/
 
 Package: epigrass
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python-sqlobject (>= 0.12.4-2), 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, python-networkx
+ python-pysqlite2, python-matplotlib, python-networkx, python-pkg-resources
 Suggests: grass, epigrass-doc
 Description: scientific tool for simulations and scenario analysis in network epidemiology
  Epigrass is a software for visualizing, analyzing and simulating of
@@ -42,4 +42,3 @@
  require an installation of the GRASS GIS for most of its features.
  .
  This package contains the documentation.
-

Modified: trunk/packages/epigrass/trunk/debian/epigrass.install
===================================================================
--- trunk/packages/epigrass/trunk/debian/epigrass.install	2011-10-28 12:24:03 UTC (rev 8338)
+++ trunk/packages/epigrass/trunk/debian/epigrass.install	2011-10-28 13:20:52 UTC (rev 8339)
@@ -1 +1,2 @@
 usr
+debian/epigrass.desktop	usr/share/applications

Modified: trunk/packages/epigrass/trunk/debian/rules
===================================================================
--- trunk/packages/epigrass/trunk/debian/rules	2011-10-28 12:24:03 UTC (rev 8338)
+++ trunk/packages/epigrass/trunk/debian/rules	2011-10-28 13:20:52 UTC (rev 8339)
@@ -1,23 +1,11 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pysupport
-DEB_COMPRESS_EXCLUDE := .py .epg .csv .pdf
+%:
+	dh $@ --with quilt --with python2
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-clean::
+# override_dh_clean:
 	# *.pyc files should be cleaned in principle, but are part of upstream tarball
 	# rm -f Epigrass/*.pyc
 
-install/epigrass::
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications
-	cp -a debian/epigrass.desktop $(CURDIR)/debian/tmp/usr/share/applications
-
-binary-predeb/epigrass::
-	$(RM) $(DEB_DESTDIR)/usr/bin/epigrass.py
-	chmod +x $(DEB_DESTDIR)/usr/bin/epigrass
-
 get-orig-source:
 	uscan --upstream-version 0