[Python-modules-commits] r11480 - in packages/configobj/trunk/debian (12 files)

stefanor-guest at users.alioth.debian.org stefanor-guest at users.alioth.debian.org
Sun Jan 31 22:11:16 UTC 2010 

    Date: Sunday, January 31, 2010 @ 22:11:14
  Author: stefanor-guest
Revision: 11480

Update configobj to 0.4.7, convert to dh7 overrides, 3.0 (quilt)

Added:
  packages/configobj/trunk/debian/patches/eggify.diff
    (from rev 11405, packages/configobj/trunk/debian/patches/01_eggify.dpatch)
  packages/configobj/trunk/debian/patches/series
    (from rev 11405, packages/configobj/trunk/debian/patches/00list)
  packages/configobj/trunk/debian/source/
  packages/configobj/trunk/debian/source/format
Modified:
  packages/configobj/trunk/debian/changelog
  packages/configobj/trunk/debian/control
  packages/configobj/trunk/debian/copyright
  packages/configobj/trunk/debian/rules
  packages/configobj/trunk/debian/watch
Deleted:
  packages/configobj/trunk/debian/patches/00list
  packages/configobj/trunk/debian/patches/01_eggify.dpatch
  packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch

Modified: packages/configobj/trunk/debian/changelog
===================================================================
--- packages/configobj/trunk/debian/changelog	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/changelog	2010-01-31 22:11:14 UTC (rev 11480)
@@ -1,10 +1,30 @@
-configobj (4.5.3-2) UNRELEASED; urgency=low
+configobj (4.7.0-1) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:12:52 +0100
+  [ Stefano Rivera ]
+  * New upstream release. (Closes: 555407)
+  * Package under team maintenance. (Closes: 544448)
+  * Bumped Standards-Version to 3.8.4 (no changes needed).
+  * Converted to 3.0 (quilt)
+  * debian/rules
+    - Converted to debhelper 7 overrides
+  * Patches:
+    - 01_eggify.dpatch converted to eggify.diff (quilt+DEP3).
+    - 02_doc_generation_fix.dpatch removed (fixed upstream)
+  * debain/control
+    - Unversioned python-setuptools dependency (oldstable has a suitable
+      version)
+    - Removed unecessary XB-Python-Version.
+    - Minor changes to description.
+  * debian/copyright
+    - Updated years and added author Mark Andrews.
+    - Included full license, as it isn't identical to the common-licenses one.
 
+ -- Stefano Rivera <stefano at rivera.za.net>  Mon, 01 Feb 2010 00:01:02 +0200
+
 configobj (4.5.3-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/configobj/trunk/debian/control
===================================================================
--- packages/configobj/trunk/debian/control	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/control	2010-01-31 22:11:14 UTC (rev 11480)
@@ -2,11 +2,11 @@
 Section: python
 Priority: optional
 Maintainer: Daniel Watkins <daniel at daniel-watkins.co.uk>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), dpatch, python-setuptools (>= 0.6a9),
-    python-all-dev (>= 2.3.5-11)
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+ Stefano Rivera <stefano at rivera.za.net>
+Build-Depends: debhelper (>= 7.0.50~), python-setuptools
 Build-Depends-Indep: python-docutils, python-epydoc, python-support (>= 0.6.4)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 Homepage: http://www.voidspace.org.uk/python/configobj.html
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/configobj/trunk/
@@ -14,13 +14,12 @@
 
 Package: python-configobj
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, ${misc:Depends}
-Description: a simple but powerful config file reader and writer for Python
+Description: Simple but powerful config file reader and writer for Python
  ConfigObj is a simple but powerful config file reader and writer: an
  ini file round tripper. Its main feature is that it is very easy to
  use, with a straightforward programmer's interface and a simple
- syntax for config files. It has lots of other features though:
+ syntax for config files. It has lots of other features, though:
  .
   * Nested sections (subsections), to any level
   * List values

Modified: packages/configobj/trunk/debian/copyright
===================================================================
--- packages/configobj/trunk/debian/copyright	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/copyright	2010-01-31 22:11:14 UTC (rev 11480)
@@ -5,9 +5,34 @@
 
 Copyright:
 
-Copyright (C) 2005-2006 Michael Foord, Nicola Larosa
+Copyright (C) 2005-2010 Michael Foord, Mark Andrews, Nicola Larosa
 
 License:
 
-This package is licensed under the BSD license which can be found,
-on Debian systems, at /usr/share/common-licenses/BSD.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Michael Foord nor the name of Voidspace
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: packages/configobj/trunk/debian/patches/00list
===================================================================
--- packages/configobj/trunk/debian/patches/00list	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/patches/00list	2010-01-31 22:11:14 UTC (rev 11480)
@@ -1,2 +0,0 @@
-01_eggify.dpatch
-02_doc_generation_fix.dpatch

Deleted: packages/configobj/trunk/debian/patches/01_eggify.dpatch
===================================================================
--- packages/configobj/trunk/debian/patches/01_eggify.dpatch	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/patches/01_eggify.dpatch	2010-01-31 22:11:14 UTC (rev 11480)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_eggify.dpatch by Daniel Watkins <daniel at daniel-watkins.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Switch from using distutils to setuptools.
-
- at DPATCH@
-
---- configobj_4.5.2.orig/setup.py
-+++ configob_4.5.2/setup.py
-@@ -21,7 +21,7 @@
- 
- if __name__ == '__main__':
-     import sys
--    from distutils.core import setup
-+    from setuptools import setup
-     from configobj import __version__ as VERSION
- 
-     NAME = 'configobj'

Deleted: packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch
===================================================================
--- packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch	2010-01-31 22:11:14 UTC (rev 11480)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_doc_generation_fix.dpatch by Daniel Watkins <daniel at daniel-watkins.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove invalid ReStructured Text markup to allow documentation 
-## DP: generation to work.
-
- at DPATCH@
-
---- configobj_4.5.2.orig/configobj.py
-+++ configobj_4.5.2/configobj.py
-@@ -875,7 +875,7 @@
-         
-         See  the encode and decode methods for examples, including functions.
-         
--        .. caution::
-+        .. admonition:: Caution
-         
-             You can use ``walk`` to transform the names of members of a section
-             but you mustn't add or delete members.
-

Copied: packages/configobj/trunk/debian/patches/eggify.diff (from rev 11405, packages/configobj/trunk/debian/patches/01_eggify.dpatch)
===================================================================
--- packages/configobj/trunk/debian/patches/eggify.diff	                        (rev 0)
+++ packages/configobj/trunk/debian/patches/eggify.diff	2010-01-31 22:11:14 UTC (rev 11480)
@@ -0,0 +1,16 @@
+Description: Switch from using distutils to setuptools.
+Author: Daniel Watkins <daniel at daniel-watkins.co.uk>
+Forwarded: not-needed
+Last-Update: 2010-01-31
+
+--- configobj_4.5.2.orig/setup.py
++++ configob_4.5.2/setup.py
+@@ -9,7 +9,7 @@
+ # http://www.voidspace.org.uk/python/license.shtml
+ 
+ import sys
+-from distutils.core import setup
++from setuptools import setup
+ from configobj import __version__ as VERSION
+ 
+ NAME = 'configobj'

Copied: packages/configobj/trunk/debian/patches/series (from rev 11405, packages/configobj/trunk/debian/patches/00list)
===================================================================
--- packages/configobj/trunk/debian/patches/series	                        (rev 0)
+++ packages/configobj/trunk/debian/patches/series	2010-01-31 22:11:14 UTC (rev 11480)
@@ -0,0 +1 @@
+eggify.diff

Modified: packages/configobj/trunk/debian/rules
===================================================================
--- packages/configobj/trunk/debian/rules	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/rules	2010-01-31 22:11:14 UTC (rev 11480)
@@ -1,30 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/dpatch/dpatch.make
+%:
+	dh $@
 
-clean:
-	dh_auto_clean
-	dh_clean
-
-docs: patch
+override_dh_auto_build:
+	dh_auto_build
 	env PYTHONPATH=`pwd` epydoc --name ConfigObj \
 		--url http://www.voidspace.org.uk/python/configobj.html \
 		-o api configobj
-
-build:
-	dh build
-
-install: docs build
-	dh install
-	rm debian/python-configobj/usr/share/doc/python-configobj/BSD-LICENSE.*
-
-binary-indep: install
-	dh binary-indep
-
-binary-arch:
-
-binary: binary-arch binary-indep
-	dh binary
-
-.PHONY: clean build docs install binary

Added: packages/configobj/trunk/debian/source/format
===================================================================
--- packages/configobj/trunk/debian/source/format	                        (rev 0)
+++ packages/configobj/trunk/debian/source/format	2010-01-31 22:11:14 UTC (rev 11480)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/configobj/trunk/debian/watch
===================================================================
--- packages/configobj/trunk/debian/watch	2010-01-31 17:58:38 UTC (rev 11479)
+++ packages/configobj/trunk/debian/watch	2010-01-31 22:11:14 UTC (rev 11480)
@@ -1,2 +1,3 @@
 version=3
+
 http://sf.net/configobj/configobj-(.*)\.zip

More information about the Python-modules-commits mailing list