summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Berres <trigger+debian@space-based.de>2008-12-02 23:55:46 +0000
committerArmin Berres <trigger+debian@space-based.de>2008-12-02 23:55:46 +0000
commit8de46a0dd80b98353360dce038095c1cf0171811 (patch)
treec66e90128d9b824679039e99b920172375eb6324
parente42b3ad887b68e0f0556f8a620042a86c0a2eee1 (diff)
downloadqt4-x11-8de46a0dd80b98353360dce038095c1cf0171811.tar.gz
remove the eclipse integration, it results in FTBFS (thus easily fixable) and library names like this: libQtCoreCppIntegration.soinstead if libQtCore.so
-rw-r--r--debian/changelog19
-rw-r--r--debian/patches/series12
-rwxr-xr-xdebian/rules2
3 files changed, 16 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index 18e805c..9721cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,17 @@
-qt4-x11 (4.4.3-2.1) UNRELEASED; urgency=low
+qt4-x11 (4.4.3-2) UNRELEASED; urgency=low
+++ Changes by Armin Berres:
* Fix offsets in all patches.
-
- +++ Changes by Fathi Boudra:
-
- * Add Qt Eclipse Integration for C++. Configure Qt with
- '-qtnamespace QtCppIntegration -qtlibinfix CppIntegration'
- to create custom designer plugins.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 01 Dec 2008 00:15:06 +0100
+ * Add qt-copy patches:
+ - 0255-qtreeview-selection-columns-hidden.diff
+ - 0256-fix-recursive-backingstore-sync-crash.diff
+ - 0257-qurl-validate-speedup.diff
+ - 0260-fix-qgraphicswidget-deletionclearFocus.diff
+ - 0261-sync-before-reset-errorhandler.patch
+ - 0262-fix-treeview-animation-crash.diff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 03 Dec 2008 00:54:18 +0100
qt4-x11 (4.4.3-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 75efff2..e1b1327 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,12 +14,12 @@
0248-fix-qwidget-scroll-slowness.diff
0249-webkit-stale-frame-pointer.diff
0254-fix-qgraphicsproxywidget-deletion-crash.diff
-#0255-qtreeview-selection-columns-hidden.diff
-#0256-fix-recursive-backingstore-sync-crash.diff
-#0257-qurl-validate-speedup.diff
-#0260-fix-qgraphicswidget-deletionclearFocus.diff
-#0261-sync-before-reset-errorhandler.patch
-#0262-fix-treeview-animation-crash.diff
+0255-qtreeview-selection-columns-hidden.diff
+0256-fix-recursive-backingstore-sync-crash.diff
+0257-qurl-validate-speedup.diff
+0260-fix-qgraphicswidget-deletionclearFocus.diff
+0261-sync-before-reset-errorhandler.patch
+0262-fix-treeview-animation-crash.diff
# debian patches
01_qmake_for_debian.diff
diff --git a/debian/rules b/debian/rules
index 7ab5e64..ec264e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,8 +121,6 @@ endif
-svg \
-webkit \
-xmlpatterns \
- -qtnamespace QtCppIntegration \
- -qtlibinfix CppIntegration \
$(EXTRA_CONFIGURE_OPTS)
clean::