[Pkg-kde-commits] rev 1763 - in people/chrsmrtn/qt-x11-free/debian:
. patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Sat Sep 10 23:44:20 UTC 2005
Author: chrsmrtn-guest
Date: 2005-09-10 23:44:18 +0000 (Sat, 10 Sep 2005)
New Revision: 1763
Removed:
people/chrsmrtn/qt-x11-free/debian/patches/07_gcc4_workarounds_fixes_postscript.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch
Modified:
people/chrsmrtn/qt-x11-free/debian/changelog
people/chrsmrtn/qt-x11-free/debian/control
people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links
people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links
people/chrsmrtn/qt-x11-free/debian/patches/00list
people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
people/chrsmrtn/qt-x11-free/debian/rules
Log:
Sync people/chrsmrtn with trunk.
Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/changelog 2005-09-10 23:44:18 UTC (rev 1763)
@@ -1,15 +1,22 @@
-qt-x11-free (3:3.3.4-9) unstable; urgency=low
+qt-x11-free (3:3.3.5-1) unstable; urgency=low
+ * New upstream release. Drop patches merged upstream, and sync those that
+ remain.
+
+++ Changes by Christopher Martin:
- * Add qt3-doc versioned Replaces for qt3-designer and qt3-linguist, since
- the last upload centralized documentation in qt3-doc. (Closes: #327291)
+ * Move documention from qt3-doc back to qt3-designer and qt3-linguist, since
+ the last upload centralized it all in qt3-doc. The reason for this
+ inadvertent change was a years-old bug (just now noticed and fixed) in
+ debian/rules, wherein portions of it would fail if sh where something
+ other than bash. Add all the appropriate Replaces to cope with these
+ moves. (Closes: #327291)
+ * Revert the versioning of our build-depends on libpq-dev, since the fixed
+ package has now built on all architectures.
+
* Re-enable InterBase support. [!!! Not yet ready !!!]
- * Revert the versioning of our build-depends on libpq-dev, since the fixed
- package has now built on all architectures. [!!! Not yet ready !!!]
-
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 9 Sep 2005 08:35:43 -0400
qt-x11-free (3:3.3.4-8) unstable; urgency=low
Modified: people/chrsmrtn/qt-x11-free/debian/control
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/control 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/control 2005-09-10 23:44:18 UTC (rev 1763)
@@ -1,7 +1,7 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>
-Build-Depends: debhelper (>= 4.1.26), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev (>= 8.0.3-15), libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite0-dev
+Build-Depends: debhelper (>= 4.1.26), xlibs-static-dev (>= 4.3.0.dfsg.1-4), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxkbfile-dev, libxi-dev, libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfreetype6-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient12-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, dpatch (>= 1.13), libsqlite0-dev
Section: libs
Priority: optional
Standards-Version: 3.6.2
@@ -145,7 +145,7 @@
Section: devel
Depends: ${shlibs:Depends}
Recommends: qt3-dev-tools
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<< 3:3.3.5-1)
Suggests: qt3-assistant, qt3-doc
Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
Description: Qt3 Designer
@@ -177,7 +177,7 @@
Section: devel
Suggests: qt3-assistant
Depends: ${shlibs:Depends}
-Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev
+Replaces: qt3-tools, libqt3-dev, libqt3-mt-dev, qt3-doc (<< 3:3.3.5-1)
Description: The Qt3 Linguist
This package contains the Qt3 Linguist which provides translators a
tool perfect for translating any Qt-based application into other
Modified: people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt-dev.links 2005-09-10 23:44:18 UTC (rev 1763)
@@ -1,6 +1,6 @@
/usr/lib/libqui.prl /usr/share/qt3/lib/libqui.prl
/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so
/usr/lib/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl
-/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so
+/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so
/usr/include/qt3 /usr/share/qt3/include
/usr/lib/qt3/plugins /usr/share/qt3/plugins
Modified: people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt.links 2005-09-10 23:44:18 UTC (rev 1763)
@@ -1,5 +1,5 @@
/usr/lib/libqui.so.1.0.0 /usr/lib/libqui.so.1
/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
-/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so.3
-/usr/lib/libqt-mt.so.3.3.4 /usr/share/qt3/lib/libqt-mt.so.3.3
+/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so.3.3
Modified: people/chrsmrtn/qt-x11-free/debian/patches/00list
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/00list 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/patches/00list 2005-09-10 23:44:18 UTC (rev 1763)
@@ -3,7 +3,6 @@
04_qsql_odbc
05_qvfb_cpp
06_disable_rpath
-07_gcc4_workarounds_fixes_postscript
08_thread_default
09_amd64_lib64
10_arm_gcc4
@@ -22,10 +21,8 @@
30_qtc_qtoolbar_77047
31_gcc4_buildkey
32_gtkstyle
-33_qtc_qlistbox-crash
34_qtc_dnd_optimization
35_qtc_dnd_active_window_fix
-36_qtc_dnd-timestamp-fix
37_qtc_dragobject-dont-prefer-unknown
38_qtc_khotkeys_input_84434
39_qtc_qpopup_has_mouse
Modified: people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch 2005-09-10 23:44:18 UTC (rev 1763)
@@ -77,15 +77,3 @@
}
}
-diff -ruN qt-x11-free-3.3.3.old/src/sql/drivers/odbc/qsql_odbc.cpp qt-x11-free-3.3.3/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.3.old/src/sql/drivers/odbc/qsql_odbc.cpp 2004-05-27 15:43:13.000000000 +0000
-+++ qt-x11-free-3.3.3/src/sql/drivers/odbc/qsql_odbc.cpp 2004-10-31 09:35:06.000000000 +0000
-@@ -57,7 +57,7 @@
- # define QSQLLEN SQLINTEGER
- # define QSQLULEN SQLUINTEGER
- #else
--# ifndef Q_OS_WIN64
-+# if 0
- # define SQLLEN SQLINTEGER
- # define SQLULEN SQLUINTEGER
- # endif
Deleted: people/chrsmrtn/qt-x11-free/debian/patches/07_gcc4_workarounds_fixes_postscript.dpatch
Modified: people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch 2005-09-10 23:44:18 UTC (rev 1763)
@@ -23,15 +23,6 @@
diff -u -3 -p -r1.65 qscrollview.cpp
--- bla/src/widgets/qscrollview.cpp 29 Apr 2004 22:31:28 -0000 1.65
+++ bla/src/widgets/qscrollview.cpp 25 Jan 2005 12:07:04 -0000
-@@ -1180,7 +1180,7 @@ void QScrollView::mouseMoveEvent( QMous
- void QScrollView::wheelEvent( QWheelEvent *e )
- {
- QWheelEvent ce( viewport()->mapFromGlobal( e->globalPos() ),
-- e->globalPos(), e->delta(), e->state());
-+ e->globalPos(), e->delta(), e->state(), e->orientation() );
- viewportWheelEvent(&ce);
- if ( !ce.isAccepted() ) {
- if ( e->orientation() == Horizontal && horizontalScrollBar() )
@@ -1863,7 +1863,7 @@ void QScrollView::viewportWheelEvent( QW
the event itself.
*/
Modified: people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch 2005-09-10 23:44:18 UTC (rev 1763)
@@ -21,13 +21,12 @@
@DPATCH@
--- qt.orig/configure
+++ qt.patched/configure
-@@ -3092,6 +3092,9 @@
- *3.*)
+@@ -3031,7 +3031,7 @@
COMPILER_VERSION="3.*"
;;
-+ *4.*)
-+ COMPILER_VERSION="4.*"
-+ ;;
+ *4.*)
+- COMPILER_VERSION="4"
++ COMPILER_VERSION="4.*"
+ ;;
*)
;;
- esac
Deleted: people/chrsmrtn/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch
Deleted: people/chrsmrtn/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch
Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules 2005-09-10 23:43:50 UTC (rev 1762)
+++ people/chrsmrtn/qt-x11-free/debian/rules 2005-09-10 23:44:18 UTC (rev 1763)
@@ -206,7 +206,7 @@
## build designer package documentation
# qt3-designer
install -d `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/
- for a in `cat doc/html/designer*.{html,dcf} | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+ for a in `cat doc/html/designer*.html doc/html/designer*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/ && \
rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
@@ -216,7 +216,7 @@
## build linguist package documentation
# qt3-linguist
install -d `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/
- for a in `cat doc/html/linguist*.{html,dcf} | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
+ for a in `cat doc/html/linguist*.html doc/html/linguist*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/ && \
rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
@@ -242,7 +242,7 @@
dh_testroot
dh_installdocs -i -XREADME.Debian
- dh_installchangelogs -i changes-3.3.4
+ dh_installchangelogs -i changes-3.3.5
find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
@@ -266,7 +266,8 @@
rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/qmake*
# create examples package
- install -d `pwd`/debian/doc/qt3-examples/tools/{designer,linguist}
+ install -d `pwd`/debian/doc/qt3-examples/tools/designer
+ install -d `pwd`/debian/doc/qt3-examples/tools/linguist
cp -ax examples `pwd`/debian/doc/qt3-examples
cp -ax tutorial `pwd`/debian/doc/qt3-examples
cp -ax tools/designer/examples `pwd`/debian/doc/qt3-examples/tools/designer/
@@ -427,7 +428,7 @@
dh_installdocs -a $(IBASE) -XREADME.Debian
dh_installmenu -a $(IBASE)
- dh_installchangelogs -a $(IBASE) changes-3.3.4
+ dh_installchangelogs -a $(IBASE) changes-3.3.5
dh_link -a $(IBASE)
dh_strip -a $(IBASE) --dbg-package=libqt3-mt
More information about the pkg-kde-commits
mailing list