[SCM] qtxmlpatterns packaging branch, master, updated. 5ae5995900b44889d7d02c12f38eb8a79dbd78da
Timo Jyrinki
timo at alioth.debian.org
Tue Jan 8 12:35:52 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=commitdiff;h=5ae5995
The following commit has been merged in the master branch:
commit 5ae5995900b44889d7d02c12f38eb8a79dbd78da
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Jan 8 12:35:05 2013 +0000
Updates for final release
---
debian/changelog | 2 +-
debian/control | 12 +++++++++---
debian/copyright | 4 ++--
debian/not-installed | 1 +
debian/patches/01_append_qt5_suffix.diff | 18 ------------------
debian/patches/series | 1 -
debian/qtxmlpatterns5-dev-tools.install | 4 ++--
debian/qtxmlpatterns5-dev-tools.postinst | 16 ----------------
debian/qtxmlpatterns5-examples.install | 2 +-
debian/rules | 8 --------
10 files changed, 16 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e25d2be..68b3273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtxmlpatterns-opensource-src (5.0.0~rc2-1) unstable; urgency=low
+qtxmlpatterns-opensource-src (5.0.0-1) unstable; urgency=low
* Initial release.
diff --git a/debian/control b/debian/control
index 577abed..3d2ed30 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,14 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
Modestas Vainius <modax at debian.org>,
Sune Vuorela <debian at pusling.com>,
Pino Toscano <pino at debian.org>,
- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Timo Jyrinki <timo at debian.org>
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
pkg-kde-tools,
+ qt5-default,
qtbase5-private-dev (>= 5)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://qt-project.org/
Vcs-Git: git://git.debian.org/pkg-kde/qt/qtxmlpatterns.git
Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=summary
@@ -19,7 +21,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=summary
Package: libqt5xmlpatterns5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 5 XML patterns module
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -30,6 +32,7 @@ Description: Qt 5 XML patterns module
Package: libqt5xmlpatterns5-dev
Section: libdevel
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: libqt5xmlpatterns5 (= ${binary:Version}), ${misc:Depends}
Description: Qt 5 XML patterns development files
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -41,6 +44,7 @@ Description: Qt 5 XML patterns development files
Package: libqt5xmlpatterns5-private-dev
Architecture: any
Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: libqt5xmlpatterns5-dev (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@ -57,6 +61,7 @@ Package: qtxmlpatterns5-dev-tools
Architecture: any
Multi-Arch: foreign
Section: devel
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 5 XML patterns development programs
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -68,6 +73,7 @@ Description: Qt 5 XML patterns development programs
Package: qtxmlpatterns5-examples
Architecture: any
Section: x11
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 5 XML patterns examples
Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/copyright b/debian/copyright
index f60d376..e95c321 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: qtxmlpatterns-opensource-src
-Source: http://origin.releases.qt-project.org/qt5.0/rc2/submodules_tar/
+Source: http://releases.qt-project.org/qt5/5.0.0/submodules_tar/
Files: *
Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
@@ -13,7 +13,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
2008-2012 Modestas Vainius <modax at debian.org>
2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
2005-2007 Brian Nelson <pyro at debian.org>
- 2012 Timo Jyrinki <timo at debian.org>
+ 2012 Timo Jyrinki <timo.jyrinki at canonical.com>
License: LGPL-2.1
License: LGPL-2.1 with Nokia Qt LGPL exception
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..fab350c
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libQt5XmlPatterns.la
diff --git a/debian/patches/01_append_qt5_suffix.diff b/debian/patches/01_append_qt5_suffix.diff
deleted file mode 100644
index 4f862b7..0000000
--- a/debian/patches/01_append_qt5_suffix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/xmlpatterns/xmlpatterns.pro 2012-11-10 19:03:24.000000000 +0000
-+++ b/tools/xmlpatterns/xmlpatterns.pro 2012-12-05 05:29:25.372327814 +0000
-@@ -1,5 +1,5 @@
- TEMPLATE = app
--TARGET = xmlpatterns
-+TARGET = xmlpatterns-qt5
- QT -= gui
- QT += xmlpatterns-private
-
---- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro 2012-11-10 19:03:24.000000000 +0000
-+++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro 2012-12-05 05:29:15.340327499 +0000
-@@ -1,5 +1,5 @@
- TEMPLATE = app
--TARGET = xmlpatternsvalidator
-+TARGET = xmlpatternsvalidator-qt5
- QT -= gui
- QT += xmlpatterns
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index db57175..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_append_qt5_suffix.diff
diff --git a/debian/qtxmlpatterns5-dev-tools.install b/debian/qtxmlpatterns5-dev-tools.install
index 8771c9a..269e52c 100644
--- a/debian/qtxmlpatterns5-dev-tools.install
+++ b/debian/qtxmlpatterns5-dev-tools.install
@@ -1,2 +1,2 @@
-usr/bin/xmlpatterns-qt5
-usr/bin/xmlpatternsvalidator-qt5
+usr/lib/*/qt5/bin/xmlpatterns
+usr/lib/*/qt5/bin/xmlpatternsvalidator
diff --git a/debian/qtxmlpatterns5-dev-tools.postinst b/debian/qtxmlpatterns5-dev-tools.postinst
deleted file mode 100644
index e61cc4a..0000000
--- a/debian/qtxmlpatterns5-dev-tools.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/xmlpatterns xmlpatterns "/usr/bin/xmlpatterns-qt5" "40" \
- --slave /usr/share/man/man1/xmlpatterns.1.gz xmlpatterns.1.gz \
- "/usr/share/man/man1/xmlpatterns-qt5.1.gz"
-
-update-alternatives --install \
- /usr/bin/xmlpatternsvalidator xmlpatternsvalidator "/usr/bin/xmlpatternsvalidator-qt5" "40" \
- --slave /usr/share/man/man1/xmlpatternsvalidator.1.gz xmlpatternsvalidator.1.gz \
- "/usr/share/man/man1/xmlpatternsvalidator-qt5.1.gz"
-
-#DEBHELPER#
-
diff --git a/debian/qtxmlpatterns5-examples.install b/debian/qtxmlpatterns5-examples.install
index 7d75ff6..f281302 100644
--- a/debian/qtxmlpatterns5-examples.install
+++ b/debian/qtxmlpatterns5-examples.install
@@ -1 +1 @@
-usr/lib/qt5/examples
+usr/lib/*/qt5/examples
diff --git a/debian/rules b/debian/rules
index f5967ea..c6c2789 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,5 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
override_dh_auto_configure:
qmake
-override_dh_auto_install:
- make install INSTALL_ROOT=$(CURDIR)/debian/tmp
-
- # Remove la files (http://wiki.debian.org/ReleaseGoals/LAFileRemoval)
- rm -f debian/tmp/usr/lib/*/libQt5XmlPatterns.la
-
override_dh_builddeb:
dh_builddeb -- -Zxz
-
-override_dh_auto_test:
--
qtxmlpatterns packaging
More information about the pkg-kde-commits
mailing list