[Python-modules-commits] r20412 - in packages/qscintilla2/trunk/debian (8 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Sun Feb 12 16:20:55 UTC 2012
Date: Sunday, February 12, 2012 @ 16:20:54
Author: kitterman
Revision: 20412
* New upstream release
- Drop debian/patches/snapshot-keys.patch as it was cherrypicked from
upstream to start with
- Refresh remaining patches
* Add libqscintilla2-8 Breaks previous versions of the library since they
aren't completely co-installable
* Install NEWS file as upstream changelog
Modified:
packages/qscintilla2/trunk/debian/changelog
packages/qscintilla2/trunk/debian/control
packages/qscintilla2/trunk/debian/docs
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/series
packages/qscintilla2/trunk/debian/rules
Deleted:
packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch
Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/changelog 2012-02-12 16:20:54 UTC (rev 20412)
@@ -1,3 +1,15 @@
+qscintilla2 (2.6.1-1) unstable; urgency=low
+
+ * New upstream release
+ - Drop debian/patches/snapshot-keys.patch as it was cherrypicked from
+ upstream to start with
+ - Refresh remaining patches
+ * Add libqscintilla2-8 Breaks previous versions of the library since they
+ aren't completely co-installable
+ * Install NEWS file as upstream changelog
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 12 Feb 2012 11:01:43 -0500
+
qscintilla2 (2.6-4) unstable; urgency=low
* Add debian/patches/snapshot-keys.patch to fix custom keyboard shortcuts
Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/control 2012-02-12 16:20:54 UTC (rev 20412)
@@ -13,6 +13,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libqscintilla2-5, libqscintilla2-6
+Breaks: libqscintilla2-5, libqscintilla2-6
Description: Qt4 port of the Scintilla source code editing widget
QScintilla is a text editor for Qt4 with features especially useful when
writing and debugging source code. These include support for syntax
Modified: packages/qscintilla2/trunk/debian/docs
===================================================================
--- packages/qscintilla2/trunk/debian/docs 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/docs 2012-02-12 16:20:54 UTC (rev 20412)
@@ -1,2 +1 @@
-NEWS
README
Modified: packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/patches/configure.py-objdir-support.diff 2012-02-12 16:20:54 UTC (rev 20412)
@@ -1,8 +1,10 @@
02_configure.dpatch by Torsten Marek <shlomme at debian.org>
patch the configure script for the Python bindings to support object dir builds
---- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
+Index: qscintilla2-2.6.1/Python/configure.py
+===================================================================
+--- qscintilla2-2.6.1.orig/Python/configure.py 2012-02-11 12:42:22.487127795 -0500
++++ qscintilla2-2.6.1/Python/configure.py 2012-02-11 12:42:26.139127687 -0500
+@@ -28,6 +28,7 @@
import glob
import optparse
@@ -10,7 +12,7 @@
# Import SIP's configuration module so that we have access to the error
# reporting. Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
+@@ -179,7 +180,7 @@
if os.access(sciglobal, os.F_OK):
# Get the QScintilla version string.
_, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
@@ -19,7 +21,7 @@
if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
# Because we include the Python bindings with the C++ code we can
# reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
+@@ -255,9 +256,9 @@
argv.append(buildfile)
if pyqt.pyqt_version >= 0x040000:
Modified: packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff
===================================================================
--- packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/patches/fix-lib-install-dir.diff 2012-02-12 16:20:54 UTC (rev 20412)
@@ -1,10 +1,11 @@
01_qscintilla.pro.dpatch by Torsten Marek <shlomme at debian.org>
Don't install the library directly
-diff -urNad qscintilla2-2.1+snapshot20070923~/Qt4/qscintilla.pro qscintilla2-2.1+snapshot20070923/Qt4/qscintilla.pro
---- qscintilla2-2.1+snapshot20070923~/Qt4/qscintilla.pro 2007-09-30 14:37:53.000000000 +0200
-+++ qscintilla2-2.1+snapshot20070923/Qt4/qscintilla.pro 2007-09-30 14:39:25.000000000 +0200
-@@ -29,7 +29,7 @@
- DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER
+Index: qscintilla2-2.6.1/Qt4/qscintilla.pro
+===================================================================
+--- qscintilla2-2.6.1.orig/Qt4/qscintilla.pro 2012-02-10 04:59:51.000000000 -0500
++++ qscintilla2-2.6.1/Qt4/qscintilla.pro 2012-02-11 12:41:31.287129310 -0500
+@@ -37,7 +37,7 @@
+ #DEFINES += SCI_NAMESPACE
# Handle both Qt v4 and v3.
-target.path = $$[QT_INSTALL_LIBS]
Modified: packages/qscintilla2/trunk/debian/patches/series
===================================================================
--- packages/qscintilla2/trunk/debian/patches/series 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/patches/series 2012-02-12 16:20:54 UTC (rev 20412)
@@ -1,3 +1,2 @@
configure.py-objdir-support.diff
fix-lib-install-dir.diff
-snapshot-keys.patch
Deleted: packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch 2012-02-12 16:20:54 UTC (rev 20412)
@@ -1,21 +0,0 @@
-Cherrypick from upstream snapshot
-Index: qscintilla2-2.6/Qt4/qsciscintilla.cpp
-===================================================================
---- qscintilla2-2.6.orig/Qt4/qsciscintilla.cpp 2011-11-11 14:02:16.000000000 +0100
-+++ qscintilla2-2.6/Qt4/qsciscintilla.cpp 2012-02-09 20:29:01.223115096 +0100
-@@ -4037,15 +4039,6 @@
-
- if (ke->key())
- {
-- // We want any of the standard context menu shortcuts.
-- if (ke == QKeySequence::Undo || ke == QKeySequence::Redo ||
-- ke == QKeySequence::Cut || ke == QKeySequence::Copy ||
-- ke == QKeySequence::Paste || ke == QKeySequence::SelectAll)
-- {
-- ke->accept();
-- return true;
-- }
--
- // We want ordinary characters.
- if ((ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier || ke->modifiers() == Qt::KeypadModifier) && ke->key() < Qt::Key_Escape)
- {
Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules 2012-02-12 00:03:10 UTC (rev 20411)
+++ packages/qscintilla2/trunk/debian/rules 2012-02-12 16:20:54 UTC (rev 20412)
@@ -78,8 +78,8 @@
dh_testroot
dh_installman
dh_install --sourcedir=$(CURDIR)/debian/tmp
- dh_installchangelogs
- dh_installdocs -A NEWS
+ dh_installchangelogs NEWS
+ dh_installdocs -A
dh_installexamples
dh_link
dh_strip
More information about the Python-modules-commits
mailing list