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

Charles Plessy plessy at alioth.debian.org
Sun May 3 06:00:55 UTC 2009 

Author: plessy
Date: 2009-05-03 06:00:52 +0000 (Sun, 03 May 2009)
New Revision: 3352

Added:
   trunk/packages/epigrass/trunk/debian/patches/desktop.diff
Modified:
   trunk/packages/epigrass/trunk/debian/README.source
   trunk/packages/epigrass/trunk/debian/changelog
   trunk/packages/epigrass/trunk/debian/control
   trunk/packages/epigrass/trunk/debian/copyright
   trunk/packages/epigrass/trunk/debian/rules
   trunk/packages/epigrass/trunk/debian/watch
Log:
Emergency commit since I just realised that Andreas and me are not working on the same version.

This is one more reason for switching to git ;)


Modified: trunk/packages/epigrass/trunk/debian/README.source
===================================================================
--- trunk/packages/epigrass/trunk/debian/README.source	2009-05-03 05:53:27 UTC (rev 3351)
+++ trunk/packages/epigrass/trunk/debian/README.source	2009-05-03 06:00:52 UTC (rev 3352)
@@ -1,2 +1,5 @@
 This packages uses a patch system. Please read
 /usr/share/doc/quilt/README.source for more informations.
+
+New upstream releases are temporarly stored in the Python Package Index, but
+will come back to SourceForge later.

Modified: trunk/packages/epigrass/trunk/debian/changelog
===================================================================
--- trunk/packages/epigrass/trunk/debian/changelog	2009-05-03 05:53:27 UTC (rev 3351)
+++ trunk/packages/epigrass/trunk/debian/changelog	2009-05-03 06:00:52 UTC (rev 3352)
@@ -1,7 +1,7 @@
-epigrass (2.0b1-1) UNRELEASED; urgency=low
+epigrass (2.0b3~dfsg-1) UNRELEASED; urgency=low
 
   [ Charles Plessy ]
-  * New upstream release.
+  * New upstream release (LP: #271789).
   * debian/control:
     - Switch to debhelper 7 (also in debian/compat). 
     - Dropped versionned dependancy on CDBS (satisfied even in oldstable)
@@ -9,15 +9,28 @@
       latest Policy (added README.source).
     - Added myself to the Uploaders.
     - Suggests: grass.
+  * debian/watch: updated to look in the Python Package Index.
+  * debian/patches refreshed and documented:
+    - desktop.diff: added MedicalSoftware category and kept Education because
+      at least one Main Category must be supported.
+    - setup.diff (deletion of sourceless documentation).
+    - sqlite3.diff (purpose not understood yet).
+  * debian/copyright updated and converted to machine-readable format
 
   [ Andreas Tille ]
   * Added myself to Uploaders
-  * Upstream does not ship epigrass.desktop file any more so we provide
-    our own.
   * debian/watch: use sf redirector
 
  -- Andreas Tille <tille at debian.org>  Sun, 03 May 2009 07:39:46 +0200
 
+epigrass (1.5.1-4) unstable; urgency=low
+
+  * debian/control:
+    - Depends on python-matplotlib (Closes: #509863, LP: #295625).
+    - Added myself to Uploaders.
+
+ -- Charles Plessy <plessy at debian.org>  Sun, 28 Dec 2008 13:32:04 +0100
+
 epigrass (1.5.1-3) unstable; urgency=low
 
   * Change Build-Depends: python-central (>= 0.6.0) (Closes: #472034)

Modified: trunk/packages/epigrass/trunk/debian/control
===================================================================
--- trunk/packages/epigrass/trunk/debian/control	2009-05-03 05:53:27 UTC (rev 3351)
+++ trunk/packages/epigrass/trunk/debian/control	2009-05-03 06:00:52 UTC (rev 3352)
@@ -19,7 +19,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python-sqlobject, python-visual, python-qt3, python-numpy,
  python-gdal, python-visual, python-formencode, python-mysqldb,
- python-pysqlite2
+ python-pysqlite2, python-matplotlib
 XB-Python-Version: ${python:Versions}
 Suggests: grass
 Description: scientific tool for simulations and scenario analysis in network epidemiology

Modified: trunk/packages/epigrass/trunk/debian/copyright
===================================================================
--- trunk/packages/epigrass/trunk/debian/copyright	2009-05-03 05:53:27 UTC (rev 3351)
+++ trunk/packages/epigrass/trunk/debian/copyright	2009-05-03 06:00:52 UTC (rev 3352)
@@ -1,28 +1,36 @@
-This package was debianized by Varun Hiremath <varunhiremath at gmail.com> on
-Mon,  4 Dec 2006 23:54:51 +0530.
+Format: Machine-readable license summary, see http://dep.debian.net/deps/dep5/
 
-It was downloaded from <http://dl.sourceforge.net/sourceforge/epigrass/epigrass-2.0b1.tar.gz>
-
-Upstream Author: 
+Name: Epigrass
+Contact:
     Flávio Codeço Coelho <fccoelho at fiocruz.br>
     Cláudia Torres Codeço <codeco at fiocruz.br>
+Source: http://pypi.python.org/packages/source/e/epigrass/epigrass-2.0b3.tar.gz
 
 Copyright: (c) 2006, Flávio Codeço Coelho <fccoelho at fiocruz.br>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+Comment:
+ On Debian systems, you can find the GPL license version 2 in:
+ /usr/share/common-licenses/GPL-2
 
+Files: Epigrass/pylabQtcanvas.py
+Copyright: 2005, Florent Rougon
 License:
+ This file is an example program for matplotlib. It may be used and
+ modified with no restriction; raw copies as well as modified versions
+ may be distributed without limitation.
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    On Debian systems, you can find the GPL license in:
-    /usr/share/common-licenses/GPL
-
-The Debian packaging is (C) 2006, Varun Hiremath <varunhiremath at gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright: 2006–2008, Varun Hiremath   <varun at debian.org>
+             2007,    Torsten Werner <twerner at debian.org>
+           2008–2009, Charles Plessy  <plessy at debian.org>
+License: GPL-2+

Copied: trunk/packages/epigrass/trunk/debian/patches/desktop.diff (from rev 3349, trunk/packages/epigrass/trunk/debian/patches/desktop.diff)
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/desktop.diff	                        (rev 0)
+++ trunk/packages/epigrass/trunk/debian/patches/desktop.diff	2009-05-03 06:00:52 UTC (rev 3352)
@@ -0,0 +1,21 @@
+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/rules
===================================================================
--- trunk/packages/epigrass/trunk/debian/rules	2009-05-03 05:53:27 UTC (rev 3351)
+++ trunk/packages/epigrass/trunk/debian/rules	2009-05-03 06:00:52 UTC (rev 3352)
@@ -10,8 +10,8 @@
 LIBDIR := /usr/share/pyshared/
 
 binary-predeb/epigrass::
-	sed '1s/python.*/python/' $(DEB_DESTDIR)/usr/bin/epigrass.py > \
-	  $(DEB_DESTDIR)/usr/bin/epigrass
+#	sed '1s/python.*/python/' $(DEB_DESTDIR)/usr/bin/epigrass.py > \
+#	  $(DEB_DESTDIR)/usr/bin/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'

Modified: trunk/packages/epigrass/trunk/debian/watch
===================================================================
--- trunk/packages/epigrass/trunk/debian/watch	2009-05-03 05:53:27 UTC (rev 3351)
+++ trunk/packages/epigrass/trunk/debian/watch	2009-05-03 06:00:52 UTC (rev 3352)
@@ -1,3 +1,5 @@
 version=3
-http://sf.net/epigrass/ epigrass-(.*).tar.gz \
-  debian debian/orig-tar.sh
+http://pypi.python.org/packages/source/e/epigrass/epigrass-(.*).tar.gz debian debian/orig-tar.sh
+# Sources will come back on SourceForge later. In the meantime, they are there:
+# http://sf.net/epigrass/ epigrass-(.*).tar.gz \
+#  debian debian/orig-tar.sh

More information about the debian-med-commit mailing list