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

Sat Jul 10 05:03:47 UTC 2010

Author: tille
Date: 2010-07-10 05:03:44 +0000 (Sat, 10 Jul 2010)
New Revision: 5019

Removed:
   trunk/packages/epigrass/trunk/debian/patches/desktop.diff
   trunk/packages/epigrass/trunk/debian/patches/setup.diff
   trunk/packages/epigrass/trunk/debian/pycompat
Modified:
   trunk/packages/epigrass/trunk/debian/changelog
   trunk/packages/epigrass/trunk/debian/control
   trunk/packages/epigrass/trunk/debian/epigrass.install
   trunk/packages/epigrass/trunk/debian/patches/series
   trunk/packages/epigrass/trunk/debian/rules
Log:
Switch from python-central to python-support, other cleanups


Modified: trunk/packages/epigrass/trunk/debian/changelog
===================================================================

--- trunk/packages/epigrass/trunk/debian/changelog	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/changelog	2010-07-10 05:03:44 UTC (rev 5019)
@@ -5,14 +5,16 @@
     and thus there is no need for stripping the source tarball any
     more.
     -> rm debian/orig-tar.sh, adapted debian/watch
+    -> rm debian/README.Debian which talks about missing source for doc
   * debian/patches/desktop.diff: removed, because debian/epigras.desktop
     is used anyway instead of the patched upstream desktop file
-  * debian/control:
-    - additional package epigrass-doc
-    - making the SourceForge project page the homepage.
+  * debian/control: additional package epigrass-doc
   * Replace debian/references by debian/upstream-metadata.yaml
+  * debian/rules: Do not try to edit pyshared files
+  * Standards-Version: 3.9.0 (no changes needed)
+  * Increased versioned debhelper dependency to >= 7.1
 
- -- Andreas Tille <tille at debian.org>  Sat, 10 Apr 2010 16:37:04 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 09 Jul 2010 14:46:45 +0200
 
 epigrass (2.0.1~dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/epigrass/trunk/debian/control
===================================================================
--- trunk/packages/epigrass/trunk/debian/control	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/control	2010-07-10 05:03:44 UTC (rev 5019)
@@ -6,11 +6,11 @@
            Varun Hiremath <varun at debian.org>,
            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, python-virtualenv
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.1), cdbs, python,
+ python-setuptools, python-support, quilt, python-virtualenv
+Standards-Version: 3.9.0
 XS-Python-Version: current
-Homepage: http://sourceforge.net/projects/epigrass/
+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
 

Modified: trunk/packages/epigrass/trunk/debian/epigrass.install
===================================================================
--- trunk/packages/epigrass/trunk/debian/epigrass.install	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/epigrass.install	2010-07-10 05:03:44 UTC (rev 5019)
@@ -1 +1 @@
-debian/epigrass.desktop usr/share/applications
+usr

Deleted: trunk/packages/epigrass/trunk/debian/patches/desktop.diff
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/desktop.diff	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/patches/desktop.diff	2010-07-10 05:03:44 UTC (rev 5019)
@@ -1,21 +0,0 @@
-Author: V. Hiremath, C. Plessy.
-Puropose: Make epigrass.desktop with FD.o’s Desktop Menu Specification.
- See http://standards.freedesktop.org/menu-spec/latest/index.html
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2785928&group_id=128000&atid=710326
-License: same as Epigrass itself.
-Index: epigrass-2.0b3/epigrass.desktop
-===================================================================
---- epigrass-2.0b3.orig/epigrass.desktop
-+++ epigrass-2.0b3/epigrass.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Epigrass
- Comment=Epidemics Simulator
- GenericName=Epidemics Simulator
-@@ -8,4 +7,4 @@
- Type=Application
- StartupNotify=false
- Terminal=false
--Categories=Science
-+Categories=MedicalSoftware;Science;Education;

Modified: trunk/packages/epigrass/trunk/debian/patches/series
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/series	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/patches/series	2010-07-10 05:03:44 UTC (rev 5019)
@@ -1,2 +1 @@
 sqlite3.diff
-desktop.diff

Deleted: trunk/packages/epigrass/trunk/debian/patches/setup.diff
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/setup.diff	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/patches/setup.diff	2010-07-10 05:03:44 UTC (rev 5019)
@@ -1,15 +0,0 @@
-Author: V. Hiremath, C. Plessy.
-Puropose: “Free” the Debian epigrass package by removing the documentation.
-Forwarded: no
-License: same as Epigrass itself.
-Index: epigrass-2.0b3/setup.py
-===================================================================
---- epigrass-2.0b3.orig/setup.py
-+++ epigrass-2.0b3/setup.py
-@@ -34,5 +34,5 @@
- 
-     include_package_data = True,
-     package_data = {'':['INSTALL','README','COPYING','epigrass.desktop']},
--    data_files = [('/usr/share/pixmaps',['egicon.png']),('/usr/share/doc/epigrass/demos',demos),('/usr/share/doc/epigrass/',['docs/build/latex/Epigrass.pdf']),('/usr/share/applications',['epigrass.desktop'])]
-+    data_files = [('/usr/share/pixmaps',['egicon.png']),('/usr/share/doc/epigrass/demos',demos),('/usr/share/applications',['epigrass.desktop'])]
-     )

Deleted: trunk/packages/epigrass/trunk/debian/pycompat
===================================================================
--- trunk/packages/epigrass/trunk/debian/pycompat	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/pycompat	2010-07-10 05:03:44 UTC (rev 5019)
@@ -1 +0,0 @@
-2

Modified: trunk/packages/epigrass/trunk/debian/rules
===================================================================
--- trunk/packages/epigrass/trunk/debian/rules	2010-07-10 05:01:28 UTC (rev 5018)
+++ trunk/packages/epigrass/trunk/debian/rules	2010-07-10 05:03:44 UTC (rev 5019)
@@ -1,25 +1,23 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pycentral
-DEB_COMPRESS_EXCLUDE := .py .epg .csv
+DEB_PYTHON_SYSTEM := pysupport
+DEB_COMPRESS_EXCLUDE := .py .epg .csv .pdf
 
 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
 
-LIBDIR := /usr/share/pyshared/
-
 clean::
-	rm -f setuptools-0.6c9-py2.5.egg
+	# *.pyc files should be cleaned in principle, but are part of upstream tarball
+	# rm -f Epigrass/*.pyc
 
-binary/epigrass::
-	ln -s /usr/share/pyshared/support-files/setuptools-0.6c9-py2.5.egg
+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
-	find $(DEB_DESTDIR)$(LIBDIR) -type f | xargs sed -i '/^#!/d'
-	find $(DEB_DESTDIR)$(LIBDIR) -type f | xargs chmod -x
 
 get-orig-source:
 	uscan --upstream-version 0


