Comment 2 for bug 20687

Message-ID: <email address hidden>
Date: Thu, 1 Sep 2005 01:56:11 +0200
From: Jonas Meurer <email address hidden>
To: Debian Bug Tracking System <email address hidden>
Subject: qscintilla: rebuild for c++ transition [NMU prepared]

--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Package: qscintilla
Version: 1.5.1-1
Severity: grave
Tags: patch
Justification: renders package unusable

hello,

qscintilla needs to be rebuild for the c++ transition. i prepared a NMU
and uploaded as 5-day NMU.
see the attached patch.

bye
 jonas

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-8-amd64
Locale: LANG=C, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="qscintilla.patch"

diff -rNu qscintilla-1.5.1.old/debian/changelog qscintilla-1.5.1/debian/changelog
--- qscintilla-1.5.1.old/debian/changelog 2005-09-01 01:51:41.000000000 +0200
+++ qscintilla-1.5.1/debian/changelog 2005-09-01 01:52:15.000000000 +0200
@@ -1,3 +1,17 @@
+qscintilla (1.5.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * build against latest libqt3-mt and libstdc++6 for c++ abi transition
+ * rename libqscintilla5 to libqscintilla5c2, make both library and devel
+ packages conflict with libqscintilla5
+ * adapt versions for libqt3-mt-dev and qt3-dev-tools at build-depends
+ * remove g++ from build-depends as it's build-essential anyway
+ * add '-rm -f qt/Makefile' to section in debian/rules, as suggested at
+ bugs.debian.org/267408
+ I don't close the bug as i don't know whether that finally fixes it.
+
+ -- Jonas Meurer <email address hidden> Wed, 31 Aug 2005 23:07:41 +0200
+
 qscintilla (1.5.1-1) unstable; urgency=low

   * New upstream release
diff -rNu qscintilla-1.5.1.old/debian/control qscintilla-1.5.1/debian/control
--- qscintilla-1.5.1.old/debian/control 2005-09-01 01:51:41.000000000 +0200
+++ qscintilla-1.5.1/debian/control 2005-09-01 01:52:15.000000000 +0200
@@ -3,13 +3,15 @@
 Priority: optional
 Maintainer: Ricardo Javier Cardenes Medina <email address hidden>
 Uploaders: Torsten Marek <email address hidden>
-Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev (>= 3:3.1.1), qt3-dev-tools (>= 3:3.1.1-2), g++ (>= 2:3.2)
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev (>= 3:3.3.4), qt3-dev-tools (>= 3:3.3.4)
+Standards-Version: 3.6.2

-Package: libqscintilla5
+Package: libqscintilla5c2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: libqscintilla5
+Replaces: libqscintilla5
 Description: Qt source code editing component based on Scintilla
  Scintilla is a free source code editing component. It has features found
  in standard editing components, as well as features especially useful
@@ -20,8 +22,8 @@
 Package: libqscintilla-dev
 Section: libdevel
 Architecture: all
-Depends: libqscintilla5 (= ${Source-Version})
-Conflicts: libqscintilla0c102 (<< 0.3-5)
+Depends: libqscintilla5c2 (= ${Source-Version})
+Conflicts: libqscintilla5
 Description: Qt source code editing component - development files
  Scintilla is a free source code editing component. It has features found
  in standard editing components, as well as features especially useful
diff -rNu qscintilla-1.5.1.old/debian/libqscintilla5.install qscintilla-1.5.1/debian/libqscintilla5.install
--- qscintilla-1.5.1.old/debian/libqscintilla5.install 2005-09-01 01:51:41.000000000 +0200
+++ qscintilla-1.5.1/debian/libqscintilla5.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/lib/*.so.*
-usr/lib/qt3/plugins/designer/*.so
-usr/share/qt3/translations/*.qm
diff -rNu qscintilla-1.5.1.old/debian/libqscintilla5c2.install qscintilla-1.5.1/debian/libqscintilla5c2.install
--- qscintilla-1.5.1.old/debian/libqscintilla5c2.install 1970-01-01 01:00:00.000000000 +0100
+++ qscintilla-1.5.1/debian/libqscintilla5c2.install 2005-09-01 01:52:15.000000000 +0200
@@ -0,0 +1,3 @@
+usr/lib/*.so.*
+usr/lib/qt3/plugins/designer/*.so
+usr/share/qt3/translations/*.qm
diff -rNu qscintilla-1.5.1.old/debian/rules qscintilla-1.5.1/debian/rules
--- qscintilla-1.5.1.old/debian/rules 2005-09-01 01:51:41.000000000 +0200
+++ qscintilla-1.5.1/debian/rules 2005-09-01 01:52:15.000000000 +0200
@@ -60,6 +60,7 @@
  -$(MAKE) -C qt clean
  -$(MAKE) -C designer clean
  -find -name 'Makefile' -exec rm {} \;
+ -rm -f qt/Makefile
  -rm -rf tmplib

  dh_clean

--PEIAKu/WMn1b1Hv9--