[Python-modules-commits] r15935 - in packages/python-qt4/trunk/debian (7 files)

Tue Mar 1 22:15:44 UTC 2011

Date: Tuesday, March 1, 2011 @ 22:15:39
  Author: piotr
Revision: 15935

* Team upload.
* Add fix_the_QAssitant_ftbfs patch (thanks to PICCA Fr?\195?\169d?\195?\169ric-Emmanuel)
* Add libjs-jquery to python-qt4-doc's Depends and replace jquery files with
  symlinks.

Added:
  packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch
  packages/python-qt4/trunk/debian/python-qt4-doc.links
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/copyright
  packages/python-qt4/trunk/debian/patches/series
  packages/python-qt4/trunk/debian/python-qt4-doc.doc-base

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================

--- packages/python-qt4/trunk/debian/changelog	2011-03-01 20:00:50 UTC (rev 15934)
+++ packages/python-qt4/trunk/debian/changelog	2011-03-01 22:15:39 UTC (rev 15935)
@@ -1,5 +1,7 @@
-python-qt4 (4.8.3-1) UNRELEASED; urgency=low
+python-qt4 (4.8.3-1) unstable; urgency=low
 
+  * Team upload.
+
   [ Felix Geyer ]
   * New upstream release
   * debian/control
@@ -12,10 +14,12 @@
     - Adapt to new upstream version
 
   [ Piotr OÅ¼arowski ]
-  * Team Upload
   * Rebuild against new python-sip version closes: #615163
+  * Add fix_the_QAssitant_ftbfs patch (thanks to PICCA FrÃ©dÃ©ric-Emmanuel)
+  * Add libjs-jquery to python-qt4-doc's Depends and replace jquery files with
+    symlinks.
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 26 Jan 2011 16:39:41 +0100
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Tue, 01 Mar 2011 22:22:33 +0100
 
 python-qt4 (4.7.3-1) unstable; urgency=low
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-03-01 20:00:50 UTC (rev 15934)
+++ packages/python-qt4/trunk/debian/control	2011-03-01 22:15:39 UTC (rev 15935)
@@ -134,7 +134,7 @@
 Architecture: all
 Section: doc
 Suggests: qt4-doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Description: Documentation and examples for PyQt4
  PyQt4 exposes the Qt4 GUI toolkit in Python.
  .

Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright	2011-03-01 20:00:50 UTC (rev 15934)
+++ packages/python-qt4/trunk/debian/copyright	2011-03-01 22:15:39 UTC (rev 15935)
@@ -29,9 +29,34 @@
 
 
 The files in pyuic/ are (c) 2005 Torsten Marek (shlomme at gmx.net) and
-double-licensted under the GPL and the BSD license. A copy of the BSD
-license is available as /usr/share/common-licenses/BSD in the 
-Debian GNU/Linux distribution.
+double-licensted under the GPL and the BSD license.
+
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
 -------------------------------------------------------------------
 
 

Added: packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.patch	2011-03-01 22:15:39 UTC (rev 15935)
@@ -0,0 +1,29 @@
+From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Tue, 1 Mar 2011 21:49:23 +0100
+Subject: [PATCH] * fix the QAssitant ftbfs
+
+---
+ configure.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7ed9582..185ec9f 100644
+--- a/configure.py
++++ b/configure.py
+@@ -354,10 +354,10 @@ class ConfigurePyQt4:
+ 
+         if opts.mwg_ssl_dir:
+             ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")]
+-            ass_libs = ["ssleay32", "libeay32"]
++            ass_libs = ["ssleay32", "libeay32", "QtCore"]
+         else:
+             ass_lib_dirs = None
+-            ass_libs = None
++            ass_libs = ["QtCore"]
+ 
+         # Note that the order in which we check is important for the
+         # consolidated module - a module's dependencies must be checked first.
+-- 
+1.7.4.1
+

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2011-03-01 20:00:50 UTC (rev 15934)
+++ packages/python-qt4/trunk/debian/patches/series	2011-03-01 22:15:39 UTC (rev 15935)
@@ -1,3 +1,4 @@
 qreal_float_support.diff
 debian_configure_changes.diff
 fix_qthelp_ftbfs.diff
+fix_the_QAssitant_ftbfs.patch

Modified: packages/python-qt4/trunk/debian/python-qt4-doc.doc-base
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.doc-base	2011-03-01 20:00:50 UTC (rev 15934)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.doc-base	2011-03-01 22:15:39 UTC (rev 15935)
@@ -8,5 +8,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-qt4-doc/pyqt4ref.html
+Index: /usr/share/doc/python-qt4-doc/index.html
 Files: /usr/share/doc/python-qt4-doc/html/*.html

Added: packages/python-qt4/trunk/debian/python-qt4-doc.links
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.links	                        (rev 0)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.links	2011-03-01 22:15:39 UTC (rev 15935)
@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-qt4-doc/examples/webkit/fancybrowser/jquery.min.js
+/usr/share/javascript/jquery/jquery.js /usr/share/doc/python-qt4-doc/html/_static/jquery.js


