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

[Andreas Tille]

Author: tille
Date: 2013-09-09 07:31:50 +0000 (Mon, 09 Sep 2013)
New Revision: 14633

Removed:
   trunk/packages/epigrass/trunk/debian/patches/redis-version.patch
Modified:
   trunk/packages/epigrass/trunk/debian/changelog
   trunk/packages/epigrass/trunk/debian/epgeditor.1
   trunk/packages/epigrass/trunk/debian/patches/series
   trunk/packages/epigrass/trunk/debian/patches/sqlite3.diff
Log:
Adapt patches to latest upstream and upload to unstable


Modified: trunk/packages/epigrass/trunk/debian/changelog
===================================================================
--- trunk/packages/epigrass/trunk/debian/changelog	2013-09-09 04:58:24 UTC (rev 14632)
+++ trunk/packages/epigrass/trunk/debian/changelog	2013-09-09 07:31:50 UTC (rev 14633)
@@ -1,14 +1,20 @@
-epigrass (2.3.0-1) UNRELEASED; urgency=low
+epigrass (2.3.1-1) unstable; urgency=low
 
-  * TODO: wait for package python-sqlsoup 
+  [ Thorsten Alteholz ]
   * new upstream version
   * debian/control: change VCS-* according to lintian
   * debian/control: new dependency on redis-server needed
   * debian/copyright: take care of lintian complaints
   * debian/epigrass.desktop: add keywords from debtags of package
 
- -- Thorsten Alteholz <debian at alteholz.de>  Thu, 13 Jun 2013 18:00:00 +0200
+  [ Andreas Tille ]
+  * Adapted patches to latest upstream version (remove redis-version.patch)
+  * Upload new version since python-sqlsoup is available
+    Closes: #717738
+  * Fixed typo in manpage
 
+ -- Andreas Tille <tille at debian.org>  Mon, 09 Sep 2013 09:10:02 +0200
+
 epigrass (2.2.2-1) unstable; urgency=low
 
   * new upstream version

Modified: trunk/packages/epigrass/trunk/debian/epgeditor.1
===================================================================
--- trunk/packages/epigrass/trunk/debian/epgeditor.1	2013-09-09 04:58:24 UTC (rev 14632)
+++ trunk/packages/epigrass/trunk/debian/epgeditor.1	2013-09-09 07:31:50 UTC (rev 14633)
@@ -11,7 +11,7 @@
 editor of .epg models. A easy way to edit already existing models.
 It contains detailed explanations of every section of the EPG file.
 .SH SEE ALSO
-apigrass(1)
+epigrass(1)
 .SH AUTHOR
 This manual page was written by Andreas Tille <tille at debian.org>,
 for the Debian project (but may be used by others).

Deleted: trunk/packages/epigrass/trunk/debian/patches/redis-version.patch
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/redis-version.patch	2013-09-09 04:58:24 UTC (rev 14632)
+++ trunk/packages/epigrass/trunk/debian/patches/redis-version.patch	2013-09-09 07:31:50 UTC (rev 14633)
@@ -1,17 +0,0 @@
-Author: Thorsten Alteholz <debian at alteholz.de>
-Description: current version of redis in Debian is 2.4.13, according to Flavio that should
-             work as well
-             This should have been changed upstream s well.
-Index: epigrass-2.3.0/setup.py
-===================================================================
---- epigrass-2.3.0.orig/setup.py	2013-06-12 19:34:18.000000000 +0200
-+++ epigrass-2.3.0/setup.py	2013-06-16 18:56:49.000000000 +0200
-@@ -24,7 +24,7 @@
-     download_url = 'http://sourceforge.net/project/showfiles.php?group_id=128000',
-     license = 'GPL',
-     packages = ['Epigrass'],
--    install_requires = ["numpy >= 1.2",  "networkx >= 1.1", "SQLAlchemy >= 0.7", "sqlsoup", "redis >= 2.7.5"],
-+    install_requires = ["numpy >= 1.2",  "networkx >= 1.1", "SQLAlchemy >= 0.7", "sqlsoup", "redis"],
-     entry_points = {
-         'console_scripts': [
-             'epirunner = Epigrass.manager:main',

Modified: trunk/packages/epigrass/trunk/debian/patches/series
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/series	2013-09-09 04:58:24 UTC (rev 14632)
+++ trunk/packages/epigrass/trunk/debian/patches/series	2013-09-09 07:31:50 UTC (rev 14633)
@@ -1,2 +1 @@
-redis-version.patch
 sqlite3.diff

Modified: trunk/packages/epigrass/trunk/debian/patches/sqlite3.diff
===================================================================
--- trunk/packages/epigrass/trunk/debian/patches/sqlite3.diff	2013-09-09 04:58:24 UTC (rev 14632)
+++ trunk/packages/epigrass/trunk/debian/patches/sqlite3.diff	2013-09-09 07:31:50 UTC (rev 14633)
@@ -2,11 +2,9 @@
 Puropose: ?
 Forwarded: no
 License: same as Epigrass itself.
-Index: epigrass-2.2.2/Epigrass/manager.py
-===================================================================
---- epigrass-2.2.2.orig/Epigrass/manager.py	2012-12-11 13:01:11.000000000 +0100
-+++ epigrass-2.2.2/Epigrass/manager.py	2013-05-14 23:19:19.000000000 +0200
-@@ -20,7 +20,9 @@
+--- a/Epigrass/manager.py
++++ b/Epigrass/manager.py
+@@ -19,7 +19,9 @@ import report as Rp
  import epigdal
  import json
  import __version__