rev 9356 - trunk/packages/qt-x11-free/debian
Fathi Boudra
fabo at alioth.debian.org
Sat Feb 9 10:25:28 UTC 2008
Author: fabo
Date: 2008-02-09 10:25:28 +0000 (Sat, 09 Feb 2008)
New Revision: 9356
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/compat
trunk/packages/qt-x11-free/debian/control
trunk/packages/qt-x11-free/debian/copyright
trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links
trunk/packages/qt-x11-free/debian/libqt3-mt.links
trunk/packages/qt-x11-free/debian/rules
Log:
Start Qt3.3.8b updates.
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/changelog 2008-02-09 10:25:28 UTC (rev 9356)
@@ -1,10 +1,37 @@
-qt-x11-free (3:3.3.7-10) UNRELEASED; urgency=low
+qt-x11-free (3:3.3.8b-1) unstable; urgency=low
- * Fix qt3config.desktop and add semicolon at the end of the MimeType key.
- Thanks to Pino Toscano.
+ * New upstream release:
+ * This version adds the GNU Public License version 3 as a
+ possible choice for licenses to the Open Source releases of Qt 3.
+ * It includes the patch for CVE-2007-3388, a potential vulnerability in
+ QTextEdit, which might cause remote execution when parsing maliciously
+ crafted text from an unknown source.
- -- Fathi Boudra <fabo at debian.org> Thu, 01 Nov 2007 22:24:52 +0100
+ * Fix desktop files:
+ * Add semicolon at the end of the MimeType key. Thanks to Pino Toscano.
+ * Remove deprecated MapNotify key.
+ * Bump compat/debhelper to 6.
+ * Add myself in Uploaders field.
+ * Switch to quilt patch system.
+ * Add Homepage, Vcs-Browser and Vcs-Svn fields.
+ * Update copyright file. Add the GNU GPL 3 as a possible choice of licenses.
+ (Closes: #464613)
+ * Update libqt3-mt* links.
+ * Update rules: install upstream changelog changes-3.3.8 and changes-3.3.8b.
+ * Refresh patches. (Closes: #441580)
+ * Remove patches:
+ * 30_qtc_arabic_font_fixes.dpatch
+ * 49_immodule_inputcontext_fix.dpatch
+ * 62_bengali_charfix.dpatch
+ * 64_utf8-parsing-vulnerability.dpatch
+ * 69_CVE-2007-3388.dpatch
+ * Add patches:
+ * lubos lunak xinerama patch. It adds _net_wm_full_placement support.
+ * xinerama dialog placement fix.
+ * Use qt-copy patches original name. Don't use "xx_qtc_patch_name" scheme.
+ -- Fathi Boudra <fabo at debian.org> Fri, 08 Feb 2008 11:01:58 +0100
+
qt-x11-free (3:3.3.7-9) unstable; urgency=low
* Trust dpkg-architecture better than uname -m for the build key. Make
Modified: trunk/packages/qt-x11-free/debian/compat
===================================================================
--- trunk/packages/qt-x11-free/debian/compat 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/compat 2008-02-09 10:25:28 UTC (rev 9356)
@@ -1 +1 @@
-5
+6
Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/control 2008-02-09 10:25:28 UTC (rev 9356)
@@ -1,10 +1,13 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-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, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>
+Build-Depends: debhelper (>= 5.0.31), quilt, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-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, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
Section: libs
Priority: optional
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://trolltech.com
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/qt-x11-free
+Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/qt-x11-free
Package: libqt3-mt
Architecture: any
Modified: trunk/packages/qt-x11-free/debian/copyright
===================================================================
--- trunk/packages/qt-x11-free/debian/copyright 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/copyright 2008-02-09 10:25:28 UTC (rev 9356)
@@ -17,12 +17,23 @@
This packaged is maintained inside the Debian Qt/KDE Maintainers Team
<debian-qt-kde at lists.debian.org> since Tue, 26 Jul 2005 19:06:03 +0200
-Qt 3.3 is dual licensed under the QPL and the GPL
+Qt 3.3 is triple licensed under the QPL, GPL 2 and GPL 3.
It was downloaded from ftp://ftp.troll.no/qt/source
-Please refer to /usr/share/common-licenses/GPL for complete GPL license.
+ This file may be used under the terms of the GNU General
+ Public License versions 2.0 or 3.0 as published by the Free
+ Software Foundation and appearing in the files LICENSE.GPL2
+ and LICENSE.GPL3 included in the packaging of this file.
+ Alternatively you may (at your option) use any later version
+ of the GNU General Public License if such license has been
+ publicly approved by Trolltech ASA (or its successors, if any)
+ and the KDE Free Qt Foundation.
+Please refer to /usr/share/common-licenses/GPL-2 for complete GPL 2
+licence and /usr/share/common-licenses/GPL-3 for complete GPL 3
+licence.
+
THE Q PUBLIC LICENSE
version 1.0
Modified: trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links 2008-02-09 10:25:28 UTC (rev 9356)
@@ -2,6 +2,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.7 /usr/share/qt3/lib/libqt-mt.so
+/usr/lib/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so
/usr/include/qt3 /usr/share/qt3/include
/usr/lib/qt3/plugins /usr/share/qt3/plugins
Modified: trunk/packages/qt-x11-free/debian/libqt3-mt.links
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3-mt.links 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt.links 2008-02-09 10:25:28 UTC (rev 9356)
@@ -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.7 /usr/share/qt3/lib/libqt-mt.so.3
-/usr/lib/libqt-mt.so.3.3.7 /usr/share/qt3/lib/libqt-mt.so.3.3
+/usr/lib/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3.3
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2008-02-09 05:49:44 UTC (rev 9355)
+++ trunk/packages/qt-x11-free/debian/rules 2008-02-09 10:25:28 UTC (rev 9356)
@@ -20,8 +20,8 @@
PLATFORM_ARG = linux-g++
endif
-# dpatch stuff
-include /usr/share/dpatch/dpatch.make
+# quilt stuff
+include /usr/share/quilt/quilt.make
# build variables (directorys)
DEBIAN = $(shell pwd)/debian
@@ -110,7 +110,7 @@
CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
-build: patch libqt-thread-stamp
+build: $(QUILT_STAMPFN) libqt-thread-stamp
touch build-stamp
@@ -263,7 +263,8 @@
dh_testroot
dh_installdocs -i -XREADME.Debian
- dh_installchangelogs -i changes-3.3.7
+ dh_installchangelogs -i changes-3.3.8
+ dh_installchangelogs -i changes-3.3.8b
find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
@@ -449,7 +450,8 @@
dh_installdocs -a $(IBASE) -XREADME.Debian
dh_installmenu -a $(IBASE)
- dh_installchangelogs -a $(IBASE) changes-3.3.7
+ dh_installchangelogs -a $(IBASE) changes-3.3.8
+ dh_installchangelogs -a $(IBASE) changes-3.3.8b
dh_link -a $(IBASE)
dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
@@ -461,7 +463,7 @@
dh_installdeb -a $(IBASE)
dh_perl -a $(IBASE)
dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3-mt/usr/lib
-
+
# fix shlibdeps madness
for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done
More information about the pkg-kde-commits
mailing list