[Python-modules-commits] r23471 - in packages/qscintilla2/trunk/debian (6 files)

[kitterman at users.alioth.debian.org]

    Date: Wednesday, February 13, 2013 @ 18:28:53
  Author: kitterman
Revision: 23471

* Move translations for libqscintilla2 to a separate binary,
  libqscintilla2-translations, so that the library itself is
  co-installable with other versions
* Update debian/rules to use dpkg-buildflags
* Bump compat and debhelper version requirement to 9

Added:
  packages/qscintilla2/trunk/debian/libqscintilla2-translations.install
Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/compat
  packages/qscintilla2/trunk/debian/control
  packages/qscintilla2/trunk/debian/libqscintilla2-9.install
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2013-02-13 11:01:11 UTC (rev 23470)
+++ packages/qscintilla2/trunk/debian/changelog	2013-02-13 18:28:53 UTC (rev 23471)
@@ -1,10 +1,15 @@
-qscintilla2 (2.7-1) UNRELEASED; urgency=low
+qscintilla2 (2.7-1) experimental; urgency=low
 
   [ Scott Kitterman ]
   * New upstream release
     - Update for new SO name (rename libqscintilla2-8 to libqscintilla2-9)
     - Update debian/copyright
   * Add symbols file for libqscintilla2-9
+  * Move translations for libqscintilla2 to a separate binary,
+    libqscintilla2-translations, so that the library itself is
+    co-installable with other versions
+  * Update debian/rules to use dpkg-buildflags
+  * Bump compat and debhelper version requirement to 9
   * Bump standards version to 3.9.4 without further change
 
   [ Matthias Klose ]

Modified: packages/qscintilla2/trunk/debian/compat
===================================================================
--- packages/qscintilla2/trunk/debian/compat	2013-02-13 11:01:11 UTC (rev 23470)
+++ packages/qscintilla2/trunk/debian/compat	2013-02-13 18:28:53 UTC (rev 23471)
@@ -1 +1 @@
-8
+9

Modified: packages/qscintilla2/trunk/debian/control
===================================================================
--- packages/qscintilla2/trunk/debian/control	2013-02-13 11:01:11 UTC (rev 23470)
+++ packages/qscintilla2/trunk/debian/control	2013-02-13 18:28:53 UTC (rev 23471)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Gudjon I. Gudjonsson <gudjon at gudjon.org>, Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 8.1.3~), libqt4-dev (>= 4:4.8.0~), python-all-dev (>= 2.6.6-3~), python-sip-dev (>= 4.10), python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~), python3-all-dev (>= 3.1.3-13~), python3-sip-dev, python3-pyqt4
+Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.0~), python-all-dev (>= 2.6.6-3~), python-sip-dev (>= 4.10), python-qt4 (>= 4.8.3-3~), python-qt4-dev (>= 4.8.3-3~), python3-all-dev (>= 3.1.3-13~), python3-sip-dev, python3-pyqt4
 Standards-Version: 3.9.4
 Section: libs
 X-Python3-Version: >= 3.1
@@ -12,10 +12,8 @@
 
 Package: libqscintilla2-9
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqscintilla2-translations (>= ${source:Upstream-Version})
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: libqscintilla2-5, libqscintilla2-6, libqscintilla2-8
-Breaks: libqscintilla2-5, libqscintilla2-6, libqscintilla2-8
 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 
@@ -25,6 +23,19 @@
  of proportional fonts, bold and italics, multiple foreground and background
  colours and multiple fonts.
 
+Package: libqscintilla2-translations
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libqscintilla2-9
+Replaces: libqscintilla2-5, libqscintilla2-6, libqscintilla2-8
+Breaks: libqscintilla2-5, libqscintilla2-6, libqscintilla2-8
+Description: Scintilla source code editing widget for Qt4, translation files
+ QScintilla is a text editor for Qt4 with features especially useful when
+ writing and debugging source code. These include support for syntax
+ styling, error indicators, code completion, call tips and margins.
+ .
+ This package contains translations for libqscintilla2.
+
 Package: libqscintilla2-designer
 Section: misc
 Architecture: any

Modified: packages/qscintilla2/trunk/debian/libqscintilla2-9.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-9.install	2013-02-13 11:01:11 UTC (rev 23470)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-9.install	2013-02-13 18:28:53 UTC (rev 23471)
@@ -1,2 +1 @@
-usr/share/qt4/translations/*
 usr/lib/*.so.*

Added: packages/qscintilla2/trunk/debian/libqscintilla2-translations.install
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-translations.install	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-translations.install	2013-02-13 18:28:53 UTC (rev 23471)
@@ -0,0 +1 @@
+usr/share/qt4/translations/*

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2013-02-13 11:01:11 UTC (rev 23470)
+++ packages/qscintilla2/trunk/debian/rules	2013-02-13 18:28:53 UTC (rev 23471)
@@ -5,13 +5,17 @@
 #export DH_VERBOSE=1
 
 CFLAGS = -Wall -g
-
+CPPFLAGS=
+CXXFLAGS=
+LDFLAGS=
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	CFLAGS += -O0 -g
 	CXXFLAGS += -O0
 else
-	CFLAGS += -O2
-	CXXFLAGS += -O2
+	CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
+	CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+	CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
+	LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 endif
 
 PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vr)