[SCM] qapt packaging branch, experimental, updated. debian/1.4.0-1-68-g36e138e
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Feb 14 08:41:12 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=2b52637
The following commit has been merged in the experimental branch:
commit 2b5263772e1953f0430f763eac20886ca96b154a
Merge: 8761eb3fa4d4949497cf47ed0bc38610ee10f167 92beaf8a9e80b41af50b490e9a70ae711489592e
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri Feb 13 21:41:03 2015 +0100
Merge remote-tracking branch 'origin/kubuntu_vivid_archive' into experimental
Conflicts:
CMakeLists.txt
ChangeLog
debian/changelog
debian/control
debian/copyright
debian/gstreamer-qapt.postinst
debian/gstreamer-qapt.prerm
debian/gstreamer0.10-qapt.postinst
debian/gstreamer0.10-qapt.prerm
debian/gstreamer1.0-qapt.install
debian/gstreamer1.0-qapt.postinst
debian/gstreamer1.0-qapt.prerm
debian/libqapt-dev.install
debian/libqapt-runtime.lintian-overrides
debian/libqapt1.symbols
debian/libqapt2-runtime.lintian-overrides
debian/libqapt3-runtime.lintian-overrides
debian/patches/series
debian/plasma-runner-installer.install
debian/qapt-batch.install
debian/qapt-deb-installer.install
debian/watch
po/CMakeLists.txt
po/bs/qapt-gst-helper.po
po/ca/qapt-gst-helper.po
po/cs/qapt-deb-installer.po
po/cs/qapt-gst-helper.po
po/cs/qaptbatch.po
po/da/qapt-gst-helper.po
po/de/plasma-runner-installer.po
po/de/qapt-gst-helper.po
po/de/qaptbatch.po
po/el/qapt-deb-installer.po
po/el/qapt-gst-helper.po
po/en_GB/qapt-gst-helper.po
po/es/qapt-gst-helper.po
po/et/qapt-deb-installer.po
po/et/qapt-gst-helper.po
po/fi/plasma-runner-installer.po
po/fi/qapt-deb-installer.po
po/fi/qapt-gst-helper.po
po/fi/qaptbatch.po
po/fr/qapt-deb-installer.po
po/fr/qapt-gst-helper.po
po/fr/qaptbatch.po
po/ga/qapt-deb-installer.po
po/ga/qapt-gst-helper.po
po/ga/qaptbatch.po
po/hu/qapt-gst-helper.po
po/it/qapt-gst-helper.po
po/ja/qapt-gst-helper.po
po/kk/plasma-runner-installer.po
po/kk/qapt-deb-installer.po
po/kk/qapt-gst-helper.po
po/kk/qaptbatch.po
po/lt/qapt-gst-helper.po
po/nb/qapt-deb-installer.po
po/nb/qapt-gst-helper.po
po/nb/qaptbatch.po
po/nds/qapt-gst-helper.po
po/nl/qapt-gst-helper.po
po/pl/qapt-deb-installer.po
po/pl/qapt-gst-helper.po
po/pt/qapt-gst-helper.po
po/pt_BR/qapt-deb-installer.po
po/pt_BR/qapt-gst-helper.po
po/pt_BR/qaptbatch.po
po/ru/qapt-gst-helper.po
po/sk/qapt-gst-helper.po
po/sr/qapt-deb-installer.po
po/sr/qapt-gst-helper.po
po/sr at ijekavian/qapt-deb-installer.po
po/sr at ijekavian/qapt-gst-helper.po
po/sr at ijekavianlatin/qapt-deb-installer.po
po/sr at ijekavianlatin/qapt-gst-helper.po
po/sr at latin/qapt-deb-installer.po
po/sr at latin/qapt-gst-helper.po
po/sv/qapt-gst-helper.po
po/ug/qapt-gst-helper.po
po/uk/qapt-gst-helper.po
po/zh_CN/qapt-gst-helper.po
po/zh_TW/qapt-gst-helper.po
src/backend.cpp
src/backend.h
src/cache.cpp
src/config.cpp
src/config.h
src/debfile.cpp
src/globals.h
src/history.cpp
src/history.h
src/package.cpp
src/package.h
src/worker/worker.cpp
src/worker/worker.h
src/worker/workeracquire.cpp
src/worker/workeracquire.h
src/worker/workerinstallprogress.cpp
utils/plasma-runner-installer/plasma-runner-installer.desktop
utils/qapt-batch/main.cpp
utils/qapt-deb-installer/CMakeLists.txt
utils/qapt-deb-installer/ChangesDialog.h
utils/qapt-deb-installer/DebInstaller.cpp
utils/qapt-deb-installer/DebInstaller.h
utils/qapt-deb-installer/DebViewer.cpp
utils/qapt-deb-installer/DebViewer.h
utils/qapt-deb-installer/main.cpp
utils/qapt-deb-installer/qapt-deb-installer.desktop
utils/qapt-deb-thumbnailer/debthumbnailer.desktop
utils/qapt-gst-helper/GstMatcher.cpp
utils/qapt-gst-helper/PluginFinder.cpp
utils/qapt-gst-helper/PluginHelper.cpp
utils/qapt-gst-helper/PluginHelper.h
utils/qapt-gst-helper/PluginInfo.h
utils/qapt-gst-helper/main.cpp
debian/changelog | 534 ++++++++++++++++++++-
debian/control | 90 ++--
debian/gstreamer-qapt.install | 3 +
...er1.0-qapt.postinst => gstreamer-qapt.postinst} | 2 +-
...streamer1.0-qapt.prerm => gstreamer-qapt.prerm} | 2 +-
debian/kde-thumbnailer-deb.install | 4 +-
debian/libqapt-dev.install | 34 ++
debian/libqapt3-runtime.install | 4 +
...verrides => libqapt3-runtime.lintian-overrides} | 2 +-
debian/libqapt3.install | 1 +
debian/meta/upstream_scm.json | 3 +
debian/plasma-runner-installer.install | 7 +-
debian/qapt-batch.install | 3 +-
debian/qapt-deb-installer.install | 5 +-
debian/rules | 6 +-
debian/watch | 4 +-
16 files changed, 645 insertions(+), 59 deletions(-)
diff --cc debian/changelog
index 8f7e06e,9179c0a..387d3ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,227 +1,262 @@@
+ libqapt (3.0.0-0ubuntu3) UNRELEASED; urgency=medium
+
+ * Update watch file.
+ * Build depend on pkg-kde-tools to (>> 0.15.15) so we make sure we are
+ building against a pkg-kde-tools which provides the kde frameworks
+ module.
++ * Drop freeze_with_apt-listbugs_and_apt-listchanges.diff, applied upstream.
++ * In libqapt-runtime add Breaks/Replaces against libdebconf-kde0 (<< 0.3~)
++ because the patch freeze_with_apt-listbugs_and_apt-listchanges.diff in this
++ package and apt-listbugs hang debconf-kde because some debconf commands were
++ not implemented in debconf-kde.
++ * Don't call git-import-orig in debian/watch, it doesn't work properly with
++ branches, for instance if you have an 'experimental' branch with the latest
++ version of the software it will commit to the master branch anyway.
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com> Tue, 10 Feb 2015 15:06:04 +0100
+
+ libqapt (3.0.0-0ubuntu2) vivid; urgency=medium
+
+ * Add build-dep on qttools5-dev-tools
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 20 Jan 2015 13:15:44 +0100
+
+ libqapt (3.0.0-0ubuntu1) vivid; urgency=medium
+
+ * Initial upload for qapt3
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 20 Jan 2015 12:13:04 +0100
+
+qapt (2.2.0-1) experimental; urgency=low
+
+ [ Sune Vuorela ]
+ * Add me to uploaders
+ * Remove Jose Manuel Santamaria Lema from uploaders.
+ * Remove the unused DMUA-field.
+
+ [ Floris-Andrei Stoica-Marcu ]
+ * New Upstream Release
+ * Updated package structure, now it is unmerged
+ * Bumped up version of libqapt-runtime
+ * Added new symbol file for qapt-dbg
+ * Disabled tests that broke build
+ * Updated dependencies
+
+ -- Sune Vuorela <sune at debian.org> Wed, 03 Sep 2014 14:19:55 +0200
+
- qapt (1.4.1-0r1) UNRELEASED; urgency=low
+ libqapt (2.2.0+qt5+20140826-0ubuntu1) utopic; urgency=medium
- * New upstream release.
- * Drop freeze_with_apt-listbugs_and_apt-listchanges.diff, applied upstream.
- * In libqapt-runtime add Breaks/Replaces against libdebconf-kde0 (<< 0.3~)
- because the patch freeze_with_apt-listbugs_and_apt-listchanges.diff in this
- package and apt-listbugs hang debconf-kde because some debconf commands were
- not implemented in debconf-kde.
- * Don't call git-import-orig in debian/watch, it doesn't work properly with
- branches, for instance if you have an 'experimental' branch with the latest
- version of the software it will commit to the master branch anyway.
+ * New upstream snapshot
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 26 Aug 2014 15:08:16 +0200
+
+ libqapt (2.1.70+qt5+20140731.1) utopic; urgency=medium
+
+ * Git qt5 snapshot
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Thu, 24 Jul 2014 14:52:03 +0200
+
+ libqapt (2.1.70-0ubuntu6) utopic; urgency=medium
+
+ * Rename gstreamer0.10-qapt to gstreamer-qapt
+ + The codec-installer in theory supports both 0.10 and 1.x (at least 1.x)
+ + The alternative system provided does not handle gstreamer plugin API
+ versions at all, there is only one gstreamer-codec-installer and that one
+ is used everywhere, so the API versin based name doesn't make sense
+ to begin with.
+ + A transitional package gstreamer0.10-qapt was added
+ + The new gstreamer-qapt package replaces and conflicts the older
+ gstreamer0.10-qapt versions
+ + Renamed .install, postinst, prerm accordingly
+ + Removed crap comments from maintainer scripts
- LP: #1313066
++ LP: #1313066
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Mon, 28 Apr 2014 12:11:00 +0200
+
+ libqapt (2.1.70-0ubuntu5) utopic; urgency=medium
+
+ * Add upstream_Prevent-crashes-on-source-entries-that-contain-a-lin.patch
+ from upstream git to resolve a crash when parsing source entries
+ denoting a comment but not actually containing anything other than hash
+ chracters.
+ LP: #1312043
+ (this commit is not part of upstream's 2.2.0 tarball and therefore is not
+ imported as part of the upstream_git patch set)
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Thu, 24 Apr 2014 10:33:17 +0200
+
+ libqapt (2.1.70-0ubuntu4) trusty; urgency=medium
+
+ * Import upstream commits 11 to 12
+ + This possibly makes the qapt gst helper work with gstreamer 0.10 requets
+ by doing a more explicit version match to prevent 1.0 packages from
+ being considered as candiates for 0.10 codec requests.
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Thu, 10 Apr 2014 13:48:14 +0200
+
+ libqapt (2.1.70-0ubuntu3) trusty; urgency=medium
+
+ * Import upstream commits 07 to 10 (LP: #1298380)
+ + These commits include fixes to the qapt-gstreamer installer that port
+ it to gstreamer1.0 native API for 14.04
+ + Also fixes return values of the gstreamer installer to enable auto
+ cache reloading to enable playback without restart
+ * Adjust dependencies for gstreamer1.0 native port
+ - removed: libqtgstreamer-dev
+ - added: libgstreamer1.0-dev, libglib2.0-dev,
+ libgstreamer-plugins-base1.0-dev
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Mon, 07 Apr 2014 11:57:20 +0200
+
+ libqapt (2.1.70-0ubuntu2) trusty; urgency=medium
+
+ * Import upstream commits since release, resolving bugs in sourcelists
+ handling as well as debfile handling.
+ + All in sub directory upstream_git/ (git format-patch export)
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Tue, 18 Mar 2014 17:21:20 +0100
+
+ libqapt (2.1.70-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release
+ * Rename source to libqapt to match upstream
+ * Add kubuntu_disable-tests.diff, tests do not currently compile
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 20 Feb 2014 21:12:09 +0000
+
+ qapt (2.0.65-0ubuntu1) saucy; urgency=low
+
+ * New upstream alpha release:
+ - Update libqapt-dev.install for new files
+ - Update libqapt2.symbols for new symbols
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 25 Jun 2013 10:43:56 -0400
+
+ qapt (2.0.1-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release.
- -- José Manuel Santamaría Lema <panfaust at gmail.com> Fri, 23 Nov 2012 18:04:08 +0100
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 28 May 2013 10:48:09 -0400
+
+ qapt (2.0.0-0ubuntu1) raring; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 01 Apr 2013 16:33:02 -0400
+
+ qapt (1.9.97-0ubuntu1) raring; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 12 Mar 2013 21:36:52 -0400
+
+ qapt (1.9.95-0ubuntu1) raring; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 10 Mar 2013 12:36:03 -0400
+
+ qapt (1.9.80-0ubuntu1) raring; urgency=low
+
+ * New upstream beta release:
+ - Update libqapt2.symbols
+ * Bump Standards-Version to 3.9.4
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 24 Jan 2013 13:26:47 -0500
+
+ qapt (1.9.65-0ubuntu1) raring; urgency=low
+
+ * New upstream alpha release:
+ - Update .symbols file
+ - Adapt to header changes in libqapt-dev.install
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 06 Dec 2012 14:36:37 -0500
+
+ qapt (1.9.60-0ubuntu3) raring; urgency=low
+
+ * Add fix_qapt_batch.diff from git master to fix broken install/remove
+ capabilities for qapt-batch. (LP: #1086047)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 03 Dec 2012 12:26:30 -0500
+
+ qapt (1.9.60-0ubuntu2) raring-proposed; urgency=low
+
+ * Move Depends of binary packages from libqapt-runtime to libqapt2-runtime
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 31 Oct 2012 12:57:09 -0400
+
+ qapt (1.9.60-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream release:
+ - Remove kubuntu_fix_proxy_crash.diff, merged upstream
+ - Rename libqapt1 to libqapt2 for .so version bump
+ - Rename libqapt-runtime to libqapt2-runtime for co-installability with
+ QApt 1.x (The appropriate files in libqapt-runtime have been renamed
+ upstream for coinstallability)
+ - Update the symbols file for 2.x.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 29 Oct 2012 14:40:48 -0400
+
+ qapt (1.4.1-0ubuntu2) quantal; urgency=low
+
+ * Add kubuntu_fix_proxy_crash.diff from upstream 1.4 branch to fix a crash
+ that can occur with certain KDE proxy configurations.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 03 Oct 2012 19:19:31 -0400
+
+ qapt (1.4.1-0ubuntu1) quantal; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sat, 29 Sep 2012 14:34:43 -0400
+qapt (1.4.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Remove upstream_directly-include-declaration-of-MD5Summation.patch, applied
+ upstream.
+ * Add freeze_with_apt-listbugs_and_apt-listchanges.diff.
+ * Sync debian/copyright file with Ubuntu, fixes a lintian warning.
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com> Tue, 11 Sep 2012 22:42:03 +0200
+
+ qapt (1.4.0-0ubuntu1) quantal; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 15 Aug 2012 21:24:54 -0400
+
+ qapt (1.3.95-0ubuntu1) quantal; urgency=low
+
+ * New upstream release candidate (LP: #1021966)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 15 Jul 2012 13:02:13 -0400
+
+ qapt (1.3.80-0ubuntu2) quantal-proposed; urgency=low
+
+ * No-change rebuild against libapt-inst1.5.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Tue, 12 Jun 2012 08:54:50 -0700
+
+ qapt (1.3.80-0ubuntu1) quantal; urgency=low
+
+ * New upstream beta release:
+ - Update libqapt1.symbols
+ * Fix duplicate Copyright: field, lines 8, 32 of debian/copyright
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 10 Jun 2012 16:00:19 -0400
+
+ qapt (1.3.65-0ubuntu1) quantal; urgency=low
+
+ * New upstream alpha release:
+ - Drop cherry-picked patches from the 1.3 branch
+ - Update libqapt1.symbols
+ * Merge with Debian, remaining changes:
+ - Keep dependency on a polkit frontend for libqapt-runtime
+ - Keep cherry-picked patches from the 1.3 branch
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 13 May 2012 12:17:00 -0400
+
qapt (1.3.0-2) unstable; urgency=low
* Team upload.
@@@ -91,3 -313,258 +348,258 @@@ qapt (1.2.2-1) experimental; urgency=lo
* debian/patches/Fix-FTBFS-due-to-symbol-collision.patch: Added.
-- Kai Wasserbäch <curan at debian.org> Wed, 14 Dec 2011 15:49:14 +0100
+
+ qapt (1.2.65-0ubuntu1) precise; urgency=low
+
+ * New upstream alpha release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 13 Nov 2011 19:20:50 -0500
+
+ qapt (1.2.2-0ubuntu1) precise; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 23 Oct 2011 15:18:46 -0400
+
+ qapt (1.2.1-0ubuntu2) oneiric; urgency=low
+
+ * Add changes not present in the previous upload due to me not re-source-
+ building after making them... Fixes FTBFS.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 19 Sep 2011 00:01:31 -0400
+
+ qapt (1.2.1-0ubuntu1) oneiric; urgency=low
+
+ * New upstream bugfix release: (LP: #830786, 847748, 839411)
+ - Update libqapt1.install
+ - Update libqapt1.symbols
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 18 Sep 2011 12:48:47 -0400
+
+ qapt (1.2.0-0ubuntu3) oneiric; urgency=low
+
+ * Fix the qtgstreamer build-dep. The natty build-dep accidentally snuck in.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 26 Aug 2011 17:38:51 -0400
+
+ qapt (1.2.0-0ubuntu2) oneiric; urgency=low
+
+ * Add an or dependency between polkit-kde-1 and policykit-1-gnome to ensure
+ we have a policykit frontend installed. (LP: #833058)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 25 Aug 2011 21:40:33 -0400
+
+ qapt (1.2.0-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release (LP: #822623, #823087)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 11 Aug 2011 19:08:39 -0400
+
+ qapt (1.1.90-0ubuntu2) oneiric; urgency=low
+
+ * rebuild against latest libapt
+
+ -- Michael Vogt <michael.vogt at ubuntu.com> Mon, 08 Aug 2011 14:28:53 +0200
+
+ qapt (1.1.90-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 24 Jul 2011 14:40:16 -0400
+
+ qapt (1.1.85-0ubuntu2) oneiric; urgency=low
+
+ * Fix update-alternatives usage in gstreamer0.10-qapt (LP: #807483)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 14 Jul 2011 00:21:20 -0400
+
+ qapt (1.1.85-0ubuntu1) oneiric; urgency=low
+
+ * New upstream beta release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 26 Jun 2011 11:30:57 -0400
+
+ qapt (1.1.80-0ubuntu2) oneiric; urgency=low
+
+ * Build-depend on libqtgstreamer-dev instead of qtgstreamer-dev.
+ * Increase priority for gstreamer-codec-install alternative to 85.
+ * Enable parallel building.
+ * Fix symbols file on amd64.
+ * Move .mo files from qapt-batch to the respective packages.
+ * Call dh_install with --fail-missing.
+ * Bump Standards-Version to 3.9.2, no changes needed.
+ * Fix lintian warning description-synopsis-starts-with-article.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Mon, 23 May 2011 19:33:00 +0200
+
+ qapt (1.1.80-0ubuntu1) oneiric; urgency=low
+
+ * New upstream beta release:
+ - Update various .install files
+ - Update libqapt1.symbols
+ - Add several new binary packages for new QApt utilities
+ - Add a qapt-utils metapackage to install all QApt utilities
+ - Add build-depend on qtgstreamer-dev for qapt-gstreamer-helper
+ - Add a build-depend on libdebconf-kde-dev for qapt-deb-installer
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 16 Mar 2011 10:37:54 -0400
+
+ qapt (1.1.1-0ubuntu1) natty; urgency=low
+
+ * New upstream bugfix release:
+ - Drop kubuntu_01_dont_close_stdout.diff, present upstream
+ * Update Homepage field to the new projects.kde.org home page
+ * Update the Source field in debian/copyright for the switch to the new KDE
+ Git repository
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 16 Feb 2011 19:19:57 -0500
+
+ qapt (1.1.0-0ubuntu2) natty; urgency=low
+
+ * Add kubuntu_01_dont_close_stdout.diff from upstream to fix the failure
+ of postinst scripts needing stdout. (LP: #680328)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 26 Jan 2011 21:27:09 -0500
+
+ qapt (1.1.0-0ubuntu1) natty; urgency=low
+
+ * New upstream release:
+ - Update libqapt1.symbols
+ * Fix debian/copyright syntax
+ * Update debian/copyright for new copyright holders
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 04 Jan 2011 16:40:10 -0500
+
+ qapt (1.0.95-0ubuntu1) natty; urgency=low
+
+ * New upstream release candidate:
+ - Update libqapt1.install
+ - Update libqapt1.symbols
+ * Port packaging to the debhelper 8 standard:
+ - Bump compat to 8
+ - Bump build-depend on debhelper to 8.0.0~
+ - Place options after the dh sequence in debian/rules
+ * Add a homepage field with the project homepage
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 28 Dec 2010 21:26:41 -0500
+
+ qapt (1.0.90-0ubuntu1) natty; urgency=low
+
+ * New upstream beta:
+ - Update libqapt1.install
+ - Update libqapt1.symbols for new symbols
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 20 Dec 2010 12:17:39 -0500
+
+ qapt (1.0.80-0ubuntu2) natty; urgency=low
+
+ * Rebuild for polkit-qt-1 ABI break
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 10 Dec 2010 13:16:42 -0500
+
+ qapt (1.0.80-0ubuntu1) natty; urgency=low
+
+ * New upstream beta release:
+ - Update various .install files
+ - Update libqapt1.symbols
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sun, 05 Dec 2010 12:16:50 -0500
+
+ qapt (1.0.60-0ubuntu2) natty; urgency=low
+
+ * Somehow the libqapt1.symbols changes didn't make it in to the last upload
+ Reupload to fix FTBFS
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 04 Nov 2010 08:32:06 -0400
+
+ qapt (1.0.60-0ubuntu1) natty; urgency=low
+
+ * New upstream release: (LP: #490353, #668297, #670294)
+ - Bump build-depend version on libapt-pkg-dev to 0.8.0 or higher
+ - Update libqapt1.symbols
+ * Bump Standards-Version to 3.9.1, no changes
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 01 Nov 2010 22:46:18 -0400
+
+ qapt (1.0.3-0ubuntu2) maverick; urgency=low
+
+ * Fix libqapt1.symbols. Since we aren't building with fvisibility=hidden,
+ dpkg-gensymbols is picking up some libapt-pkg symbols as libqapt's. And
+ since libapt-pkg's symbols are different between i386 and amd64, FTBFS
+ occurs on amd64. I've set these symbols to !amd64, but this isn't really
+ a problem since they aren't our symbols.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 30 Sep 2010 15:58:24 -0400
+
+ qapt (1.0.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream bugfix-only release, fixing a silent error when encountering
- total-system APT locks.
++ total-system APT locks.
+ (http://websvn.kde.org/?view=revision&revision=1180714)
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 28 Sep 2010 17:30:05 -0400
+
+ qapt (1.0.2-0ubuntu2) maverick; urgency=low
+
+ * Re-add libqapt1.symbols, which was inadvertantly dropped last upload.
+ I had forgotten to re-add it after I removed it for backporting to lucid.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 14 Sep 2010 08:41:29 -0400
+
+ qapt (1.0.2-0ubuntu1) maverick; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 13 Sep 2010 17:50:50 -0400
+
+ qapt (1.0.1-0ubuntu1) maverick; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 26 Aug 2010 12:26:49 -0400
+
+ qapt (1.0-0ubuntu2) maverick; urgency=low
+
+ * Remove erroneous patches that arose due to source format 3.0 and me
+ leaving files around
+ * Remove some mysterious symbols from the symbols file that don't look like
+ they belong to libqapt and cause FTBFS on amd64
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Thu, 12 Aug 2010 11:30:33 -0400
+
+ qapt (1.0-0ubuntu1) maverick; urgency=low
+
+ * New upstream release:
+ - Rename libqapt0 to libqapt1 for .so versioning bump
+ - Replace appropriate depends with libqapt1 in debian/control
+ - Update libqapt0.symbols for the bump, renaming it to libqapt1.symbols
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 11 Aug 2010 10:23:53 -0400
+
+ qapt (0.5.0-0ubuntu1) maverick; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 04 Aug 2010 10:03:43 -0400
+
+ qapt (0.4.0-0ubuntu1) maverick; urgency=low
+
+ * New upstream beta release:
+ - Update libqapt0.symbols for a new function
+ * Bump Standards-Version to 3.9.1, no changes required
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 28 Jul 2010 09:12:16 -0400
+
+ qapt (0.3.0-0ubuntu2) maverick; urgency=low
+
+ * Add a symbols file for libqapt0
+ * Give libqapt-dev the section of libdevel
+ * Bump Standards-Version to 3.9.0, no changes required
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 23 Jul 2010 10:26:47 -0400
+
+ qapt (0.3.0-0ubuntu1) maverick; urgency=low
+
+ * Initial release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 02 Jun 2010 14:47:35 -0500
diff --cc debian/control
index d53499d,d6fe01f..69043e5
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,42 +1,43 @@@
- Source: qapt
+ Source: libqapt
Section: kde
Priority: optional
- Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>,
- Kai Wasserbäch <curan at debian.org>
++Maintainer: Debian/Kubuntu KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Sune Vuorela <sune at debian.org>,
+ Kai Wasserbäch <curan at debian.org>,
- Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
- Build-Depends: debhelper (>= 9),
- pkg-kde-tools (>= 0.5.0),
- cmake (>= 2.8.4+dfsg.1-3),
- pkg-config,
- kdelibs5-dev,
- libapt-pkg-dev (>= 0.8.0),
- libxapian-dev,
- libpolkit-qt-1-dev,
- libgstreamer1.0-dev,
- libgstreamer-plugins-base1.0-dev,
- libdebconf-kde-dev
++ Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>,
++ José Manuel Santamaría Lema <panfaust at gmail.com>
+Standards-Version: 3.9.5
+ Build-Depends: cmake (>= 2.8.4+dfsg.1-3),
+ debhelper (>= 9),
+ extra-cmake-modules,
+ kio-dev,
+ libapt-pkg-dev (>= 0.8.0),
+ libdebconf-kde-dev (>= 1.0.0),
+ libglib2.0-dev,
+ libgstreamer-plugins-base1.0-dev,
+ libgstreamer1.0-dev,
+ libkf5auth-dev,
+ libkf5coreaddons-dev,
+ libkf5i18n-dev,
+ libkf5runner-dev,
+ libkf5textwidgets-dev,
+ libkf5widgetsaddons-dev,
+ libkf5windowsystem-dev,
+ libpolkit-qt5-1-dev,
+ libxapian-dev,
+ pkg-config,
+ pkg-kde-tools (>> 0.15.15),
+ plasma-framework-dev,
+ qttools5-dev,
+ qttools5-dev-tools
-Standards-Version: 3.9.4
Homepage: https://projects.kde.org/projects/extragear/sysadmin/libqapt/
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/qapt.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/qapt.git;a=summary
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-extras/qapt
- Package: libqapt2
+ Package: libqapt3
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+ Recommends: libqapt3-runtime
Description: QApt library package
LibQApt is a Qt wrapper around the libapt-pkg library as well as an APT
implementation using libapt-pkg. The aim is to provide a sane API for
@@@ -129,8 -155,8 +156,7 @@@ Package: qapt-db
Section: debug
Architecture: any
Priority: extra
- Depends: ${misc:Depends}, libqapt2(= ${binary:Version})
- Recommends: kdelibs5-dbg
+ Depends: libqapt3 (= ${binary:Version}), ${misc:Depends}
-Recommends: kdelibs5-dbg
Description: QApt debugging symbols
QApt is a collection of tools and a library providing a wrapper around
APT. The intention is to ease the use of APT in Qt-based programs.
diff --cc debian/libqapt-dev.install
index 0c5dd09,c36d475..4554296
--- a/debian/libqapt-dev.install
+++ b/debian/libqapt-dev.install
@@@ -1,30 -1,31 +1,64 @@@
++<<<<<<< HEAD
+usr/include/LibQApt/Backend
+usr/include/LibQApt/Changelog
+usr/include/LibQApt/Config
+usr/include/LibQApt/DebFile
+usr/include/LibQApt/DependencyInfo
+usr/include/LibQApt/DownloadProgress
+usr/include/LibQApt/Globals
+usr/include/LibQApt/History
+usr/include/LibQApt/MarkingErrorInfo
+usr/include/LibQApt/Package
+usr/include/LibQApt/SourceEntry
+usr/include/LibQApt/SourcesList
+usr/include/LibQApt/Transaction
+usr/include/libqapt/backend.h
+usr/include/libqapt/changelog.h
+usr/include/libqapt/config.h
+usr/include/libqapt/debfile.h
+usr/include/libqapt/dependencyinfo.h
+usr/include/libqapt/globals.h
+usr/include/libqapt/history.h
+usr/include/libqapt/package.h
+usr/include/libqapt/qaptversion.h
+usr/include/libqapt/transaction.h
+usr/include/libqapt/downloadprogress.h
+usr/include/libqapt/markingerrorinfo.h
+usr/include/libqapt/sourceentry.h
+usr/include/libqapt/sourceslist.h
+usr/lib/libqapt.so
+usr/lib/pkgconfig/libqapt.pc
+usr/lib/cmake/QApt/QAptConfig.cmake
++=======
+ usr/include/QApt/Backend
+ usr/include/QApt/Changelog
+ usr/include/QApt/Config
+ usr/include/QApt/DebFile
+ usr/include/QApt/DependencyInfo
+ usr/include/QApt/DownloadProgress
+ usr/include/QApt/Globals
+ usr/include/QApt/History
+ usr/include/QApt/MarkingErrorInfo
+ usr/include/QApt/Package
+ usr/include/QApt/SourceEntry
+ usr/include/QApt/SourcesList
+ usr/include/QApt/Transaction
+ usr/include/qapt/backend.h
+ usr/include/qapt/changelog.h
+ usr/include/qapt/config.h
+ usr/include/qapt/debfile.h
+ usr/include/qapt/dependencyinfo.h
+ usr/include/qapt/downloadprogress.h
+ usr/include/qapt/globals.h
+ usr/include/qapt/history.h
+ usr/include/qapt/markingerrorinfo.h
+ usr/include/qapt/package.h
+ usr/include/qapt/qaptversion.h
+ usr/include/qapt/sourceentry.h
+ usr/include/qapt/sourceslist.h
+ usr/include/qapt/transaction.h
+ usr/lib/*/cmake/QApt/*
+ usr/lib/*/libQApt.so
+ usr/lib/*/pkgconfig/libqapt.pc
+ usr/lib/*/qt5/mkspecs/modules/qt_QApt.pri
++>>>>>>> origin/kubuntu_vivid_archive
diff --cc debian/watch
index b76db5e,0ad536f..c4099b6
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,5 +1,2 @@@
version=3
--
--opts=pasv \
- ftp://ftp.kde.org/pub/kde/stable/libqapt/([\d\.]+)/src/libqapt-([\d\.]+)\.tar\.bz2
- ftp://ftp.kde.org/pub/kde/stable/libqapt/([\d\.]+)/libqapt-([\d\.]+)\.tar\.xz \
- debian git-import-orig
++http://download.kde.org/stable/libqapt/([\d.]+)/libqapt-([\d.]+)\.tar\.xz
--
qapt packaging
More information about the pkg-kde-commits
mailing list