[Python-modules-commits] r5827 - in packages/python-couchdb/trunk/debian (13 files)
nslater-guest at users.alioth.debian.org
nslater-guest at users.alioth.debian.org
Thu Jul 3 20:00:49 UTC 2008
Date: Thursday, July 3, 2008 @ 20:00:47
Author: nslater-guest
Revision: 5827
initial work on upgrading to new upstream release
Added:
packages/python-couchdb/trunk/debian/couchdb-utils.dirs
packages/python-couchdb/trunk/debian/couchdb-utils.manpages
packages/python-couchdb/trunk/debian/python-couchdb.dirs
packages/python-couchdb/trunk/debian/python-couchdb.docs
packages/python-couchdb/trunk/debian/python-couchdb.manpages
Modified:
packages/python-couchdb/trunk/debian/changelog
packages/python-couchdb/trunk/debian/control
packages/python-couchdb/trunk/debian/copyright
packages/python-couchdb/trunk/debian/patches/remove-pkg_resources.patch
packages/python-couchdb/trunk/debian/rules
Deleted:
packages/python-couchdb/trunk/debian/docs
packages/python-couchdb/trunk/debian/manpages
packages/python-couchdb/trunk/debian/patches/python-sys-exit.patch
Modified: packages/python-couchdb/trunk/debian/changelog
===================================================================
--- packages/python-couchdb/trunk/debian/changelog 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/changelog 2008-07-03 20:00:47 UTC (rev 5827)
@@ -1,9 +1,13 @@
-python-couchdb (0.3-3) UNRELEASED; urgency=low
+python-couchdb (0.4-1) unstable; urgency=low
- * General standards improvement.
- * Improved debian/copyright file per the proposed standard.
+ * New upstream release.
+ * Split package into python-couchdb and couchdb-utils binary packages.
+ * Added API documentation generation to debian/rules.
+ * Added debian/README.source for upstream source information.
+ * Updated debian/copyright per latest proposed format.
+ * Updated Standards-Version to 3.8.0.
- -- Noah Slater <nslater at bytesexual.org> Mon, 21 Apr 2008 18:12:03 +0100
+ -- Noah Slater <nslater at bytesexual.org> Thu, 03 Jul 2008 20:11:09 +0100
python-couchdb (0.3-2) unstable; urgency=low
Modified: packages/python-couchdb/trunk/debian/control
===================================================================
--- packages/python-couchdb/trunk/debian/control 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/control 2008-07-03 20:00:47 UTC (rev 5827)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Noah Slater <nslater at bytesexual.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.2), python
-Build-Depends-Indep: help2man, python-httplib2, python-simplejson,
- python-setuptools (>= 0.6b3), python-support (>= 0.6.4)
+Build-Depends-Indep: help2man, python-epydoc, python-httplib2, python-pygments,
+ python-simplejson, python-setuptools (>= 0.6b3), python-support (>= 0.6.4)
Homepage: http://pypi.python.org/pypi/CouchDB
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-couchdb/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-couchdb/trunk/?op=log
@@ -23,3 +23,10 @@
replication. It makes it simple to build collaborative applications that can
be replicated offline by users, with full interactivity (query, add, update,
delete), and later "synced up" with everyone else's changes when back online.
+
+Package: couchdb-utils
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-couchdb
+Description: dump and load utilities for CouchDB
+ The dump and load utilities can be used as migration tools when upgrading
+ CouchDB or moving data between databases.
Modified: packages/python-couchdb/trunk/debian/copyright
===================================================================
--- packages/python-couchdb/trunk/debian/copyright 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/copyright 2008-07-03 20:00:47 UTC (rev 5827)
@@ -1,9 +1,7 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Noah Slater <nslater at bytesexual.org>
-X-Debianized-Date: Tue, 12 Feb 2008 21:57:28 +0000
-X-Source-Downloaded-From: http://pypi.python.org/pypi/CouchDB
-X-Source-Get-Original: ./debian/rules get-orig-source
-X-Upstream-Author: Christopher Lenz <cmlenz at gmx.de>
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=179
+Upstream-Name: CouchDB
+Upstream-Maintainer: Christopher Lenz <cmlenz at gmx.de>
+Upstream-Source: http://pypi.python.org/pypi/CouchDB
Files: *
Copyright: Copyright 2007, Christopher Lenz <cmlenz at gmx.de>
Added: packages/python-couchdb/trunk/debian/couchdb-utils.dirs
===================================================================
--- packages/python-couchdb/trunk/debian/couchdb-utils.dirs (rev 0)
+++ packages/python-couchdb/trunk/debian/couchdb-utils.dirs 2008-07-03 20:00:47 UTC (rev 5827)
@@ -0,0 +1 @@
+usr/bin
Added: packages/python-couchdb/trunk/debian/couchdb-utils.manpages
===================================================================
--- packages/python-couchdb/trunk/debian/couchdb-utils.manpages (rev 0)
+++ packages/python-couchdb/trunk/debian/couchdb-utils.manpages 2008-07-03 20:00:47 UTC (rev 5827)
@@ -0,0 +1,2 @@
+couchdb-dump.1
+couchdb-load.1
Deleted: packages/python-couchdb/trunk/debian/docs
===================================================================
--- packages/python-couchdb/trunk/debian/docs 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/docs 2008-07-03 20:00:47 UTC (rev 5827)
@@ -1,3 +0,0 @@
-doc/index.html
-doc/api
-README.txt
Deleted: packages/python-couchdb/trunk/debian/manpages
===================================================================
--- packages/python-couchdb/trunk/debian/manpages 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/manpages 2008-07-03 20:00:47 UTC (rev 5827)
@@ -1 +0,0 @@
-couchpy.1
Deleted: packages/python-couchdb/trunk/debian/patches/python-sys-exit.patch
===================================================================
--- packages/python-couchdb/trunk/debian/patches/python-sys-exit.patch 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/patches/python-sys-exit.patch 2008-07-03 20:00:47 UTC (rev 5827)
@@ -1,37 +0,0 @@
-diff -Nur CouchDB-0.3/couchdb/view.py CouchDB-0.3.new/couchdb/view.py
---- CouchDB-0.3/couchdb/view.py 2008-02-06 21:20:05.000000000 +0000
-+++ CouchDB-0.3.new/couchdb/view.py 2008-02-12 22:47:08.000000000 +0000
-@@ -95,14 +95,14 @@
- except ValueError, e:
- sys.stderr.write('error: %s\n' % e)
- sys.stderr.flush()
-- exit(1)
-+ sys.exit(1)
- else:
- retval = handlers[cmd[0]](*cmd[1:])
- output.write(json.dumps(retval))
- output.write('\n')
- output.flush()
- except KeyboardInterrupt:
-- exit(0)
-+ sys.exit(0)
-
- _VERSION = """%(name)s - CouchDB Python %(version)s
-
-@@ -139,14 +139,14 @@
- if message:
- sys.stdout.write(message)
- sys.stdout.flush()
-- exit(0)
-+ sys.exit(0)
- except getopt.GetoptError, error:
- message = '%s\n\nTry `%s --help` for more information.\n' % (
- str(error), os.path.basename(sys.argv[0])
- )
- sys.stderr.write(message)
- sys.stderr.flush()
-- exit(1)
-+ sys.exit(1)
- run()
-
- if __name__ == '__main__':
Modified: packages/python-couchdb/trunk/debian/patches/remove-pkg_resources.patch
===================================================================
--- packages/python-couchdb/trunk/debian/patches/remove-pkg_resources.patch 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/patches/remove-pkg_resources.patch 2008-07-03 20:00:47 UTC (rev 5827)
@@ -1,22 +1,42 @@
-diff -Nur python-couchdb-0.1/couchpy python-couchdb-0.1.new/couchpy
---- python-couchdb-0.1/couchpy 1970-01-01 01:00:00.000000000 +0100
-+++ python-couchdb-0.1.new/couchpy 2007-11-03 00:18:19.000000000 +0000
+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
@@ -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
+@@ -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
+@@ -0,0 +1,5 @@
++#!/usr/bin/python
++
+from couchdb import view
+
+view.main()
-diff -Nur python-couchdb-0.1/setup.py python-couchdb-0.1.new/setup.py
---- python-couchdb-0.1/setup.py 2007-10-23 13:20:15.000000000 +0100
-+++ python-couchdb-0.1.new/setup.py 2007-11-03 00:16:23.000000000 +0000
-@@ -128,11 +128,5 @@
+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 @@
install_requires = ['httplib2', 'simplejson'],
- entry_points = {
- 'console_scripts': [
-- 'couchpy = couchdb.view:main'
+- 'couchpy = couchdb.view:main',
+- 'couchdb-dump = couchdb.tools.dump:main',
+- 'couchdb-load = couchdb.tools.load:main'
- ],
- },
-
Added: packages/python-couchdb/trunk/debian/python-couchdb.dirs
===================================================================
--- packages/python-couchdb/trunk/debian/python-couchdb.dirs (rev 0)
+++ packages/python-couchdb/trunk/debian/python-couchdb.dirs 2008-07-03 20:00:47 UTC (rev 5827)
@@ -0,0 +1 @@
+usr/bin
Added: packages/python-couchdb/trunk/debian/python-couchdb.docs
===================================================================
--- packages/python-couchdb/trunk/debian/python-couchdb.docs (rev 0)
+++ packages/python-couchdb/trunk/debian/python-couchdb.docs 2008-07-03 20:00:47 UTC (rev 5827)
@@ -0,0 +1,3 @@
+doc/index.html
+doc/api
+README.txt
Added: packages/python-couchdb/trunk/debian/python-couchdb.manpages
===================================================================
--- packages/python-couchdb/trunk/debian/python-couchdb.manpages (rev 0)
+++ packages/python-couchdb/trunk/debian/python-couchdb.manpages 2008-07-03 20:00:47 UTC (rev 5827)
@@ -0,0 +1 @@
+couchpy.1
Modified: packages/python-couchdb/trunk/debian/rules
===================================================================
--- packages/python-couchdb/trunk/debian/rules 2008-07-03 14:14:24 UTC (rev 5826)
+++ packages/python-couchdb/trunk/debian/rules 2008-07-03 20:00:47 UTC (rev 5827)
@@ -17,27 +17,34 @@
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-PYTHON_VERSION_COMMAND = \
- __import__('pkg_resources').get_distribution('CouchDB').version
+PYTHON_VERSION_COMMAND = __import__('pkg_resources').get_distribution('CouchDB').version
clean::
- rm --force couchpy.1
+ rm -rf *.1 couchdb/tools/__init__.py doc/index.html doc/api
cleanbuilddir::
- sed -i -e "s/\"$(DEB_UPSTREAM_VERSION)\"/$(PYTHON_VERSION_COMMAND)/" \
- couchdb/__init__.py
+ sed -i -e "s/\"$(DEB_UPSTREAM_VERSION)\"/$(PYTHON_VERSION_COMMAND)/" couchdb/__init__.py
post-patches::
- sed -i -e "s/$(PYTHON_VERSION_COMMAND)/\"$(DEB_UPSTREAM_VERSION)\"/" \
- couchdb/__init__.py
+ sed -i -e "s/$(PYTHON_VERSION_COMMAND)/\"$(DEB_UPSTREAM_VERSION)\"/" couchdb/__init__.py
-common-install-indep::
+common-build-indep::
+ touch couchdb/tools/__init__.py
+ @# ./setup.py build_doc > /dev/null
+
+install/python-couchdb::
chmod 755 couchpy
PYTHONPATH=debian/python-couchdb/usr/share/python-support/python-couchdb \
help2man -N -n "a CouchDB Python view server" ./couchpy > couchpy.1
- mkdir -p debian/python-couchdb/usr/bin
cp couchpy debian/python-couchdb/usr/bin/couchpy
+install/couchdb-utils::
+ chmod 755 couchdb-*
+ PYTHONPATH=debian/python-couchdb/usr/share/python-support/python-couchdb \
+ help2man -N -n "a CouchDB dump utility" ./couchdb-dump > couchdb-dump.1 && \
+ help2man -N -n "a CouchDB load utility" ./couchdb-load > couchdb-load.1
+ cp couchdb-dump couchdb-load debian/couchdb-utils/usr/bin
+
get-orig-source:
uscan --force-download
More information about the Python-modules-commits
mailing list