[Python-modules-commits] r7794 - in packages/python-graph/trunk/debian (8 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Tue Mar 3 19:03:48 UTC 2009
Date: Tuesday, March 3, 2009 @ 19:03:47
Author: morph
Revision: 7794
* debian/copyright
- extended packaging copyright years
- extended upstream copyright years
- updated list of files with different copyright notices
* debian/patches/10_remove_doc_installation.dpatch
- adapted to new upstrem code
* debian/patches/{20_fix_make_clean.dpatch, 30_fix_make_docs.dpatch}
- removed since no more needed (due to upstream code changes)
* debian/rules
- changed location of test files
* debian/{control, rules}
- switch to python-support
Modified:
packages/python-graph/trunk/debian/changelog
packages/python-graph/trunk/debian/control
packages/python-graph/trunk/debian/copyright
packages/python-graph/trunk/debian/patches/00list
packages/python-graph/trunk/debian/patches/10_remove_doc_installation.dpatch
packages/python-graph/trunk/debian/rules
Deleted:
packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch
packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch
Modified: packages/python-graph/trunk/debian/changelog
===================================================================
--- packages/python-graph/trunk/debian/changelog 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/changelog 2009-03-03 19:03:47 UTC (rev 7794)
@@ -1,10 +1,20 @@
-python-graph (1.4.1-1) UNRELEASED; urgency=low
+python-graph (1.4.2-1) unstable; urgency=low
- ON HOLD WAITING FOR UPSTREAM TO REPLY ABOUT COPYRIGHT YEARS REMOVAL
-
* New upstream release
+ * debian/copyright
+ - extended packaging copyright years
+ - extended upstream copyright years
+ - updated list of files with different copyright notices
+ * debian/patches/10_remove_doc_installation.dpatch
+ - adapted to new upstrem code
+ * debian/patches/{20_fix_make_clean.dpatch, 30_fix_make_docs.dpatch}
+ - removed since no more needed (due to upstream code changes)
+ * debian/rules
+ - changed location of test files
+ * debian/{control, rules}
+ - switch to python-support
- -- Sandro Tosi <morph at debian.org> Sat, 21 Feb 2009 22:14:54 +0100
+ -- Sandro Tosi <morph at debian.org> Tue, 03 Mar 2009 20:03:19 +0100
python-graph (1.3.1-1) unstable; urgency=low
Modified: packages/python-graph/trunk/debian/control
===================================================================
--- packages/python-graph/trunk/debian/control 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/control 2009-03-03 19:03:47 UTC (rev 7794)
@@ -4,7 +4,7 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Sandro Tosi <morph at debian.org>
Build-Depends: debhelper (>= 7), dpatch
-Build-Depends-Indep: python-central, python, python-epydoc
+Build-Depends-Indep: python-support, python, python-epydoc
Standards-Version: 3.8.0
Homepage: http://code.google.com/p/python-graph/
Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-graph/trunk/
Modified: packages/python-graph/trunk/debian/copyright
===================================================================
--- packages/python-graph/trunk/debian/copyright 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/copyright 2009-03-03 19:03:47 UTC (rev 7794)
@@ -9,7 +9,7 @@
Copyright:
- Copyright (C) 2007-2008 Pedro Matiello <pmatiello at gmail.com>
+ Copyright (C) 2007-2009 Pedro Matiello <pmatiello at gmail.com>
License:
@@ -34,20 +34,34 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-The Debian packaging is copyright 2008, Sandro Tosi <morph at debian.org> and
+The Debian packaging is copyright 2008-2009, Sandro Tosi <morph at debian.org> and
is licensed under the same term of the upstream code, see above.
These files have difference copyright notices:
-graph/generators.py
- Copyright (c) 2007-2008 Pedro Matiello <pmatiello at gmail.com>
+graph/algorithms/{exceptions.py, heuristics/Chow.py, heuristics/__init__.py}
+ Copyright (c) 2008-2009 Pedro Matiello <pmatiello at gmail.com>
+ Salim Fadhley <sal at stodge.org>
+
+graph/algorithms/generators.py
+ Copyright (c) 2008-2009 Pedro Matiello <pmatiello at gmail.com>
Zsolt Haraszti <zsolt at drawwell.net>
-graph/__init__.py
- Copyright (c) 2007-2008 Pedro Matiello <pmatiello at gmail.com>
- Christian Muise <christian.muise at gmail.com>
+
+graph/algorithms/minmax.py
+ Copyright (c) 2007-2009 Pedro Matiello <pmatiello at gmail.com>
+ Rhys Ulerich <rhys.ulerich at gmail.com>
+ Roy Smith <roy at panix.com>
+ Salim Fadhley <sal at stodge.org>
+
+graph/algorithms/utils.py
+ Copyright (c) 2008-2009 Pedro Matiello <pmatiello at gmail.com>
+ Roy Smith <roy at panix.com>
+
+graph/classes/{Digraph.py, Graph.py}
+ Copyright (c) 2007-2009 Pedro Matiello <pmatiello at gmail.com>
Nathan Davis <davisn90210 at gmail.com>
Zsolt Haraszti <zsolt at drawwell.net>
-graph/minmax.py
- Copyright (c) 2007-2008 Pedro Matiello <pmatiello at gmail.com>
- Rhys Ulerich <rhys.ulerich at gmail.com>
+graph/classes/Hypergraph.py
+ Copyright (c) 2008-2009 Pedro Matiello <pmatiello at gmail.com>
+ Christian Muise <christian.muise at gmail.com>
Modified: packages/python-graph/trunk/debian/patches/00list
===================================================================
--- packages/python-graph/trunk/debian/patches/00list 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/patches/00list 2009-03-03 19:03:47 UTC (rev 7794)
@@ -1,3 +1 @@
10_remove_doc_installation
-20_fix_make_clean
-30_fix_make_docs
Modified: packages/python-graph/trunk/debian/patches/10_remove_doc_installation.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/10_remove_doc_installation.dpatch 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/patches/10_remove_doc_installation.dpatch 2009-03-03 19:03:47 UTC (rev 7794)
@@ -5,27 +5,45 @@
## DP: Remove upstream doc installation, we will do it with debhelper
@DPATCH@
-diff -urNad python-graph-1.3.1~/setup.py python-graph-1.3.1/setup.py
---- python-graph-1.3.1~/setup.py 2008-10-01 05:07:17.000000000 +0200
-+++ python-graph-1.3.1/setup.py 2008-12-26 01:22:30.106719710 +0100
-@@ -7,20 +7,11 @@
- # Startup
+diff -urNad python-graph~/setup.py python-graph/setup.py
+--- python-graph~/setup.py 2009-02-22 00:41:47.000000000 +0100
++++ python-graph/setup.py 2009-03-03 19:37:34.417770404 +0100
+@@ -14,31 +14,10 @@
appname = "python-graph"
- appversion = "1.3.1"
--docfolder = 'share/doc/' + appname + '-' + appversion + '/'
--docfolder = os.path.normcase(docfolder)
--docfiles = os.listdir('docs')
--docs = os.path.normcase('docs/')
--for i in xrange(len(docfiles)):
-- docfiles[i] = docs + docfiles[i]
+ appversion = "1.4.2"
+-# Extra files
+-if (os.name == 'posix'): # Files to be installed/packaged on Unix-like systems
+- datadir = 'share/doc/'+appname+appversion
+- datafiles = ['README', 'COPYING', 'Changelog']
+- docsdir = datadir + '/docs'
+- docsfiles = []
+- try:
+- dirlisting = os.listdir('docs/')
+- except:
+- print "Documentation isn't present and will not be installed/packaged."
+- dirlisting = []
+- for each in dirlisting:
+- docsfiles.append('docs/'+each)
+-else: # Other systems
+- datadir = ''
+- datafiles = []
+- docsdir = ''
+- docsfiles = []
+-
setup(
name = appname,
version = appversion,
- packages = ['graph'],
-- data_files = [(docfolder, ['README','Changelog','COPYING']),
-- (docfolder + docs, docfiles),
-- ],
-
- # metadata
+ packages = ['graph', 'graph.algorithms', 'graph.algorithms.filters', 'graph.algorithms.heuristics', 'graph.classes'],
+- data_files = [(docsdir,docsfiles),
+- (datadir,datafiles)],
author = "Pedro Matiello",
+ author_email = "pmatiello at gmail.com",
+ description = "A library for working with graphs in Python",
+@@ -48,4 +27,4 @@
+ classifiers = ["License :: OSI Approved :: MIT License","Topic :: Software Development :: Libraries :: Python Modules"],
+ long_description = "python-graph is a library for working with graphs in Python. This software provides a suitable data structure for representing graphs and a whole set of important algorithms.",
+ test_suite = "graph.tests",
+-)
+\ No newline at end of file
++)
Deleted: packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/patches/20_fix_make_clean.dpatch 2009-03-03 19:03:47 UTC (rev 7794)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_fix_make_clean.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix "make clean" so not to abort if no pyc file is present and to remove
-## DP: only the contents of "docs/" (dir is required to be there by setup.py)
-
- at DPATCH@
-diff -urNad python-graph~/Makefile python-graph/Makefile
---- python-graph~/Makefile 2008-09-05 16:33:19.000000000 +0200
-+++ python-graph/Makefile 2008-12-26 13:31:55.141719761 +0100
-@@ -11,7 +11,7 @@
- gedit graph/*.py &
-
- clean:
-- rm -rf docs
-+ rm -rf docs/*
- rm -rf dist
- rm -rf build
-- rm graph/*.pyc
-+ rm -f graph/*.pyc
Deleted: packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/patches/30_fix_make_docs.dpatch 2009-03-03 19:03:47 UTC (rev 7794)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_make_docs.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix "make docs" to not depend on any py file (regenerate docs even if no
-## DP: source code has changed)
-
- at DPATCH@
-diff -urNad python-graph~/Makefile python-graph/Makefile
---- python-graph~/Makefile 2008-12-26 13:29:48.561721551 +0100
-+++ python-graph/Makefile 2008-12-26 13:29:54.341719460 +0100
-@@ -3,7 +3,7 @@
- install:
- ./setup.py install
-
--docs: graph/*.py
-+docs:
- epydoc -v --no-frames --no-sourcecode --name="python-graph" --url="http://code.google.com/p/python-graph/" --no-private --html --css misc/epydoc.css -o docs graph/*.py
-
- edit: graph/*.py
Modified: packages/python-graph/trunk/debian/rules
===================================================================
--- packages/python-graph/trunk/debian/rules 2009-03-03 15:38:14 UTC (rev 7793)
+++ packages/python-graph/trunk/debian/rules 2009-03-03 19:03:47 UTC (rev 7794)
@@ -14,7 +14,7 @@
python setup.py build
# run tests
- for test in misc/unittests-* ; do \
+ for test in tests/unittests-* ; do \
PYTHONPATH=build/lib/ python $$test ; \
done
@@ -52,7 +52,7 @@
dh_installchangelogs Changelog
dh_installdocs docs
dh_installexamples examples/*
- dh_pycentral
+ dh_pysupport
dh_installman
dh_compress
dh_fixperms
More information about the Python-modules-commits
mailing list