[SCM] qtpim packaging branch, master, updated. 078f0aee378019e70cbeeba1078b86f84bb0b63d
Timo Jyrinki
timo at moszumanska.debian.org
Thu Jul 17 11:08:28 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtpim.git;a=commitdiff;h=097bb3e
The following commit has been merged in the master branch:
commit 097bb3e1bcf619f95b0f97f8fd7ab3b995850c5e
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Thu Jul 17 10:55:30 2014 +0000
Run wrap-and-sort -a -t
---
debian/control | 40 ++++++++++++++++++++++++----------------
debian/qtpim5-dev.install | 8 ++++----
2 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/debian/control b/debian/control
index adf4126..d768d6f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9),
pkg-kde-tools,
qt5-default,
qtbase5-private-dev,
- qtdeclarative5-private-dev
+ qtdeclarative5-private-dev,
Standards-Version: 3.9.4
Homepage: http://qt-project.org/
Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtpim.git
@@ -15,8 +15,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtpim.git;a=summary
Package: libqt5contacts5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt PIM module, Contacts library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -30,8 +31,10 @@ Description: Qt PIM module, Contacts library
Package: qtdeclarative5-qtcontacts-plugin
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5contacts5, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libqt5contacts5,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt PIM module, Contacts library QML plugin
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -45,8 +48,9 @@ Description: Qt PIM module, Contacts library QML plugin
Package: libqt5organizer5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt PIM module, Organizer library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -60,8 +64,10 @@ Description: Qt PIM module, Organizer library
Package: qtdeclarative5-qtorganizer-plugin
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libqt5organizer5, ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libqt5organizer5,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt PIM module, Organizer library QML plugin
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -75,8 +81,9 @@ Description: Qt PIM module, Organizer library QML plugin
Package: libqt5versit5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt PIM module, Versit library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -90,8 +97,9 @@ Description: Qt PIM module, Versit library
Package: libqt5versitorganizer5
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Qt PIM module, Versit Organizer library
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -109,7 +117,7 @@ Depends: libqt5contacts5 (= ${binary:Version}),
libqt5organizer5 (= ${binary:Version}),
libqt5versit5 (= ${binary:Version}),
libqt5versitorganizer5 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
Description: Qt 5 PIM 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.
@@ -128,7 +136,7 @@ Depends: libqt5contacts5 (= ${binary:Version}),
libqt5organizer5 (= ${binary:Version}),
libqt5versit5 (= ${binary:Version}),
libqt5versitorganizer5 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
Description: Qt 5 PIM private 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.
@@ -150,7 +158,7 @@ Depends: libqt5contacts5 (= ${binary:Version}),
libqt5organizer5 (= ${binary:Version}),
libqt5versit5 (= ${binary:Version}),
libqt5versitorganizer5 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
Description: Qt PIM library debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/qtpim5-dev.install b/debian/qtpim5-dev.install
index d9277b7..09987db 100644
--- a/debian/qtpim5-dev.install
+++ b/debian/qtpim5-dev.install
@@ -64,6 +64,7 @@ usr/include/*/qt5/QtContacts/QContactUnionFilter
usr/include/*/qt5/QtContacts/QContactUrl
usr/include/*/qt5/QtContacts/QContactVersion
usr/include/*/qt5/QtContacts/QtContacts
+usr/include/*/qt5/QtContacts/QtContactsDepends
usr/include/*/qt5/QtContacts/QtContactsVersion
usr/include/*/qt5/QtContacts/qcontact.h
usr/include/*/qt5/QtContacts/qcontactabstractrequest.h
@@ -203,6 +204,7 @@ usr/include/*/qt5/QtOrganizer/QOrganizerTodoOccurrence
usr/include/*/qt5/QtOrganizer/QOrganizerTodoProgress
usr/include/*/qt5/QtOrganizer/QOrganizerTodoTime
usr/include/*/qt5/QtOrganizer/QtOrganizer
+usr/include/*/qt5/QtOrganizer/QtOrganizerDepends
usr/include/*/qt5/QtOrganizer/QtOrganizerVersion
usr/include/*/qt5/QtOrganizer/qorganizer.h
usr/include/*/qt5/QtOrganizer/qorganizerabstractrequest.h
@@ -294,6 +296,7 @@ usr/include/*/qt5/QtVersit/QVersitReader
usr/include/*/qt5/QtVersit/QVersitResourceHandler
usr/include/*/qt5/QtVersit/QVersitWriter
usr/include/*/qt5/QtVersit/QtVersit
+usr/include/*/qt5/QtVersit/QtVersitDepends
usr/include/*/qt5/QtVersit/QtVersitVersion
usr/include/*/qt5/QtVersit/qtversitversion.h
usr/include/*/qt5/QtVersit/qversitcontactexporter.h
@@ -313,6 +316,7 @@ usr/include/*/qt5/QtVersitOrganizer/QVersitOrganizerImporter
usr/include/*/qt5/QtVersitOrganizer/QVersitOrganizerImporterPropertyHandler
usr/include/*/qt5/QtVersitOrganizer/QVersitTimeZoneHandler
usr/include/*/qt5/QtVersitOrganizer/QtVersitOrganizer
+usr/include/*/qt5/QtVersitOrganizer/QtVersitOrganizerDepends
usr/include/*/qt5/QtVersitOrganizer/QtVersitOrganizerVersion
usr/include/*/qt5/QtVersitOrganizer/qtversitorganizerversion.h
usr/include/*/qt5/QtVersitOrganizer/qversitorganizerexporter.h
@@ -325,7 +329,3 @@ usr/lib/*/*.so
usr/lib/*/cmake/*
usr/lib/*/pkgconfig/*
usr/lib/*/qt5/mkspecs/modules/*
-usr/include/*/qt5/QtVersitOrganizer/QtVersitOrganizerDepends
-usr/include/*/qt5/QtOrganizer/QtOrganizerDepends
-usr/include/*/qt5/QtVersit/QtVersitDepends
-usr/include/*/qt5/QtContacts/QtContactsDepends
--
qtpim packaging
More information about the pkg-kde-commits
mailing list