[Python-modules-commits] r22235 - in packages/sip4/trunk/debian (6 files)

Thu Jun 21 20:29:02 UTC 2012

Date: Thursday, June 21, 2012 @ 20:29:00
  Author: kitterman
Revision: 22235

* New upstream release
  - Refresh patches
  - Update debian/copyright
* Bump standards-version to 3.9.3 without futher change
* Correct link targets in python-sip-doc.links to point at the current
  -doc package and not the old -dev package location

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/copyright
  packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
  packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
  packages/sip4/trunk/debian/python-sip-doc.links

Modified: packages/sip4/trunk/debian/changelog
===================================================================

--- packages/sip4/trunk/debian/changelog	2012-06-21 17:47:39 UTC (rev 22234)
+++ packages/sip4/trunk/debian/changelog	2012-06-21 20:29:00 UTC (rev 22235)
@@ -1,3 +1,14 @@
+sip4 (4.13.3-1) unstable; urgency=low
+
+  * New upstream release
+    - Refresh patches
+    - Update debian/copyright
+  * Bump standards-version to 3.9.3 without futher change
+  * Correct link targets in python-sip-doc.links to point at the current
+    -doc package and not the old -dev package location
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 21 Jun 2012 14:59:40 -0400
+
 sip4 (4.13.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2012-06-21 17:47:39 UTC (rev 22234)
+++ packages/sip4/trunk/debian/control	2012-06-21 20:29:00 UTC (rev 22235)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Scott Kitterman <scott at kitterman.com>
 Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.7-3~), python-all-dbg, python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sip4/trunk/

Modified: packages/sip4/trunk/debian/copyright
===================================================================
--- packages/sip4/trunk/debian/copyright	2012-06-21 17:47:39 UTC (rev 22234)
+++ packages/sip4/trunk/debian/copyright	2012-06-21 20:29:00 UTC (rev 22235)
@@ -4,6 +4,7 @@
 It was downloaded from http://www.riverbankcomputing.co.uk
 
 Upstream Author: Phil Thompson (phil at riverbankcomputing.co.uk)
+(c) 2011,2012 Riverbank Computing Limited
 
 SIP4 is offered under GPLv2, GPLv3, and the SIP 4 license. The text
 of the SIP license follows:
@@ -75,6 +76,44 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+For the file sipgen/parser.c, copyright and license is:
+
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
 On Debian systems, the complete text of the GNU General Public License 2
 can be found in `/usr/share/common-licenses/GPL-2'. The complete text of the
 GNU General Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.

Modified: packages/sip4/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2012-06-21 17:47:39 UTC (rev 22234)
+++ packages/sip4/trunk/debian/patches/siputils_debian_changes.diff	2012-06-21 20:29:00 UTC (rev 22235)
@@ -1,10 +1,10 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip4-4.13.2/siputils.py
+Index: sip4-4.13.3/siputils.py
 ===================================================================
---- sip4-4.13.2.orig/siputils.py	2012-02-11 13:06:56.855084233 -0500
-+++ sip4-4.13.2/siputils.py	2012-02-11 13:08:03.783082257 -0500
-@@ -745,7 +745,8 @@
+--- sip4-4.13.3.orig/siputils.py	2012-04-11 14:53:48.000000000 -0400
++++ sip4-4.13.3/siputils.py	2012-06-21 11:18:06.533099607 -0400
+@@ -762,7 +762,8 @@
  
          libs.extend(self.optional_list("LIBS_WINDOWS"))
  
@@ -14,7 +14,7 @@
  
          # Save the transformed values.
          self.CFLAGS.set(cflags)
-@@ -880,6 +881,15 @@
+@@ -897,6 +898,15 @@
          clib is the library name in cannonical form.
          framework is set of the library is implemented as a MacOS framework.
          """

Modified: packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2012-06-21 17:47:39 UTC (rev 22234)
+++ packages/sip4/trunk/debian/patches/siputils_objdir_module_fix.diff	2012-06-21 20:29:00 UTC (rev 22235)
@@ -1,8 +1,8 @@
-Index: sip4-4.13.2/siputils.py
+Index: sip4-4.13.3/siputils.py
 ===================================================================
---- sip4-4.13.2.orig/siputils.py	2012-02-11 13:08:03.783082257 -0500
-+++ sip4-4.13.2/siputils.py	2012-02-11 13:08:18.703081818 -0500
-@@ -1594,9 +1594,12 @@
+--- sip4-4.13.3.orig/siputils.py	2012-06-21 11:18:06.533099607 -0400
++++ sip4-4.13.3/siputils.py	2012-06-21 11:21:56.865092801 -0400
+@@ -1617,9 +1617,12 @@
          mfile.write("\n$(OFILES): $(HFILES)\n")
  
          for mf in self._build["moc_headers"].split():

Modified: packages/sip4/trunk/debian/python-sip-doc.links
===================================================================
--- packages/sip4/trunk/debian/python-sip-doc.links	2012-06-21 17:47:39 UTC (rev 22234)
+++ packages/sip4/trunk/debian/python-sip-doc.links	2012-06-21 20:29:00 UTC (rev 22235)
@@ -1,2 +1,2 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-dev/html/_static/jquery.js
-usr/share/javascript/underscore/underscore.min.js usr/share/doc/python-sip-dev/html/_static/underscore.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-doc/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.min.js usr/share/doc/python-sip-doc/html/_static/underscore.js


