tags 516122 + patch tags 523445 + patch Hi,
as I've prepared a NMU which fixes the two RC bugs and includes all necessary changes to follow the updates in python-qt4. Also I'd suggest to upload the version from experimental to unstable now, but I'd not like to do that without the maintainers permission. Cheers, Bernd -- Bernd Zeimetz Debian GNU/Linux Developer GPG Fingerprint: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
diff --git a/debian/changelog b/debian/changelog index f8606ac..5eb9b69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +qscintilla2 (2.3.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/copyright: + - Adding missing copyright informations. + Thanks to Mathieu Parent for providing the fixed file. + (Closes: #516122) + * debian/control, debian/rules, debian/pyversions: + - Replace python-central by python-support to follow the change in + python-qt4. This would not be an issue if python-central would + create namespace packages properly. + (Closes: #523445) + * debian/control, debian/rules: + - Let python-qscintilla2 depend on a python-qt4 version larger or + equal to the version it was built with. + * debian/rules: + - Prepare to build with Python 2.6 to follow the changes in python-qt4. + * debian/control: + - Build-depends on python-qt4{,-dev} >= 4.4.4-6 as revision -5 was + partly broken. + + -- Bernd Zeimetz <b...@debian.org> Mon, 13 Apr 2009 13:43:44 +0200 + qscintilla2 (2.3.2-1) experimental; urgency=low * New upstream release diff --git a/debian/control b/debian/control index d0cca12..cb9b007 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,9 @@ Source: qscintilla2 Priority: extra Maintainer: Torsten Marek <shlo...@debian.org> -Build-Depends: debhelper (>= 5.0.38), libqt4-dev, python-all-dev, python-central (>= 0.5.8), sip4 (>= 4.7.8), python-sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), dpatch, python-qt4-dev (>= 4.4.4) +Build-Depends: debhelper (>= 5.0.38), libqt4-dev, python-all-dev, python-support (>= 0.7.1), sip4 (>= 4.7.8), python-sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), dpatch, python-qt4-dev (>= 4.4.4-6), python-qt4 (>= 4.4.4-6) Standards-Version: 3.8.0 Section: libs -XS-Python-Version: all Homepage: http://www.riverbankcomputing.co.uk/qscintilla/index.php Package: libqscintilla2-5 @@ -59,8 +58,7 @@ Description: API documentation for QScintilla 2 Package: python-qscintilla2 Section: python Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, python-qt4 (>= 4.4.4-1) -XB-Python-Version: ${python:Versions} +Depends: ${python:Depends}, ${shlibs:Depends}, ${python-qt4:Depends} Description: Python bindings for QScintilla 2 QScintilla is a text editor for Qt4 with features especially useful when writing and debugging source code. These include support for syntax diff --git a/debian/copyright b/debian/copyright index dc6c769..f730ab3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,31 +1,416 @@ -This package was debianized by Torsten Marek <shlo...@debian.org> on -Sun, 29 Jul 2007 12:17:49 +0200. +This package was debianized by: -It was downloaded from http://www.riverbankcomputing.co.uk/qscintilla/index.php + Torsten Marek <shlo...@debian.org> on Sun, 29 Jul 2007 12:17:49 +0200. + +It was downloaded from: + + http://www.riverbankcomputing.co.uk/software/qscintilla/download Upstream Authors: - QScintilla 2: + QScintilla 2 (under Qt3/, Qt4/, Python/ designer-Qt*/ and doc/html-Qt*/): Phil Thompson <p...@river-bank.demon.co.uk> - Scintilla (under src/): + Scintilla (under src/ include/ and doc/Scintilla): Neil Hodgson <ne...@scintilla.org> Copyright: - QScintilla 2: + QScintilla 2 (under Qt3/, Qt4/, Python/ designer-Qt*/ and doc/html-Qt*/): Copyright (C) 2007 Phil Thompson - Scintilla (under src/): + Scintilla (under src/ include/ and doc/Scintilla): Copyright 1998-2007 by Neil Hodgson <ne...@scintilla.org> + + src/LexAda.cpp: Copyright 2002 by Sergey Koshcheyev <serge...@seznam.cz> + src/LexAsn1.cpp: Copyright 2004 by Herr Pfarrer rpfarrer <at> yahoo <dot> de + src/LexBaan.cpp: Copyright 2001- by Vamsi Potluru <va...@who.net> & Praveen Ambekar <ambekarprav...@yahoo.com> + src/LexCaml.cpp: Copyright 2005 by Robert Roessler <robe...@rftp.com> + src/LexCLW.cpp: Copyright 2003-2004 by Ron Schofield <r...@schofieldcomputer.com> + src/LexCmake.cpp: Copyright 2007 by Cristian Adam <cristian [dot] adam [at] gmx [dot] net> + src/LexD.cpp: Copyright (c) 2006 by Waldemar Augustyn <walde...@wdmsys.com> + src/LexEScript.cpp: Copyright 2003 by Patrizio Bekerle (patri...@bekerle.com) + src/LexFlagship.cpp: Copyright 2005 by Randy Butler + src/LexGAP.cpp: Copyright 2007 by Istvan Szollosi ( szteven <at> gmail <dot> com ) + src/LexKix.cpp: Copyright 2004 by Manfred Becker <manf...@becker-trdf.de> + src/LexLout.cpp: Copyright 2003 by Kein-Hong Man <m...@pl.jaring.my> + src/LexMPT.cpp: Copyright 2003 by Marius Gheorghe <mgheor...@cabletest.com> + src/LexNsis.cpp: Copyright 2003 - 2005 by Angelo Mandato <angelo [at] spaceblue [dot] com> + src/LexPLM.cpp: Copyright (c) 1990-2007, Scientific Toolworks, Inc. + src/LexPowerShell.cpp: Copyright 2008 by Tim Gerundt <t...@gerundt.de> + src/LexProgress.cpp: Copyright 2006-2007 by Yuval Papish <yu...@yuvcom.com> + src/LexRebol.cpp: Copyright 2005 by Pascal Hurni <pascal_hu...@fastmail.fm> + src/LexRuby.cpp: Copyright 2001- by Clemens Wyss <w...@helbling.ch> + src/LexSpice.cpp: Copyright 2006 by Fabien Proriol + src/LexTCL.cpp: Copyright 1998-2001 by Andre Arpin <ar...@kingston.net> + src/LexYAML.cpp: Copyright 2003- by Sean O'Dell <s...@celsoft.com> + + Parts of Qt (under example-Qt3/ and example-Qt4/) + Copyright (C) 2004-2006 Trolltech ASA License: - QScintilla2 is distributed under the terms of the GNU General - Public License, version 2. On a Debian GNU/Linux system, you - can find a copy of this license in `/usr/share/common-licenses/GPL-2'. + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 or version 3 + as published by the Free Software Foundation. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +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'. + +a Riverbank GPL exception was added to allow linking against non-GPL libraries +and applications: + +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. + +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. - Scintilla (under src/) is licensed by the following terms: +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. + +-------------------------------------------------------------------------- + Scintilla (under src/ include/ and doc/Scintilla) is licensed under the + following terms: Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, @@ -43,5 +428,9 @@ License: OR PERFORMANCE OF THIS SOFTWARE. -The Debian packaging is (C) 2007, Torsten Marek <shlo...@debian.org> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is: + + Copyright (C) 2007, Torsten Marek <shlo...@debian.org> + +and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + diff --git a/debian/patches/01_qscintilla.pro.dpatch b/debian/patches/01_qscintilla.pro.dpatch old mode 100644 new mode 100755 diff --git a/debian/patches/02_configure.dpatch b/debian/patches/02_configure.dpatch old mode 100644 new mode 100755 diff --git a/debian/pyversions b/debian/pyversions new file mode 100644 index 0000000..57a7586 --- /dev/null +++ b/debian/pyversions @@ -0,0 +1 @@ +2.3- diff --git a/debian/rules b/debian/rules index 6192f24..2c1c94d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,15 @@ include /usr/share/dpatch/dpatch.make +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -18,6 +27,8 @@ endif PYTHONS := $(shell pyversions -vr debian/control) +py_qt_version = $(shell dpkg -s python-qt$(strip $(1)) | grep '^Version' | sed 's,Version: \(.*\)-[^-]*$$,\1,') + configure: $(PYTHONS:%=Python/build-%/configure-stamp) dh_testdir cd Qt4 && qmake-qt4 @@ -28,7 +39,8 @@ Python/build-%/configure-stamp: patch-stamp dh_testdir mkdir Python/build-$* cd Python/build-$* \ - && python$* ../configure.py -n ../../Qt4/ -o ../../Qt4 -c -p 4 + && python$* ../configure.py -n ../../Qt4/ -o ../../Qt4 -c -p 4 \ + -d /usr/lib/python$*/$(call py_sitename, $*)/PyQt4 touch $@ build-library-stamp: configure @@ -88,7 +100,7 @@ binary-common: dh_strip dh_compress dh_fixperms - dh_pycentral + dh_pysupport dh_makeshlibs dh_installdeb dh_shlibdeps @@ -102,6 +114,7 @@ binary-indep: install # Build architecture dependant packages using the common target. binary-arch: install + echo 'python-qt4:Depends=python-qt4 (>= $(call py_qt_version, 4))' >> debian/python-qscintilla2.substvars $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common binary: binary-indep binary-arch