[Python-apps-commits] r1468 - in packages/planet-venus/trunk/debian (4 files)

Tue Jun 17 22:20:18 UTC 2008

Date: Tuesday, June 17, 2008 @ 22:20:16
  Author: nslater-guest
Revision: 1468

new upstream snapshot

Modified:
  packages/planet-venus/trunk/debian/changelog
  packages/planet-venus/trunk/debian/control
  packages/planet-venus/trunk/debian/copyright
  packages/planet-venus/trunk/debian/rules

Modified: packages/planet-venus/trunk/debian/changelog
===================================================================

--- packages/planet-venus/trunk/debian/changelog	2008-06-17 19:03:30 UTC (rev 1467)
+++ packages/planet-venus/trunk/debian/changelog	2008-06-17 22:20:16 UTC (rev 1468)
@@ -1,3 +1,13 @@
+planet-venus (0~bzr95-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Added drscheme to Conflucts. Closes: #484716
+  * Improved debian/copyright file per the proposed standard.
+  * Minor formatting improvements to debian/rules.
+  * Updated Standards-Version to 3.8.0.
+
+ -- Noah Slater <nslater at bytesexual.org>  Tue, 17 Jun 2008 23:18:51 +0100
+
 planet-venus (0~bzr94-1) unstable; urgency=low
 
   * New upstream snapshot.
@@ -2,3 +12,3 @@
   * Removed linda overrides.
-  * Improved debian/copyright file per the proposed standard.
+  * Updated debian/copyright per latest proposed format.
 

Modified: packages/planet-venus/trunk/debian/control
===================================================================
--- packages/planet-venus/trunk/debian/control	2008-06-17 19:03:30 UTC (rev 1467)
+++ packages/planet-venus/trunk/debian/control	2008-06-17 22:20:16 UTC (rev 1468)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Noah Slater <nslater at bytesexual.org>
 Uploaders: Python Applications Packaging Team <python-apps-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)
 Build-Depends-Indep: help2man, python-support (>= 0.6.4), python
 Homepage: http://www.intertwingly.net/code/venus/
@@ -17,7 +17,7 @@
  python-utidylib
 Recommends: python-libxslt1
 Suggests: python-django, python-genshi
-Conflicts: planet
+Conflicts: drscheme, planet
 Description: aggregate feed generator
  Planet Venus downloads news feeds published by web sites and
  aggregates their content together into a single combined feed, latest

Modified: packages/planet-venus/trunk/debian/copyright
===================================================================
--- packages/planet-venus/trunk/debian/copyright	2008-06-17 19:03:30 UTC (rev 1467)
+++ packages/planet-venus/trunk/debian/copyright	2008-06-17 22:20:16 UTC (rev 1468)
@@ -1,10 +1,9 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Noah Slater <nslater at bytesexual.org>
-X-Debianized-Date: Wed, 13 Feb 2008 09:20:18 +0000
-X-Source-Downloaded-From: http://www.intertwingly.net/code/venus/
-X-Source-Get-Original: ./debian/rules get-orig-source
-X-Source-Original-Depends: bzr
-X-Upstream-Author: Sam Ruby <rubys at intertwingly.net>
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Packaged-By: Noah Slater <nslater at bytesexual.org>
+Packaged-Date: Wed, 13 Feb 2008 09:20:18 +0000
+Original-Source-Location: http://www.intertwingly.net/code/venus/
+Original-Source-Command: ./debian/rules get-orig-source
+Original-Source-Depends: bzr
 
 Files: *
 Copyright: Copyright 2008, Sam Ruby <rubys at intertwingly.net>
@@ -12,10 +11,61 @@
  Copyright 2007, Jeff Waugh <jdub at perkypants.org>
  Copyright 2007, Eric van der Vlist <vdv at dyomedea.com>
 License: PSF-2
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+ .
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+ Reserved" are retained in Python alone or in any derivative version
+ prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
 
 Files: debian/*
 Copyright: Copyright 2008, Noah Slater <nslater at bytesexual.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
+ notice are preserved.
 
 Files: planet/vendor/compat_logging/*
 Copyright: Copyright 2002, Vinay Sajip <vinay_sajip at yahoo.co.uk>
@@ -61,10 +111,13 @@
 Files: planet/vendor/httplib2/*
 Copyright: Copyright 2006, Joe Gregorio <joe at bitworking.org>
 License: MIT-any
+ Unspecified MIT style licence.
 
 Files: planet/vendor/htmltmpl.py
 Copyright: Copyright 2004, Tomas Styblo <tripie at cpan.org>
 License: GPL-any
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL' file.
 
 Files: planet/vendor/timeoutsocket.py
 Copyright: Copyright 2001, Timothy O'Malley <timo at alum.mit.edu>
@@ -106,65 +159,3 @@
  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: PSF-2
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
- .
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python
- alone or in any derivative version, provided, however, that PSF's
- License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
- 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version
- prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
-
-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
- notice are preserved.
-
-License: MIT-any
- Unspecified MIT style licence.
-
-License: GPL-any
- On Debian systems the full text of the GNU General Public License can be found
- in the `/usr/share/common-licenses/GPL' file.

Modified: packages/planet-venus/trunk/debian/rules
===================================================================
--- packages/planet-venus/trunk/debian/rules	2008-06-17 19:03:30 UTC (rev 1467)
+++ packages/planet-venus/trunk/debian/rules	2008-06-17 22:20:16 UTC (rev 1468)
@@ -18,15 +18,15 @@
 
 PACKAGE_NAME = planet-venus
 PACKAGE_VERSION = $(shell dpkg-parsechangelog | sed -rne 's/^Version: .*~bzr([^-]+).*/\1/p')
-PACKAGE_DIRECTORY=$(PACKAGE_NAME)-0~bzr$(PACKAGE_VERSION).orig
-PACKAGE_FILENAME=$(PACKAGE_NAME)_0~bzr$(PACKAGE_VERSION).orig.tar.gz
+PACKAGE_DIRECTORY = $(PACKAGE_NAME)-0~bzr$(PACKAGE_VERSION).orig
+PACKAGE_FILENAME = $(PACKAGE_NAME)_0~bzr$(PACKAGE_VERSION).orig.tar.gz
 
 clean::
 	rm -f planet.sed.py
 
-# XXX: The bundled feedparser.py is a pre-release version so we can't depend on
-# XXX: the standard packaged version. The other three bundled modules might be
-# XXX: nice as external packages, one day.
+# @@ The bundled feedparser.py is a pre-release version so we can't depend on
+# @@ the standard packaged version. The other three bundled modules might be
+# @@ nice as external packages.
 
 common-install-prehook-impl::
 	sed "s/@version@/$(PACKAGE_VERSION)/" planet.py > planet.sed.py


