[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:09 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=8761eb3
The following commit has been merged in the experimental branch:
commit 8761eb3fa4d4949497cf47ed0bc38610ee10f167
Merge: c137efa1513d6432323368bafbd0e592b96efe45 94cfe9659e06a745c91058e05fab2c334b6dbae7
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri Feb 13 20:51:51 2015 +0100
Merge remote-tracking branch 'origin/gsoc-floris-2014' into experimental
Conflicts:
CMakeLists.txt
ChangeLog
debian/changelog
debian/copyright
debian/libqapt1.symbols
debian/patches/series
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/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/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
COPYING | 676 -----------
HACKING | 6 -
Mainpage.dox | 9 -
Messages.sh | 5 -
TODO | 5 -
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 -
cmake/modules/FindAptPkg.cmake | 46 -
cmake/modules/FindAutomoc4.cmake | 81 --
cmake/modules/FindPolkitQt-1.cmake | 37 -
cmake/modules/FindXapian.cmake | 41 -
cmake/modules/MacroLogFeature.cmake | 125 --
cmake/modules/QAptConfig.cmake | 73 --
cmake/modules/cmake_uninstall.cmake.in | 26 -
debian/changelog | 17 +
debian/control | 29 +-
debian/copyright | 49 +-
...0.10-qapt.install => gstreamer1.0-qapt.install} | 0
...10-qapt.postinst => gstreamer1.0-qapt.postinst} | 0
...amer0.10-qapt.prerm => gstreamer1.0-qapt.prerm} | 0
debian/libqapt-dev.install | 12 +-
debian/libqapt-runtime.install | 4 -
debian/libqapt1.install | 1 -
debian/libqapt2-runtime.install | 4 +
...verrides => libqapt2-runtime.lintian-overrides} | 2 +-
debian/libqapt2.install | 1 +
debian/libqapt2.symbols | 464 ++++++++
debian/patches/remove_tests.diff | 11 +
debian/patches/series | 1 +
debian/plasma-runner-installer.install | 2 +-
debian/qapt-batch.install | 2 +-
debian/qapt-deb-installer.install | 2 +-
debian/source/local-options | 1 -
debian/source/options | 2 -
doxy.config.in | 1254 --------------------
example/CMakeLists.txt | 27 -
example/cacheupdatewidget.cpp | 105 --
example/cacheupdatewidget.h | 64 -
example/commitwidget.cpp | 54 -
example/commitwidget.h | 45 -
example/main.cpp | 45 -
example/qapttest.cpp | 308 -----
example/qapttest.h | 89 --
includes/Backend | 1 -
includes/CMakeLists.txt | 11 -
includes/Cache | 1 -
includes/Changelog | 1 -
includes/Config | 1 -
includes/DebFile | 1 -
includes/DependencyInfo | 1 -
includes/Globals | 1 -
includes/History | 1 -
includes/Package | 1 -
libqapt.pc.cmake | 10 -
po/bs/CMakeLists.txt | 2 -
po/bs/plasma-runner-installer.po | 33 -
po/bs/qapt-deb-installer.po | 219 ----
po/bs/qaptbatch.po | 393 ------
po/ca/CMakeLists.txt | 2 -
po/ca/plasma-runner-installer.po | 34 -
po/ca/qapt-deb-installer.po | 228 ----
po/ca/qaptbatch.po | 385 ------
po/ca at valencia/CMakeLists.txt | 2 -
po/ca at valencia/qaptbatch.po | 385 ------
po/cs/CMakeLists.txt | 2 -
po/cs/plasma-runner-installer.po | 32 -
po/da/CMakeLists.txt | 2 -
po/da/plasma-runner-installer.po | 32 -
po/da/qapt-deb-installer.po | 225 ----
po/da/qaptbatch.po | 381 ------
po/de/CMakeLists.txt | 2 -
po/de/qapt-deb-installer.po | 225 ----
po/el/CMakeLists.txt | 2 -
po/el/plasma-runner-installer.po | 33 -
po/el/qaptbatch.po | 383 ------
po/en_GB/CMakeLists.txt | 2 -
po/en_GB/plasma-runner-installer.po | 32 -
po/en_GB/qaptbatch.po | 386 ------
po/eo/CMakeLists.txt | 2 -
po/eo/qaptbatch.po | 353 ------
po/es/CMakeLists.txt | 2 -
po/es/plasma-runner-installer.po | 32 -
po/es/qapt-deb-installer.po | 226 ----
po/es/qaptbatch.po | 386 ------
po/et/CMakeLists.txt | 2 -
po/et/plasma-runner-installer.po | 32 -
po/et/qaptbatch.po | 377 ------
po/fi/CMakeLists.txt | 2 -
po/fr/CMakeLists.txt | 2 -
po/fr/plasma-runner-installer.po | 32 -
po/ga/CMakeLists.txt | 2 -
po/ga/plasma-runner-installer.po | 32 -
po/hu/CMakeLists.txt | 2 -
po/hu/plasma-runner-installer.po | 32 -
po/hu/qapt-deb-installer.po | 225 ----
po/hu/qaptbatch.po | 378 ------
po/it/CMakeLists.txt | 2 -
po/it/plasma-runner-installer.po | 32 -
po/it/qapt-deb-installer.po | 228 ----
po/it/qaptbatch.po | 390 ------
po/ja/CMakeLists.txt | 2 -
po/ja/plasma-runner-installer.po | 29 -
po/ja/qapt-deb-installer.po | 215 ----
po/ja/qaptbatch.po | 351 ------
po/lt/CMakeLists.txt | 2 -
po/lt/plasma-runner-installer.po | 35 -
po/lt/qapt-deb-installer.po | 233 ----
po/lt/qaptbatch.po | 404 -------
po/mai/CMakeLists.txt | 2 -
po/mai/qaptbatch.po | 356 ------
po/nb/CMakeLists.txt | 2 -
po/nb/plasma-runner-installer.po | 34 -
po/nds/CMakeLists.txt | 2 -
po/nds/plasma-runner-installer.po | 34 -
po/nds/qapt-deb-installer.po | 232 ----
po/nds/qaptbatch.po | 384 ------
po/nl/CMakeLists.txt | 2 -
po/nl/plasma-runner-installer.po | 32 -
po/nl/qapt-deb-installer.po | 228 ----
po/nl/qaptbatch.po | 386 ------
po/pl/CMakeLists.txt | 2 -
po/pl/plasma-runner-installer.po | 33 -
po/pl/qaptbatch.po | 396 -------
po/pt/CMakeLists.txt | 2 -
po/pt/plasma-runner-installer.po | 27 -
po/pt/qapt-deb-installer.po | 222 ----
po/pt/qaptbatch.po | 383 ------
po/pt_BR/CMakeLists.txt | 2 -
po/pt_BR/plasma-runner-installer.po | 33 -
po/ro/CMakeLists.txt | 2 -
po/ro/qaptbatch.po | 395 ------
po/ru/CMakeLists.txt | 2 -
po/ru/plasma-runner-installer.po | 36 -
po/ru/qapt-deb-installer.po | 236 ----
po/ru/qaptbatch.po | 405 -------
po/sk/CMakeLists.txt | 2 -
po/sk/plasma-runner-installer.po | 30 -
po/sk/qapt-deb-installer.po | 226 ----
po/sk/qaptbatch.po | 383 ------
po/sl/CMakeLists.txt | 2 -
po/sl/qaptbatch.po | 402 -------
po/sr/CMakeLists.txt | 2 -
po/sr/plasma-runner-installer.po | 36 -
po/sr/qaptbatch.po | 401 -------
po/sr at ijekavian/CMakeLists.txt | 2 -
po/sr at ijekavian/plasma-runner-installer.po | 36 -
po/sr at ijekavian/qaptbatch.po | 401 -------
po/sr at ijekavianlatin/CMakeLists.txt | 2 -
po/sr at ijekavianlatin/plasma-runner-installer.po | 36 -
po/sr at ijekavianlatin/qaptbatch.po | 401 -------
po/sr at latin/CMakeLists.txt | 2 -
po/sr at latin/plasma-runner-installer.po | 36 -
po/sr at latin/qaptbatch.po | 401 -------
po/sv/CMakeLists.txt | 2 -
po/sv/plasma-runner-installer.po | 32 -
po/sv/qapt-deb-installer.po | 224 ----
po/sv/qaptbatch.po | 381 ------
po/th/CMakeLists.txt | 2 -
po/th/qaptbatch.po | 364 ------
po/tr/CMakeLists.txt | 2 -
po/tr/plasma-runner-installer.po | 32 -
po/tr/qaptbatch.po | 353 ------
po/ug/CMakeLists.txt | 2 -
po/ug/plasma-runner-installer.po | 32 -
po/ug/qapt-deb-installer.po | 220 ----
po/ug/qaptbatch.po | 355 ------
po/uk/CMakeLists.txt | 2 -
po/uk/plasma-runner-installer.po | 33 -
po/uk/qapt-deb-installer.po | 229 ----
po/uk/qaptbatch.po | 409 -------
po/zh_CN/CMakeLists.txt | 2 -
po/zh_CN/plasma-runner-installer.po | 32 -
po/zh_CN/qapt-deb-installer.po | 224 ----
po/zh_CN/qaptbatch.po | 354 ------
po/zh_TW/CMakeLists.txt | 2 -
po/zh_TW/plasma-runner-installer.po | 32 -
po/zh_TW/qapt-deb-installer.po | 218 ----
po/zh_TW/qaptbatch.po | 355 ------
qaptversion.h.cmake | 116 --
src/CMakeLists.txt | 68 --
src/cache.h | 106 --
src/changelog.cpp | 253 ----
src/changelog.h | 93 --
src/debfile.h | 227 ----
src/dependencyinfo.cpp | 118 --
src/dependencyinfo.h | 116 --
src/worker/CMakeLists.txt | 44 -
src/worker/main.cpp | 28 -
src/worker/org.kubuntu.qaptworker.conf | 16 -
src/worker/org.kubuntu.qaptworker.policy | 34 -
src/worker/org.kubuntu.qaptworker.service.in | 5 -
src/worker/org.kubuntu.qaptworker.xml | 98 --
src/worker/qaptauthorization.h | 50 -
src/worker/workerinstallprogress.h | 60 -
utils/CMakeLists.txt | 21 -
utils/plasma-runner-installer/CMakeLists.txt | 13 -
utils/plasma-runner-installer/installerrunner.cpp | 123 --
utils/plasma-runner-installer/installerrunner.h | 49 -
utils/qapt-batch/CMakeLists.txt | 16 -
utils/qapt-batch/detailswidget.cpp | 70 --
utils/qapt-batch/detailswidget.h | 44 -
utils/qapt-batch/qaptbatch.cpp | 490 --------
utils/qapt-batch/qaptbatch.h | 70 --
utils/qapt-deb-installer/DebCommitWidget.cpp | 120 --
utils/qapt-deb-installer/DebCommitWidget.h | 61 -
utils/qapt-deb-thumbnailer/CMakeLists.txt | 12 -
utils/qapt-deb-thumbnailer/DebThumbnailer.cpp | 91 --
utils/qapt-deb-thumbnailer/DebThumbnailer.h | 42 -
utils/qapt-gst-helper/CMakeLists.txt | 19 -
utils/qapt-gst-helper/GstMatcher.h | 50 -
utils/qapt-gst-helper/PluginFinder.h | 59 -
utils/qapt-gst-helper/PluginInfo.cpp | 145 ---
211 files changed, 569 insertions(+), 24163 deletions(-)
diff --cc debian/changelog
index 7a9cc00,9281a6c..8f7e06e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,20 +1,44 @@@
+ 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
+
+ * 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.
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com> Fri, 23 Nov 2012 18:04:08 +0100
+
+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.3.0-2) unstable; urgency=low
* Team upload.
diff --cc debian/control
index 67022d6,2b06778..d53499d
--- a/debian/control
+++ b/debian/control
@@@ -43,10 -44,9 +44,10 @@@ Description: Development headers for th
.
This package contains the development headers for the QApt library
- Package: libqapt-runtime
+ Package: libqapt2-runtime
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: apt-listchanges (<< 2.85.12~), libdebconf-kde0 (<< 0.3~)
Description: Runtime components for the QApt library
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
diff --cc debian/copyright
index f601c90,df47b76..49d12fc
--- a/debian/copyright
+++ b/debian/copyright
@@@ -33,3 -37,35 +37,34 @@@ Copyright: 2010, Jonathan Thomas <echid
License: GPL-3
On Debian systems the full text of the GNU General Public License can be found
in the `/usr/share/common-licenses/GPL-3' file.
+
+ Files: cmake/modules/*
+ Copyright: 2009-2010, Dario Freddi <drf at kde.org>
+ 2010, Harald Sitter <apachelogger at ubuntu.com>
+ 2010, David Palacio <dpalacio at uninorte.edu.co>
+ 2008, Laurent Montel <montel at kde.org>
+ 2006-2009, Alexander Neundorf <neundorf at kde.org>
+ 2006, Allen Winter <winter at kde.org>
+ License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
++ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
--
qapt packaging
More information about the pkg-kde-commits
mailing list