[Python-modules-commits] r29089 - in packages/psycopg2/trunk/debian (5 files)

Mon May 26 20:15:01 UTC 2014

Date: Monday, May 26, 2014 @ 20:15:00
  Author: kitterman
Revision: 29089

* Team upload
* New upstream release
* Correct python-psycopg2-doc install location (Closes: #686741)
* Update debian/copyright
* Repack source tarball to remove minified javascript files
  - Update debian/watch to unmangle upstream version

Modified:
  packages/psycopg2/trunk/debian/README.source
  packages/psycopg2/trunk/debian/changelog
  packages/psycopg2/trunk/debian/copyright
  packages/psycopg2/trunk/debian/python-psycopg2-doc.install
  packages/psycopg2/trunk/debian/watch

Modified: packages/psycopg2/trunk/debian/README.source
===================================================================

--- packages/psycopg2/trunk/debian/README.source	2014-05-26 14:40:54 UTC (rev 29088)
+++ packages/psycopg2/trunk/debian/README.source	2014-05-26 20:15:00 UTC (rev 29089)
@@ -1,3 +1,14 @@
+Preparing DFSG free tarball:
+ 
+These files are sourceless binary files that have to be removed for a DFSG
+free tarball:
+ 
+    doc/html/_static/jquery.js
+    doc/html/_static/underscore.js
+    doc/html/searchindex.js
+
+Patch management
+
 This package uses quilt to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.

Modified: packages/psycopg2/trunk/debian/changelog
===================================================================
--- packages/psycopg2/trunk/debian/changelog	2014-05-26 14:40:54 UTC (rev 29088)
+++ packages/psycopg2/trunk/debian/changelog	2014-05-26 20:15:00 UTC (rev 29089)
@@ -1,3 +1,14 @@
+psycopg2 (2.5.3+dfsg-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+  * Correct python-psycopg2-doc install location (Closes: #686741)
+  * Update debian/copyright
+  * Repack source tarball to remove minified javascript files
+    - Update debian/watch to unmangle upstream version
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 26 May 2014 15:38:51 -0400
+
 psycopg2 (2.5.2-1) unstable; urgency=low
 
   * Team upload

Modified: packages/psycopg2/trunk/debian/copyright
===================================================================
--- packages/psycopg2/trunk/debian/copyright	2014-05-26 14:40:54 UTC (rev 29088)
+++ packages/psycopg2/trunk/debian/copyright	2014-05-26 20:15:00 UTC (rev 29089)
@@ -5,18 +5,11 @@
 
     http://initd.org/projects/psycopg
 
-The tarball has been re-packed to get rid of the upstream debian/ directory:
-no other changes have been made to the tarball.
-
-
 Copyright:
 
-    Copyright (C) 2001-2011 Federico Di Gregorio <fog at debian.org>
-    Copyright (C) 2010-2011 Daniele Varrazzo <daniele.varrazzo at gmail.com>
+    Copyright (C) 2001-2013 Federico Di Gregorio <fog at debian.org>
+    Copyright (C) 2010-2013 Daniele Varrazzo <daniele.varrazzo at gmail.com>
 
-    For psycopg2da:
-        Copyright (C) 2006 Fabio Tranchitella <kobold at debian.org>
-
     For the files doc/copy_from.py and doc/copy_to.py:
         Copyright (C) 2001-2005 Federico Di Gregorio <fog at debian.org>
         Copyright (C) 2002 Tom Jenkins <tjenkins at devis.com>
@@ -34,6 +27,10 @@
     For the file lib/errorcodes.py:
         Copyright (C) 2006-2010 Johan Dahlin  <jdahlin at async.com.br>
 
+    For the files psycopg/error.h and psycopg/diagnostics.h 
+        Copyright (C) 2013 Matthew Woodcraft <matthew at woodcraft.me.uk>
+
+
 License for psycopg2, ZPsycopgDA and psycopg2da:
 
 psycopg2 is free software: you can redistribute it and/or modify it
@@ -67,10 +64,6 @@
 Alternative licenses
 ====================
 
-If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e.,
-every file inside the ZPsycopgDA directory) user the ZPL license as
-published on the Zope web site, http://www.zope.org/Resources/ZPL.
-
 Also, the following BSD-like license applies (at your option) to the
 files following the pattern psycopg/adapter*.{h,c} and
 psycopg/microprotocol*.{h,c}:
@@ -90,15 +83,6 @@
  3. This notice may not be removed or altered from any source distribution.
 
 
-Alternative licenses for psycopg2da:
-
-    If you prefer you can use the Zope3 Database Adapter psycopg2da (i.e.,
-    every file inside the psycopg2da directory) user the ZPL license as
-    published on the Zope web site, http://www.zope.org/Resources/ZPL.
-
-    See above for full license text.
-
-
 License for the files tests/dbapi20.py and scripts/ext2html.py:
 
     These modules have been placed in the public domain.
@@ -106,18 +90,6 @@
 
 doc/pep-0249.txt has been placed in the public domain
 
-
-License and copyright for doc/html/_static/jquery.js: 
-
- * Copyright 2010,2011 John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010,2011 The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
 Copyright (c) The Regents of the University of California.
 All rights reserved.
 
@@ -148,30 +120,7 @@
 
 License and copyright for doc/html/_static/doctools.js, sidebar.js,
 searchtools.js, basic.css, websupport.js, and default.css
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
 
 See above for full BSD license text
-
-License and copyright for doc/html/_static/underscore.js
-//     Underscore.js 1.3.1
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore is freely distributable under the MIT license.
-//     Portions of Underscore are inspired or borrowed from Prototype,
-//     Oliver Steele's Functional, and John Resig's Micro-Templating.
-//     For all details and documentation:
-//     http://documentcloud.github.com/underscore
-
-See above for full BSD license text
-
-Proprietary licenses:
-
-    A non-exclusive license is available for companies that want to include
-    psycopg in their proprietary products without respecting the spirit of the
-    GPL. The price of the license is one day of development done by the author,
-    at the consulting fee he applies to his usual customers at the day of the
-    request.
-
-    Please contact the upstream author (Federico Di Gregorio <fog at debian.org>)
-    for more information about this license.
-

Modified: packages/psycopg2/trunk/debian/python-psycopg2-doc.install
===================================================================
--- packages/psycopg2/trunk/debian/python-psycopg2-doc.install	2014-05-26 14:40:54 UTC (rev 29088)
+++ packages/psycopg2/trunk/debian/python-psycopg2-doc.install	2014-05-26 20:15:00 UTC (rev 29089)
@@ -1,4 +1,4 @@
-doc/html usr/share/doc/python-psycopg2-docs/
-doc/psycopg2.txt usr/share/doc/python-psycopg2-docs/
-doc/HACKING usr/share/doc/python-psycopg2-docs/
-doc/pep-0249.txt usr/share/doc/python-psycopg2-docs/
+doc/html usr/share/doc/python-psycopg2-doc/
+doc/psycopg2.txt usr/share/doc/python-psycopg2-doc/
+doc/HACKING usr/share/doc/python-psycopg2-doc/
+doc/pep-0249.txt usr/share/doc/python-psycopg2-doc/

Modified: packages/psycopg2/trunk/debian/watch
===================================================================
--- packages/psycopg2/trunk/debian/watch	2014-05-26 14:40:54 UTC (rev 29088)
+++ packages/psycopg2/trunk/debian/watch	2014-05-26 20:15:00 UTC (rev 29089)
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://pypi.python.org/packages/source/p/psycopg2/psycopg2-([0-9][0-9\.\-]*).tar.gz debian uupdate


