[Python-modules-commits] r32994 - in packages/qscintilla2/trunk/debian (14 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Tue Jun 16 04:38:26 UTC 2015


    Date: Tuesday, June 16, 2015 @ 04:38:25
  Author: kitterman
Revision: 32994

* New upstream release
  - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
    jquery.js)
  - Update debian/patches/configure.py-objdir-support.diff and debian/
    patches/remove-logo-privacy-issue.diff to match upstream changes
  - Refresh other patches
  - Update debian/copyright - Now GPLv3 only vice previous GPLv2/3
* Bump libqt5scintilla2-12 and libqscintilla2-12 package names to match new
  soname

Added:
  packages/qscintilla2/trunk/debian/libqscintilla2-12.install
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/copyright
  packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch
  packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
  packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
  packages/qscintilla2/trunk/debian/patches/qsci_link.patch
  packages/qscintilla2/trunk/debian/patches/qt5_includes.patch
  packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
  packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff
  packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch
  packages/qscintilla2/trunk/debian/rules
Deleted:
  packages/qscintilla2/trunk/debian/libqscintilla2-11.install

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/changelog	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,3 +1,17 @@
+qscintilla2 (2.9+dfsg-1) experimental; urgency=medium
+
+  * New upstream release
+    - Repack tarball to remove sourcelss javascript files (doc/html-Qt4Qt5/
+      jquery.js)
+    - Update debian/patches/configure.py-objdir-support.diff and debian/
+      patches/remove-logo-privacy-issue.diff to match upstream changes
+    - Refresh other patches
+    - Update debian/copyright - Now GPLv3 only vice previous GPLv2/3
+  * Bump libqt5scintilla2-12 and libqscintilla2-12 package names to match new
+    soname
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 15 Jun 2015 23:04:39 -0400
+
 qscintilla2 (2.8.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/control	2015-06-16 04:38:25 UTC (rev 32994)
@@ -31,7 +31,7 @@
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/qscintilla2/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/qscintilla2/trunk/
 
-Package: libqscintilla2-11
+Package: libqscintilla2-12
 Architecture: any
 Depends: libqscintilla2-l10n (>= ${source:Upstream-Version}),
          ${misc:Depends},
@@ -46,11 +46,11 @@
  of proportional fonts, bold and italics, multiple foreground and background
  colours and multiple fonts.
 
-Package: libqscintilla2-11-dbg
+Package: libqscintilla2-12-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: libqscintilla2-11 (= ${binary:Version}),
+Depends: libqscintilla2-12 (= ${binary:Version}),
          ${misc:Depends}
 Description: Qt4 port of the Scintilla source code editing widget (debug)
  QScintilla is a text editor for Qt4 with features especially useful when
@@ -63,7 +63,7 @@
  .
  This package contains the debug extensions.
 
-Package: libqt5scintilla2-11
+Package: libqt5scintilla2-12
 Architecture: any
 Depends: libqt5scintilla2-l10n (>= ${source:Upstream-Version}),
          ${misc:Depends},
@@ -78,11 +78,11 @@
  of proportional fonts, bold and italics, multiple foreground and background
  colours and multiple fonts.
 
-Package: libqt5scintilla2-11-dbg
+Package: libqt5scintilla2-12-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: libqt5scintilla2-11 (= ${binary:Version}),
+Depends: libqt5scintilla2-12 (= ${binary:Version}),
          ${misc:Depends}
 Description: Qt5 port of the Scintilla source code editing widget (debug)
  QScintilla is a text editor for Qt5 with features especially useful when
@@ -98,7 +98,7 @@
 Package: libqscintilla2-l10n
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libqscintilla2-11
+Suggests: libqscintilla2-12
 Replaces: libqscintilla2-8
 Breaks: libqscintilla2-8
 Description: Scintilla source code editing widget for Qt4, translation files
@@ -184,8 +184,8 @@
 Package: libqscintilla2-dev
 Section: libdevel
 Architecture: all
-Depends: libqscintilla2-11 (<< ${source:Upstream-Version}+1~),
-         libqscintilla2-11 (>= ${source:Upstream-Version}),
+Depends: libqscintilla2-12 (<< ${source:Upstream-Version}+1~),
+         libqscintilla2-12 (>= ${source:Upstream-Version}),
          libqt4-dev,
          ${misc:Depends}
 Description: Scintilla source code editing widget for Qt4, development files
@@ -199,8 +199,8 @@
 Package: libqt5scintilla2-dev
 Section: libdevel
 Architecture: any
-Depends: libqt5scintilla2-11 (<< ${source:Upstream-Version}+1~),
-         libqt5scintilla2-11 (>= ${source:Upstream-Version}),
+Depends: libqt5scintilla2-12 (<< ${source:Upstream-Version}+1~),
+         libqt5scintilla2-12 (>= ${source:Upstream-Version}),
          qtbase5-dev,
          ${misc:Depends}
 Description: Scintilla source code editing widget for Qt5, development files

Modified: packages/qscintilla2/trunk/debian/copyright
===================================================================
--- packages/qscintilla2/trunk/debian/copyright	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/copyright	2015-06-16 04:38:25 UTC (rev 32994)
@@ -8,7 +8,7 @@
 
 Upstream Authors:
 
-    QScintilla 2 (under Qt3/, Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
+    QScintilla 2 (under Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
     Phil Thompson <phil at river-bank.demon.co.uk>
     Riverbank Computing Limited <info at riverbankcomputing.com>
 
@@ -17,8 +17,8 @@
 
 Copyright:
 
-    QScintilla 2 (under Qt3/, Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
-    Copyright (c) 2014 Riverbank Computing Limited <info at riverbankcomputing.com>
+    QScintilla 2 (under Qt4Qt5/, Python/ designer-Qt*/ and doc/html-Qt*/):
+    Copyright (c) 2015 Riverbank Computing Limited <info at riverbankcomputing.com>
 
     Scintilla (under src/ include/ lexers/ lexlib/ and doc/Scintilla):
     Copyright 1998-2013 by Neil Hodgson <neilh at scintilla.org>
@@ -59,39 +59,29 @@
 
 License:
 
-QScintilla 2 (under Qt3/, Qt4/ and Python/):
+QScintilla 2 (under Qt4Qt5/ and Python/):
 
-    This file may be used under the terms of the GNU General Public
-    License versions 2.0 or 3.0 as published by the Free Software
-    Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-    included in the packaging of this file.  Alternatively you may (at
-    your option) use any later version of the GNU General Public
-    License if such license has been publicly approved by Riverbank
-    Computing Limited (or its successors, if any) and the KDE Free Qt
-    Foundation. In addition, as a special exception, Riverbank gives you
-    certain additional rights. These rights are described in the Riverbank
-    GPL Exception version 1.1, which can be found in the file
-    GPL_EXCEPTION.txt in this package.
+// Copyright (c) 2015 Riverbank Computing Limited <info at riverbankcomputing.com>
+//
+// This file is part of QScintilla.
+//
+// This file may be used under the terms of the GNU General Public License
+// version 3.0 as published by the Free Software Foundation and appearing in
+// the file LICENSE included in the packaging of this file.  Please review the
+// following information to ensure the GNU General Public License version 3.0
+// requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+//
+// If you do not wish to use this file under the terms of the GPL version 3.0
+// then you may purchase a commercial license.  For more information contact
+// info at riverbankcomputing.com.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-    Please review the following information to ensure GNU General
-    Public Licensing requirements will be met:
-    http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-    you are unsure which license is appropriate for your use, please
-    review the following information:
-    http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-    or contact the sales department at sales at riverbankcomputing.com.
+On Debian systems, the complete text of the GNU General Public License
+Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-    This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-    INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-    granted herein.
 
-    This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-    WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-See GPL_EXCEPTION.txt and GPL_EXCEPTION_ADDENDUM.TXT below
-
-
 Scintilla (under src/ include/)
 
     Permission to use, copy, modify, and distribute this software and its
@@ -109,356 +99,7 @@
     TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
     OR PERFORMANCE OF THIS SOFTWARE.
 
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL-2' and
-`/usr/share/common-licenses/GPL-3'.
 
-
 The Debian packaging is (C) 2007, Torsten Marek <shlomme at debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
 
-
-GPL_EXCEPTION.txt
-
-Riverbank GPL Exception version 1.1
-===================================
-
-Additional rights granted beyond the GPL (the "Exception").
-
-As a special exception to the terms and conditions of version 2.0 of the GPL,
-Riverbank hereby grants you the rights described below, provided you agree to
-the terms and conditions in this Exception, including its obligations and
-restrictions on use.
-
-Nothing in this Exception gives you or anyone else the right to change the
-licensing terms of the QScintilla Open Source Edition.
-
-Below, "Licensed Software" shall refer to the software licensed under the GPL
-and this exception.
-
-1) The right to use Open Source Licenses not compatible with the GNU
-General Public License: Your software (hereafter referred to as "Your
-Software") may import the Licensed Software and/or distribute binaries of Your
-Software that imports the Licensed Software, provided that:
-
-A) Your Software is licensed under one of the following licenses:
-
-
-License name                            Version(s)/Copyright Date
-Academic Free License                   2.0, 2.1, 3.0
-Apache Software License                 1.0 or 1.1
-Apache License                          2.0
-Apple Public Source License             2.0
-Artistic license                        From Perl 5.8.0
-BSD license                             "July 22 1999"
-Common Development and
-  Distribution License (CDDL)           1.0
-Common Public License                   1.0
-Eclipse Public License                  1.0
-GNU Library or "Lesser"
-General Public License (LGPL)           2.0 or 2.1
-Jabber Open Source License              1.0
-MIT License                             (as set forth in the addendum file)
-Mozilla Public License (MPL)            1.0 or 1.1
-Open Software License                   2.0, 3.0
-OpenSSL license (with original
-SSLeay license)                         "2003" ("1998")
-PHP License                             3.0
-Python license (CNRI Python License)    (as set forth in the addendum file)
-Python Software Foundation License      2.1.1
-Q Public License                        v1.0
-Sleepycat License                       "1999"
-W3C License                             "2001"
-X11 License                             X11R6.6
-Zlib/libpng License                     (as set forth in the addendum file)
-Zope Public License                     2.0, 2.1
-
-
-(Licenses without a specific version number or date are reproduced
-in the file GPL_Exception_Addendum.txt in your source package).
-
-
-and
-
-B) You must, on request, make a complete package including
-    the complete source code of Your Software (as defined
-    in the GNU General Public License version 2, section 3,
-    but excluding anything excluded by the special
-    exception in the same section) available to Riverbank
-    under the same license as that granted to other
-    recipients of the source code of Your Software.
-
-and
-
-C) Your or any other contributor's rights to:
-
-        i) distribute the source code of Your Software to anyone for
-        any purpose;
-
-        and
-
-        ii) publicly discuss the development project for Your
-        Software and its goals in any form and in any forum
-
-are not prohibited by any legal instrument, including but not limited to
-contracts, non-disclosure agreements, and employee contracts.
-
-
-2) The right to link non-Open Source applications with pre-installed versions of
-the Licensed Software: You may link applications with binary pre-installed
-versions of the Licensed Software, provided that such applications have been
-developed and are deployed in accordance with the terms and conditions of the
-QScintilla Commercial License Agreement.
-
-
-GPL_EXCEPTION_ADDENDUM.TXT
-
-
-Addendum to the Riverbank GPL Exception version 1.1
-===================================================
-
-
---------------------------------------------------------------------------
-
-		The "Artistic License"
-
-				Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-Definitions:
-
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
-
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
-
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
-
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
-
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
-
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-a) place your modifications in the Public Domain or otherwise make them
-Freely Available, such as by posting said modifications to Usenet or
-an equivalent medium, or placing the modifications on a major archive
-site such as uunet.uu.net, or by allowing the Copyright Holder to include
-your modifications in the Standard Version of the Package.
-
-b) use the modified Package only within your corporation or organization.
-
-c) rename any non-standard executables so the names do not conflict
-with standard executables, which must also be provided, and provide
-a separate manual page for each non-standard executable that clearly
-documents how it differs from the Standard Version.
-
-d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-a) distribute a Standard Version of the executables and library files,
-together with instructions (in the manual page or equivalent) on where
-to get the Standard Version.
-
-b) accompany the distribution with the machine-readable source of
-the Package with your modifications.
-
-c) give non-standard executables non-standard names, and clearly
-document the differences in manual pages (or equivalent), together
-with instructions on where to get the Standard Version.
-
-d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.  You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
-
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.  If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
-
-7. C subroutines (or comparably compiled subroutines in other
-languages) supplied by you and linked into this Package in order to
-emulate subroutines and variables of the language defined by this
-Package shall not be considered part of this Package, but are the
-equivalent of input as in Paragraph 6, provided these subroutines do
-not change the language in any way that would cause it to fail the
-regression tests for the language.
-
-8. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution.  Such use shall not be
-construed as a distribution of this Package.
-
-9. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-				The End
-
---------------------------------------------------------------------------
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-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.
-
---------------------------------------------------------------------------
-
-Python License (CNRI Python License)
-
-CNRI OPEN SOURCE LICENSE AGREEMENT
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
-OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
-THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
-
-1. This LICENSE AGREEMENT is between the Corporation for National Research
-Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
-("CNRI"), and the Individual or Organization ("Licensee") accessing and
-otherwise using Python 1.6, beta 1 software in source or binary form and its
-associated documentation, as released at the www.python.org Internet site on
-August 4, 2000 ("Python 1.6b1").
-
-2. Subject to the terms and conditions of this License Agreement, CNRI hereby
-grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python 1.6b1 alone or in any derivative version,
-provided, however, that CNRIs License Agreement is retained in Python 1.6b1,
-alone or in any derivative version prepared by Licensee.
-
-Alternately, in lieu of CNRIs License Agreement, Licensee may substitute the
-following text (omitting the quotes): "Python 1.6, beta 1, is made available
-subject to the terms and conditions in CNRIs License Agreement. This Agreement
-may be located on the Internet using the following unique, persistent identifier
-(known as a handle): 1895.22/1011. This Agreement may also be obtained from a
-proxy server on the Internet using the URL:http://hdl.handle.net/1895.22/1011".
-
-3. In the event Licensee prepares a derivative work that is based on or
-incorporates Python 1.6b1or any part thereof, and wants to make the derivative
-work available to the public as provided herein, then Licensee hereby agrees to
-indicate in any such work the nature of the modifications made to Python 1.6b1.
-
-4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" basis. CNRI
-MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
-BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
-OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
-PYTHON 1.6b1WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR
-ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING,
-MODIFYING OR DISTRIBUTING PYTHON 1.6b1, 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. This License Agreement shall be governed by and interpreted in all respects
-by the law of the State of Virginia, excluding conflict of law provisions.
-Nothing in this License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee. This License
-Agreement does not grant permission to use CNRI trademarks or trade name in a
-trademark sense to endorse or promote products or services of Licensee, or any
-third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
-or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms and
-conditions of this License Agreement.
-
-
-
-ACCEPT
-
---------------------------------------------------------------------------
-
-The zlib/libpng License
-
-Copyright (c) <year> <copyright holders>
-
-This software is provided 'as-is', without any express or implied warranty. In
-no event will the authors be held liable for any damages arising from the use of
-this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product, an
-acknowledgment in the product documentation would be appreciated but is not
-required.
-
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.
-
---------------------------------------------------------------------------

Deleted: packages/qscintilla2/trunk/debian/libqscintilla2-11.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-11.install	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-11.install	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1 +0,0 @@
-usr/lib/*.so.*

Added: packages/qscintilla2/trunk/debian/libqscintilla2-12.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-12.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-12.install	2015-06-16 04:38:25 UTC (rev 32994)
@@ -0,0 +1 @@
+usr/lib/*.so.*

Modified: packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/build_debug_libs.patch	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,9 +1,9 @@
 Build libs and designer plugin with debug for -dbg packages
-Index: qscintilla2-2.8.3+dfsg/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.9+dfsg/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-07-28 13:42:31.572950904 -0400
-+++ qscintilla2-2.8.3+dfsg/Qt4Qt5/qscintilla.pro	2014-07-28 13:43:14.912949623 -0400
-@@ -29,7 +29,7 @@
+--- qscintilla2-2.9+dfsg.orig/Qt4Qt5/qscintilla.pro	2015-06-15 23:27:21.084321620 -0400
++++ qscintilla2-2.9+dfsg/Qt4Qt5/qscintilla.pro	2015-06-15 23:27:21.080321620 -0400
+@@ -24,7 +24,7 @@
  
  TEMPLATE = lib
  TARGET = qscintilla2
@@ -12,10 +12,10 @@
  INCLUDEPATH += . ../include ../lexlib ../src
  
  DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
-Index: qscintilla2-2.8.3+dfsg/designer-Qt4Qt5/designer.pro
+Index: qscintilla2-2.9+dfsg/designer-Qt4Qt5/designer.pro
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/designer-Qt4Qt5/designer.pro	2014-07-28 13:42:31.580950904 -0400
-+++ qscintilla2-2.8.3+dfsg/designer-Qt4Qt5/designer.pro	2014-07-28 13:44:19.848947705 -0400
+--- qscintilla2-2.9+dfsg.orig/designer-Qt4Qt5/designer.pro	2015-06-15 23:27:21.084321620 -0400
++++ qscintilla2-2.9+dfsg/designer-Qt4Qt5/designer.pro	2015-06-15 23:27:21.080321620 -0400
 @@ -4,7 +4,7 @@
  TEMPLATE = lib
  TARGET = qscintillaplugin

Modified: packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff	2015-06-16 04:38:25 UTC (rev 32994)
@@ -3,20 +3,19 @@
 <scott at kitterman.com>
 patch the configure script for the Python bindings to support object dir
 builds
-Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+Index: qscintilla2-2.9+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:02:02.318834374 -0400
-+++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:02:02.306834375 -0400
-@@ -31,6 +31,8 @@
- import glob
- import optparse
+--- qscintilla2-2.9+dfsg.orig/Python/configure.py	2015-06-15 23:15:03.912305894 -0400
++++ qscintilla2-2.9+dfsg/Python/configure.py	2015-06-15 23:18:23.356310149 -0400
+@@ -37,6 +37,7 @@
+ # You shouldn't need to modify anything above this line.
+ ###############################################################################
  
 +src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- try:
-     import sysconfig
- except ImportError:
-@@ -210,6 +212,8 @@
+ 
+ # This must be kept in sync with Python/configure-old.py, qscintilla.pro,
+ # example-Qt4Qt5/application.pro and designer-Qt4Qt5/designer.pro.
+@@ -206,6 +207,8 @@
                      "The QScintilla version number could not be determined by "
                      "reading %s." % sciglobal)
  
@@ -25,7 +24,7 @@
          lib_dir = target_configuration.qsci_lib_dir
          if lib_dir is None:
              lib_dir = target_configuration.qt_lib_dir
-@@ -264,7 +268,12 @@
+@@ -260,7 +263,12 @@
          the target configuration.
          """
  

Modified: packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,10 +1,10 @@
 01_qscintilla.pro.dpatch by Torsten Marek <shlomme at debian.org>
 Don't install the library directly
-Index: qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.9+dfsg/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-06-09 15:09:55.924432554 -0400
-+++ qscintilla2-2.8.2+dfsg/Qt4Qt5/qscintilla.pro	2014-06-09 15:09:55.920432554 -0400
-@@ -52,7 +52,7 @@
+--- qscintilla2-2.9+dfsg.orig/Qt4Qt5/qscintilla.pro	2015-06-15 23:20:15.368312538 -0400
++++ qscintilla2-2.9+dfsg/Qt4Qt5/qscintilla.pro	2015-06-15 23:20:15.364312538 -0400
+@@ -50,7 +50,7 @@
  #DEFINES += SCI_NAMESPACE
  
  # Handle both Qt v4 and v3.

Modified: packages/qscintilla2/trunk/debian/patches/qsci_link.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/qsci_link.patch	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,8 +1,8 @@
-Index: qscintilla2-2.8.4+dfsg/Python/configure.py
+Index: qscintilla2-2.9+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.4+dfsg.orig/Python/configure.py	2014-09-21 22:26:07.110346928 -0400
-+++ qscintilla2-2.8.4+dfsg/Python/configure.py	2014-09-21 22:26:07.106346928 -0400
-@@ -1440,7 +1440,10 @@
+--- qscintilla2-2.9+dfsg.orig/Python/configure.py	2015-06-15 23:25:45.248319576 -0400
++++ qscintilla2-2.9+dfsg/Python/configure.py	2015-06-15 23:25:45.244319576 -0400
+@@ -1431,7 +1431,10 @@
  
      libs = qmake_config.get('LIBS')
      if libs:

Modified: packages/qscintilla2/trunk/debian/patches/qt5_includes.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_includes.patch	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/qt5_includes.patch	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,11 +1,11 @@
 When building for Qt5, the python extension needs QtWidgets and QtPrintSupport
 because things moved there from QtGui in Qt4.  Sent upstream.
 
-Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+Index: qscintilla2-2.9+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-05 10:02:57.882832733 -0400
-+++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-05 10:02:57.874832733 -0400
-@@ -1423,6 +1423,9 @@
+--- qscintilla2-2.9+dfsg.orig/Python/configure.py	2015-06-15 23:25:25.020319144 -0400
++++ qscintilla2-2.9+dfsg/Python/configure.py	2015-06-15 23:25:25.020319144 -0400
+@@ -1420,6 +1420,9 @@
      if includepath:
          pro.write('INCLUDEPATH += %s\n' % includepath)
  

Modified: packages/qscintilla2/trunk/debian/patches/qt5_libname.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/qt5_libname.patch	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/qt5_libname.patch	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,10 +1,10 @@
 Rename library when built with Qt5 for co-installability.  Discussed with
 upstream, but not reviewed as they aren't particularly interested in it.
-Index: qscintilla2-2.8.4+dfsg/Qt4Qt5/qscintilla.pro
+Index: qscintilla2-2.9+dfsg/Qt4Qt5/qscintilla.pro
 ===================================================================
---- qscintilla2-2.8.4+dfsg.orig/Qt4Qt5/qscintilla.pro	2014-09-21 22:25:27.974348084 -0400
-+++ qscintilla2-2.8.4+dfsg/Qt4Qt5/qscintilla.pro	2014-09-21 22:25:27.958348085 -0400
-@@ -41,6 +41,7 @@
+--- qscintilla2-2.9+dfsg.orig/Qt4Qt5/qscintilla.pro	2015-06-15 23:25:31.920319291 -0400
++++ qscintilla2-2.9+dfsg/Qt4Qt5/qscintilla.pro	2015-06-15 23:25:31.916319291 -0400
+@@ -36,6 +36,7 @@
  
  greaterThan(QT_MAJOR_VERSION, 4) {
  	QT += widgets printsupport
@@ -12,10 +12,10 @@
  
      greaterThan(QT_MINOR_VERSION, 1) {
  	    macx:QT += macextras
-Index: qscintilla2-2.8.4+dfsg/Qt4Qt5/features/qscintilla2.prf
+Index: qscintilla2-2.9+dfsg/Qt4Qt5/features/qscintilla2.prf
 ===================================================================
---- qscintilla2-2.8.4+dfsg.orig/Qt4Qt5/features/qscintilla2.prf	2014-09-21 22:25:27.974348084 -0400
-+++ qscintilla2-2.8.4+dfsg/Qt4Qt5/features/qscintilla2.prf	2014-09-21 22:25:27.966348085 -0400
+--- qscintilla2-2.9+dfsg.orig/Qt4Qt5/features/qscintilla2.prf	2015-06-15 23:25:31.920319291 -0400
++++ qscintilla2-2.9+dfsg/Qt4Qt5/features/qscintilla2.prf	2015-06-15 23:25:31.916319291 -0400
 @@ -17,9 +17,18 @@
          win32: {
              LIBS += -lqscintilla2d
@@ -36,10 +36,10 @@
      LIBS += -lqscintilla2
 +        }
  }
-Index: qscintilla2-2.8.4+dfsg/designer-Qt4Qt5/designer.pro
+Index: qscintilla2-2.9+dfsg/designer-Qt4Qt5/designer.pro
 ===================================================================
---- qscintilla2-2.8.4+dfsg.orig/designer-Qt4Qt5/designer.pro	2014-09-21 22:25:27.974348084 -0400
-+++ qscintilla2-2.8.4+dfsg/designer-Qt4Qt5/designer.pro	2014-09-21 22:25:27.966348085 -0400
+--- qscintilla2-2.9+dfsg.orig/designer-Qt4Qt5/designer.pro	2015-06-15 23:25:31.920319291 -0400
++++ qscintilla2-2.9+dfsg/designer-Qt4Qt5/designer.pro	2015-06-15 23:25:31.916319291 -0400
 @@ -11,8 +11,11 @@
  
      # Work around QTBUG-39300.

Modified: packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/remove-logo-privacy-issue.diff	2015-06-16 04:38:25 UTC (rev 32994)
@@ -2,10 +2,10 @@
 are accessed to resolve privacy-breach-logo lintian error.  Not forwarded, not
 needed.
 
-Index: qscintilla2-2.8.2+dfsg/doc/Scintilla/index.html
+Index: qscintilla2-2.9+dfsg/doc/Scintilla/index.html
 ===================================================================
---- qscintilla2-2.8.2+dfsg.orig/doc/Scintilla/index.html	2014-06-09 15:14:43.944424044 -0400
-+++ qscintilla2-2.8.2+dfsg/doc/Scintilla/index.html	2014-06-09 15:16:03.672421688 -0400
+--- qscintilla2-2.9+dfsg.orig/doc/Scintilla/index.html	2015-06-15 23:20:44.900313168 -0400
++++ qscintilla2-2.9+dfsg/doc/Scintilla/index.html	2015-06-15 23:24:31.816318009 -0400
 @@ -63,13 +63,6 @@
          </td>
        </tr>
@@ -18,15 +18,15 @@
 -      </tr>
 -    </table>
      <ul id="versionlist">
-       <li>Version 3.3.6 adds support for the Rust language and fixes bugs.</li>
-       <li>Version 3.3.5 can represent characters with strings. This may be used for modes
+       <li>Version 3.5.4 improves indicators to be able to change appearance on mouse-over and to use a wide variety of colours together.</li>
+       <li>Version 3.5.3 removes support for Windows 95, 98, and ME.</li>
 @@ -167,7 +160,6 @@
  <!--
  if (IsRemote()) {
-     document.write('<a href="http://sourceforge.net/projects/scintilla">');
+     document.write('<a href="http://sourceforge.net/projects/scintilla/">');
 -    document.write('<img src="http://sflogo.sourceforge.net/sflogo.php?group_id=2439&type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a> ');
  } else {
-     document.write('<a href="http://sourceforge.net/projects/scintilla">SourceForge<\/a>');
+     document.write('<a href="http://sourceforge.net/projects/scintilla/">SourceForge<\/a>');
  }
 @@ -175,7 +167,7 @@
  </script>

Modified: packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/patches/sip_install_loc.patch	2015-06-16 04:38:25 UTC (rev 32994)
@@ -1,9 +1,9 @@
 Adjust for Debian Python build file location.  No need to upstream.
-Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+Index: qscintilla2-2.9+dfsg/Python/configure.py
 ===================================================================
---- qscintilla2-2.8.3+dfsg.orig/Python/configure.py	2014-07-15 21:08:17.000000000 -0400
-+++ qscintilla2-2.8.3+dfsg/Python/configure.py	2014-07-27 23:05:45.650505234 -0400
-@@ -278,7 +278,7 @@
+--- qscintilla2-2.9+dfsg.orig/Python/configure.py	2015-06-15 23:13:20.012303678 -0400
++++ qscintilla2-2.9+dfsg/Python/configure.py	2015-06-15 23:13:20.008303678 -0400
+@@ -274,7 +274,7 @@
              return None
  
          path = os.path.join(target_configuration.qsci_sip_dir, 'Qsci')

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2015-06-15 22:24:03 UTC (rev 32993)
+++ packages/qscintilla2/trunk/debian/rules	2015-06-16 04:38:25 UTC (rev 32994)
@@ -27,7 +27,7 @@
 PYTHONS := $(shell pyversions -vr debian/control) $(PYTHON3S)
 
 # Update this on SO name bumps so files get shoved around correctly
-SONAME=11
+SONAME=12
 
 # Not all archs have Qt5 yet.  This test means python3-pyqt5 is installed
 qt5 := "no"




More information about the Python-modules-commits mailing list