[Python-modules-commits] r7336 - in packages/python-couchdb/trunk/debian (6 files)

Thu Jan 15 17:34:42 UTC 2009

Date: Thursday, January 15, 2009 @ 17:34:41
  Author: nslater-guest
Revision: 7336

changes for upstream version

Modified:
  packages/python-couchdb/trunk/debian/README.source
  packages/python-couchdb/trunk/debian/changelog
  packages/python-couchdb/trunk/debian/control
  packages/python-couchdb/trunk/debian/copyright
  packages/python-couchdb/trunk/debian/patches/improve-bin-scripts.patch
  packages/python-couchdb/trunk/debian/rules

Modified: packages/python-couchdb/trunk/debian/README.source
===================================================================

--- packages/python-couchdb/trunk/debian/README.source	2009-01-15 16:41:15 UTC (rev 7335)
+++ packages/python-couchdb/trunk/debian/README.source	2009-01-15 17:34:41 UTC (rev 7336)
@@ -17,4 +17,4 @@
 
   cdbs-edit-patch
 
- -- Noah Slater <nslater at bytesexual.org>, Fri, 11 Jul 2008 12:47:55 +0100
+ -- Noah Slater <nslater at tumbolia.org>, Wed, 14 Jan 2009 16:44:11 +0000

Modified: packages/python-couchdb/trunk/debian/changelog
===================================================================
--- packages/python-couchdb/trunk/debian/changelog	2009-01-15 16:41:15 UTC (rev 7335)
+++ packages/python-couchdb/trunk/debian/changelog	2009-01-15 17:34:41 UTC (rev 7336)
@@ -1,34 +1,33 @@
-python-couchdb (0.4-2) UNRELEASED; urgency=low
+python-couchdb (0.5-1) experimental; urgency=low
 
-  [ Noah Slater ]
+  * New upstream release.
   * Added debian/README.source for upstream source information.
-  * Updated debian/control with improved short and long description.
-  * Updated debian/rules with standard uscan options for get-orig-source.
+  * Updated debian/control, updated Vcs-Browser field to point at viewsvn.
+  * Updated debian/control, updated conditional dependancy on python-simplejson.
+  * Updated debian/control, updated short and long description.
+  * Updated debian/copyright, added additional copyright holder.
+  * Updated debian/rules, added standard uscan options for get-orig-source.
 
-  [ Sandro Tosi ]
-  * debian/control
-    - switch Vcs-Browser field to viewsvn
+ -- Noah Slater <nslater at bytesexual.org>  Thu, 15 Jan 2009 17:21:38 +0000
 
- -- Noah Slater <nslater at bytesexual.org>  Thu, 07 Aug 2008 21:37:06 +0100
-
 python-couchdb (0.4-1) unstable; urgency=low
 
   * New upstream release.
-  * Added python-docutils, python-epydoc and python-pygments to build depends.
-  * Added API documentation generation to debian/rules.
-  * Updated debian/copyright per latest proposed format.
-  * Updated Standards-Version to 3.8.0.
+  * Updated debian/control, added Build-Depends.
+  * Updated debian/control, updated Standards-Version to 3.8.0.
+  * Updated debian/copyright, updated for latest format proposal.
+  * Updated debian/rules, added API documentation generation.
 
- -- Noah Slater <nslater at bytesexual.org>  Thu, 10 Jul 2008 15:47:33 +0100
+ -- Noah Slater <nslater at tumbolia.org>  Thu, 10 Jul 2008 15:47:33 +0100
 
 python-couchdb (0.3-2) unstable; urgency=low
 
-  * Added couchdb Suggests. Closes: #469027
+  * Updated debian/control, updated Suggests. Closes: #469027
 
- -- Noah Slater <nslater at bytesexual.org>  Tue, 04 Mar 2008 23:20:56 +0000
+ -- Noah Slater <nslater at tumbolia.org>  Tue, 04 Mar 2008 23:20:56 +0000
 
 python-couchdb (0.3-1) unstable; urgency=low
 
   * Initial release. Closes: #447596
 
- -- Noah Slater <nslater at bytesexual.org>  Tue, 12 Feb 2008 21:57:28 +0000
+ -- Noah Slater <nslater at tumbolia.org>  Tue, 12 Feb 2008 21:57:28 +0000

Modified: packages/python-couchdb/trunk/debian/control
===================================================================
--- packages/python-couchdb/trunk/debian/control	2009-01-15 16:41:15 UTC (rev 7335)
+++ packages/python-couchdb/trunk/debian/control	2009-01-15 17:34:41 UTC (rev 7336)
@@ -1,7 +1,7 @@
 Source: python-couchdb
 Section: python
 Priority: optional
-Maintainer: Noah Slater <nslater at bytesexual.org>
+Maintainer: Noah Slater <nslater at tumbolia.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.8.0
 Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python
@@ -14,7 +14,8 @@
 
 Package: python-couchdb
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-httplib2, python-simplejson
+Depends: ${python:Depends}, ${misc:Depends}, python-httplib2,
+ python (< 2.6) | python-simplejson
 Suggests: couchdb
 Description: library for working with Apache CouchDB
  Provides a high-level client library for Apache CouchDB, a view server and dump

Modified: packages/python-couchdb/trunk/debian/copyright
===================================================================
--- packages/python-couchdb/trunk/debian/copyright	2009-01-15 16:41:15 UTC (rev 7335)
+++ packages/python-couchdb/trunk/debian/copyright	2009-01-15 17:34:41 UTC (rev 7336)
@@ -4,13 +4,14 @@
 Upstream-Source: http://pypi.python.org/pypi/CouchDB
 
 Files: *
-Copyright: Copyright 2007, Christopher Lenz <cmlenz at gmx.de>
+Copyright: Copyright 2008, Christopher Lenz <cmlenz at gmx.de>
+  Copyright 2008, Jan lehnardt <jan at apache.org>
 License: BSD-3
  On Debian systems the full text of the BSD Licence (with no-endorsement clause)
  can be found in the `/usr/share/common-licenses/BSD' file.
 
 Files: debian/*
-Copyright: Copyright 2008, Noah Slater <nslater at bytesexual.org>
+Copyright: Copyright 2009, Noah Slater <nslater at tumbolia.org>
 License: GAP
  Copying and distribution of this package, with or without modification, are
  permitted in any medium without royalty provided the copyright notice and this

Modified: packages/python-couchdb/trunk/debian/patches/improve-bin-scripts.patch
===================================================================
--- packages/python-couchdb/trunk/debian/patches/improve-bin-scripts.patch	2009-01-15 16:41:15 UTC (rev 7335)
+++ packages/python-couchdb/trunk/debian/patches/improve-bin-scripts.patch	2009-01-15 17:34:41 UTC (rev 7336)
@@ -1,42 +1,52 @@
-diff -Nur -x '*.orig' -x '*~' CouchDB-0.4/couchdb-dump CouchDB-0.4.new/couchdb-dump
---- CouchDB-0.4/couchdb-dump	1970-01-01 01:00:00.000000000 +0100
-+++ CouchDB-0.4.new/couchdb-dump	2008-07-03 20:02:56.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' CouchDB-0.5/couchdb-dump CouchDB-0.5.new/couchdb-dump
+--- CouchDB-0.5/couchdb-dump	1970-01-01 01:00:00.000000000 +0100
++++ CouchDB-0.5.new/couchdb-dump	2009-01-15 16:55:49.000000000 +0000
 @@ -0,0 +1,5 @@
 +#!/usr/bin/python
 +
 +from couchdb.tools import dump
 +
 +dump.main()
-diff -Nur -x '*.orig' -x '*~' CouchDB-0.4/couchdb-load CouchDB-0.4.new/couchdb-load
---- CouchDB-0.4/couchdb-load	1970-01-01 01:00:00.000000000 +0100
-+++ CouchDB-0.4.new/couchdb-load	2008-07-03 20:02:56.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' CouchDB-0.5/couchdb-load CouchDB-0.5.new/couchdb-load
+--- CouchDB-0.5/couchdb-load	1970-01-01 01:00:00.000000000 +0100
++++ CouchDB-0.5.new/couchdb-load	2009-01-15 16:55:49.000000000 +0000
 @@ -0,0 +1,5 @@
 +#!/usr/bin/python
 +
 +from couchdb.tools import load
 +
 +load.main()
-diff -Nur -x '*.orig' -x '*~' CouchDB-0.4/couchpy CouchDB-0.4.new/couchpy
---- CouchDB-0.4/couchpy	1970-01-01 01:00:00.000000000 +0100
-+++ CouchDB-0.4.new/couchpy	2008-07-03 20:02:56.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' CouchDB-0.5/couchdb-replicate CouchDB-0.5.new/couchdb-replicate
+--- CouchDB-0.5/couchdb-replicate	1970-01-01 01:00:00.000000000 +0100
++++ CouchDB-0.5.new/couchdb-replicate	2009-01-15 16:57:54.000000000 +0000
 @@ -0,0 +1,5 @@
 +#!/usr/bin/python
 +
++from couchdb.tools import replication_helper
++
++replication_helper.main()
+diff -Nur -x '*.orig' -x '*~' CouchDB-0.5/couchpy CouchDB-0.5.new/couchpy
+--- CouchDB-0.5/couchpy	1970-01-01 01:00:00.000000000 +0100
++++ CouchDB-0.5.new/couchpy	2009-01-15 16:55:49.000000000 +0000
+@@ -0,0 +1,5 @@
++#!/usr/bin/python
++
 +from couchdb import view
 +
 +view.main()
-diff -Nur -x '*.orig' -x '*~' CouchDB-0.4/setup.py CouchDB-0.4.new/setup.py
---- CouchDB-0.4/setup.py	2008-07-03 20:00:43.000000000 +0100
-+++ CouchDB-0.4.new/setup.py	2008-07-03 20:02:56.000000000 +0100
-@@ -128,13 +128,5 @@
+diff -Nur -x '*.orig' -x '*~' CouchDB-0.5/setup.py CouchDB-0.5.new/setup.py
+--- CouchDB-0.5/setup.py	2008-11-28 22:21:30.000000000 +0000
++++ CouchDB-0.5.new/setup.py	2009-01-15 16:58:00.000000000 +0000
+@@ -128,14 +128,5 @@
  
-     install_requires = ['httplib2', 'simplejson'],
+     install_requires = ['httplib2'],
  
 -    entry_points = {
 -        'console_scripts': [
 -            'couchpy = couchdb.view:main',
 -            'couchdb-dump = couchdb.tools.dump:main',
--            'couchdb-load = couchdb.tools.load:main'
+-            'couchdb-load = couchdb.tools.load:main',
+-            'couchdb-replicate = couchdb.tools.replication_helper:main'
 -        ],
 -    },
 -

Modified: packages/python-couchdb/trunk/debian/rules
===================================================================
--- packages/python-couchdb/trunk/debian/rules	2009-01-15 16:41:15 UTC (rev 7335)
+++ packages/python-couchdb/trunk/debian/rules	2009-01-15 17:34:41 UTC (rev 7336)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Copyright 2008, Noah Slater <nslater at bytesexual.org>
+# Copyright 2009, Noah Slater <nslater at tumbolia.org>
 
 # Copying and distribution of this file, with or without modification, are
 # permitted in any medium without royalty provided the copyright notice and this


