[SCM] qtxmlpatterns packaging branch, master, updated. df60f4a7f52905f7f8d3d4b4b2f51a9ad7221cf4
Timo Jyrinki
timo at alioth.debian.org
Tue Dec 18 12:13:36 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=commitdiff;h=df60f4a
The following commit has been merged in the master branch:
commit df60f4a7f52905f7f8d3d4b4b2f51a9ad7221cf4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Tue Dec 18 12:12:00 2012 +0000
Update for rc2
Update *.install, DEP-5:ize copyright, remove .la files, add -qt5
suffix to the binaries (not needed if different binary installation
location and qtchooser will be used).
---
debian/changelog | 2 +-
debian/control | 12 +-
debian/copyright | 162 +++++++++++---------
...-dev.install => libqt5xmlpatterns5-dev.install} | 25 +---
...tall => libqt5xmlpatterns5-private-dev.install} | 0
debian/libqt5xmlpatterns5.install | 1 +
debian/libqtxmlpatterns5.install | 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/rules | 11 ++-
12 files changed, 149 insertions(+), 104 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b2040df..e25d2be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtxmlpatterns-opensource-src (5.0.0~beta1-1) unstable; urgency=low
+qtxmlpatterns-opensource-src (5.0.0~rc2-1) unstable; urgency=low
* Initial release.
diff --git a/debian/control b/debian/control
index e56b2bc..577abed 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ 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
-Package: libqtxmlpatterns5
+Package: libqt5xmlpatterns5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -27,10 +27,10 @@ Description: Qt 5 XML patterns module
.
QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
-Package: libqtxmlpatterns5-dev
+Package: libqt5xmlpatterns5-dev
Section: libdevel
Architecture: any
-Depends: libqtxmlpatterns5 (= ${binary:Version}), ${misc: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
is its rich set of widgets that provide standard GUI functionality.
@@ -38,10 +38,10 @@ Description: Qt 5 XML patterns development files
This package contains the header development files used for building Qt 5
applications using QtXmlPatterns library.
-Package: libqtxmlpatterns5-private-dev
+Package: libqt5xmlpatterns5-private-dev
Architecture: any
Section: libdevel
-Depends: libqtxmlpatterns5-dev (= ${binary:Version}),
+Depends: libqt5xmlpatterns5-dev (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Qt 5 XML patterns private development files
@@ -79,7 +79,7 @@ Package: qtxmlpatterns5-dbg
Priority: extra
Architecture: any
Section: debug
-Depends: libqtxmlpatterns5 (= ${binary:Version}),
+Depends: libqt5xmlpatterns5 (= ${binary:Version}),
qtxmlpatterns5-dev-tools (= ${binary:Version}),
qtxmlpatterns5-examples (= ${binary:Version}),
${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index d6fb878..f60d376 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: qtxmlpatterns-opensource-src
-Source: http://releases.qt-project.org/qt5.0/beta1/split_sources/
+Source: http://origin.releases.qt-project.org/qt5.0/rc2/submodules_tar/
Files: *
Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
1994-2008 Trolltech ASA.
-License: LGPL-2.1, GPL-3
+License: LGPL-2.1 with Nokia Qt LGPL exception or GPL-3
Files: debian/*
Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -13,86 +13,104 @@ 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>
License: LGPL-2.1
-License:
-
- GNU Lesser General Public License Usage
-
- Alternatively, this file may be used under the terms of the GNU Lesser
- General Public License version 2.1 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPL included in the
- packaging of this file. Please review the following information to
- ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-
- In addition, as a special exception, Nokia gives you certain
- additional rights. These rights are described in the Nokia Qt LGPL
- Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
- package.
-
- GNU General Public License Usage
-
- Alternatively, this file may be used under the terms of the GNU
- General Public License version 3.0 as published by the Free Software
- Foundation and appearing in the file LICENSE.GPL included in the
- packaging of this file. Please review the following information to
- ensure the GNU General Public License version 3.0 requirements will be
- met: http://www.gnu.org/copyleft/gpl.html.
-
-On Debian systems, the complete text of the GNU Public Licenses can be found in
+License: LGPL-2.1 with Nokia Qt LGPL exception
+ GNU Lesser General Public License Usage
+ .
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ In addition, as a special exception, Nokia gives you certain
+ additional rights. These rights are described in the Nokia Qt LGPL
+ Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+ package.
+ .
+ On Debian systems, the complete text of the LGPL-2.1 license can be found in
`/usr/share/common-licenses/LGPL-2.1`,
- `/usr/share/common-licenses/GPL-3`.
-
-Nokia Qt LGPL Exception version 1.1
-
-As an additional permission to the GNU Lesser General Public License version
-2.1, the object code form of a "work that uses the Library" may incorporate
-material from a header file that is part of the Library. You may distribute
-such object code under terms of your choice, provided that:
+ .
+ Nokia Qt LGPL Exception version 1.1
+ .
+ As an additional permission to the GNU Lesser General Public License version
+ 2.1, the object code form of a "work that uses the Library" may incorporate
+ material from a header file that is part of the Library. You may distribute
+ such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
+ .
+ Moreover, you may apply this exception to a modified version of the Library,
+ provided that such modification does not involve copying material from the
+ Library into the modified Library's header files unless such material is
+ limited to (i) numerical parameters; (ii) data structure layouts;
+ (iii) accessors; and (iv) small macros, templates and inline functions of
+ five lines or less in length.
+ .
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.
+
+License: GPL-3
+ GNU General Public License Usage
+ .
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ On Debian systems, the complete text of the license can be found in
+ `/usr/share/common-licenses/GPL-3`.
-Moreover, you may apply this exception to a modified version of the Library,
-provided that such modification does not involve copying material from the
-Library into the modified Library's header files unless such material is
-limited to (i) numerical parameters; (ii) data structure layouts;
-(iii) accessors; and (iv) small macros, templates and inline functions of
-five lines or less in length.
-
-Furthermore, you are not required to apply this additional permission to a
-modified version of the Library.
-
-Copyright for examples/*:
+License: LGPL-2.1
+ This file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file. Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ On Debian systems, the complete text of the LGPL-2.1 license can be found in
+ `/usr/share/common-licenses/LGPL-2.1`,
- You may use this file under the terms of the BSD license as follows:
- "Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
- the names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
+Files: examples/*
+Copyright: 2008-2012 Nokia Corporation and/or its subsidiary(-ies).
+ 1994-2008 Trolltech ASA.
+License: BSD
+ You may use this file under the terms of the BSD license as follows:
+ .
+ "Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+ the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
diff --git a/debian/libqtxmlpatterns5-dev.install b/debian/libqt5xmlpatterns5-dev.install
similarity index 68%
rename from debian/libqtxmlpatterns5-dev.install
rename to debian/libqt5xmlpatterns5-dev.install
index 8dc5432..058d513 100644
--- a/debian/libqtxmlpatterns5-dev.install
+++ b/debian/libqt5xmlpatterns5-dev.install
@@ -1,20 +1,3 @@
-usr/include/qt5/Qt/QtXmlPatterns
-usr/include/qt5/Qt/qabstractmessagehandler.h
-usr/include/qt5/Qt/qabstracturiresolver.h
-usr/include/qt5/Qt/qabstractxmlnodemodel.h
-usr/include/qt5/Qt/qabstractxmlreceiver.h
-usr/include/qt5/Qt/qsimplexmlnodemodel.h
-usr/include/qt5/Qt/qsourcelocation.h
-usr/include/qt5/Qt/qtxmlpatternsglobal.h
-usr/include/qt5/Qt/qtxmlpatternsversion.h
-usr/include/qt5/Qt/qxmlformatter.h
-usr/include/qt5/Qt/qxmlname.h
-usr/include/qt5/Qt/qxmlnamepool.h
-usr/include/qt5/Qt/qxmlquery.h
-usr/include/qt5/Qt/qxmlresultitems.h
-usr/include/qt5/Qt/qxmlschema.h
-usr/include/qt5/Qt/qxmlschemavalidator.h
-usr/include/qt5/Qt/qxmlserializer.h
usr/include/qt5/QtXmlPatterns/QAbstractMessageHandler
usr/include/qt5/QtXmlPatterns/QAbstractUriResolver
usr/include/qt5/QtXmlPatterns/QAbstractXmlNodeModel
@@ -51,7 +34,7 @@ usr/include/qt5/QtXmlPatterns/qxmlschemavalidator.h
usr/include/qt5/QtXmlPatterns/qxmlserializer.h
usr/lib/*/cmake/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake
usr/lib/*/cmake/Qt5XmlPatterns/Qt5XmlPatternsConfigVersion.cmake
-usr/lib/*/libQtXmlPatterns.prl
-usr/lib/*/libQtXmlPatterns.so
-usr/lib/*/pkgconfig/QtXmlPatterns.pc
-usr/share/qt5/mkspecs/modules/qt_xmlpatterns.pri
+usr/lib/*/libQt5XmlPatterns.prl
+usr/lib/*/libQt5XmlPatterns.so
+usr/lib/*/pkgconfig/Qt5XmlPatterns.pc
+usr/share/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri
diff --git a/debian/libqtxmlpatterns5-private-dev.install b/debian/libqt5xmlpatterns5-private-dev.install
similarity index 100%
rename from debian/libqtxmlpatterns5-private-dev.install
rename to debian/libqt5xmlpatterns5-private-dev.install
diff --git a/debian/libqt5xmlpatterns5.install b/debian/libqt5xmlpatterns5.install
new file mode 100644
index 0000000..8012aff
--- /dev/null
+++ b/debian/libqt5xmlpatterns5.install
@@ -0,0 +1 @@
+usr/lib/*/libQt5XmlPatterns.so.*
diff --git a/debian/libqtxmlpatterns5.install b/debian/libqtxmlpatterns5.install
deleted file mode 100644
index 5b59b87..0000000
--- a/debian/libqtxmlpatterns5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQtXmlPatterns.so.*
diff --git a/debian/patches/01_append_qt5_suffix.diff b/debian/patches/01_append_qt5_suffix.diff
new file mode 100644
index 0000000..4f862b7
--- /dev/null
+++ b/debian/patches/01_append_qt5_suffix.diff
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 0000000..db57175
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_append_qt5_suffix.diff
diff --git a/debian/qtxmlpatterns5-dev-tools.install b/debian/qtxmlpatterns5-dev-tools.install
index 724f9d8..8771c9a 100644
--- a/debian/qtxmlpatterns5-dev-tools.install
+++ b/debian/qtxmlpatterns5-dev-tools.install
@@ -1,2 +1,2 @@
-usr/bin/xmlpatterns
-usr/bin/xmlpatternsvalidator
+usr/bin/xmlpatterns-qt5
+usr/bin/xmlpatternsvalidator-qt5
diff --git a/debian/qtxmlpatterns5-dev-tools.postinst b/debian/qtxmlpatterns5-dev-tools.postinst
new file mode 100644
index 0000000..e61cc4a
--- /dev/null
+++ b/debian/qtxmlpatterns5-dev-tools.postinst
@@ -0,0 +1,16 @@
+#!/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/rules b/debian/rules
index 25b239d..f5967ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,16 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
%:
dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtxmlpatterns5-dbg
+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