[SCM] qapt packaging branch, kubuntu_unstable, updated. debian/3.0.0-4-8-gdd0c3f8

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Sun Jul 26 08:17:03 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=0271d7e

The following commit has been merged in the kubuntu_unstable branch:
commit 0271d7e1792311b05c6799eef52fc4d351d2fcea
Merge: 468f7b3bd9ee7a3a845ea8c339904d2d78621bb4 19658b956e9cf50a9c2dda5ef0d1045b6c6bd9c4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sun Jul 26 10:15:17 2015 +0200

    merge master

 .gitignore                                         |    6 +-
 .krazy                                             |    1 +
 CMakeLists.txt                                     |  156 ++
 COPYING                                            |  676 +++++++++
 ChangeLog                                          |  516 +++++++
 HACKING                                            |    6 +
 Mainpage.dox                                       |    9 +
 Messages.sh                                        |    5 +
 QAptConfig.cmake.in                                |   20 +
 TODO                                               |    5 +
 autotests/CMakeLists.txt                           |   26 +
 autotests/data/test1.list                          |   13 +
 autotests/data/test2.list                          |    3 +
 autotests/sourceslisttest.cpp                      |  778 ++++++++++
 autotests/sourceslisttest.h                        |   68 +
 autotests/transactionerrorhandlingtest.cpp         |  248 ++++
 autotests/transactionerrorhandlingtest.h           |   63 +
 cmake/modules/COPYING-CMAKE-SCRIPTS                |   22 +
 cmake/modules/FindAptPkg.cmake                     |   48 +
 cmake/modules/FindGLIB2.cmake                      |   52 +
 cmake/modules/FindGStreamer.cmake                  |   85 ++
 cmake/modules/FindPolkitQt-1.cmake                 |   37 +
 cmake/modules/FindXapian.cmake                     |   41 +
 cmake/modules/cmake_uninstall.cmake.in             |   26 +
 debian/.gitattributes                              |    1 +
 debian/changelog                                   |   81 +-
 debian/control                                     |   81 +-
 debian/copyright                                   |  154 +-
 debian/libqapt-dev.acc.in                          |   21 +
 debian/libqapt-dev.install                         |   31 +-
 debian/libqapt3.install                            |    3 +-
 debian/libqapt3.symbols                            |  465 ++++++
 debian/patches/add_kf5iconthemes                   |   13 +
 debian/patches/series                              |    1 +
 debian/rules                                       |    6 +-
 debian/source/options                              |    2 -
 debian/tests/acc                                   |   11 +
 debian/tests/control                               |    6 +
 debian/tests/testsuite                             |    3 +
 debian/watch                                       |    5 +-
 doxy.config.in                                     | 1254 ++++++++++++++++
 example/CMakeLists.txt                             |   26 +
 example/cacheupdatewidget.cpp                      |  154 ++
 example/cacheupdatewidget.h                        |   77 +
 example/commitwidget.cpp                           |   55 +
 example/commitwidget.h                             |   49 +
 example/main.cpp                                   |   45 +
 example/qapttest.cpp                               |  318 +++++
 example/qapttest.h                                 |   92 ++
 libqapt.pc.cmake                                   |   10 +
 po/bs/plasma_runner_installer.po                   |   35 +
 po/bs/qapt-deb-installer.po                        |  298 ++++
 po/bs/qapt-gst-helper.po                           |  393 +++++
 po/bs/qaptbatch.po                                 |  391 +++++
 po/ca/plasma_runner_installer.po                   |   35 +
 po/ca/qapt-deb-installer.po                        |  293 ++++
 po/ca/qapt-gst-helper.po                           |  384 +++++
 po/ca/qaptbatch.po                                 |  385 +++++
 po/ca at valencia/plasma_runner_installer.po          |   35 +
 po/ca at valencia/qapt-deb-installer.po               |  296 ++++
 po/ca at valencia/qapt-gst-helper.po                  |  384 +++++
 po/ca at valencia/qaptbatch.po                        |  385 +++++
 po/cs/plasma_runner_installer.po                   |   32 +
 po/cs/qapt-deb-installer.po                        |  292 ++++
 po/cs/qapt-gst-helper.po                           |  377 +++++
 po/cs/qaptbatch.po                                 |  386 +++++
 po/da/plasma_runner_installer.po                   |   32 +
 po/da/qapt-deb-installer.po                        |  292 ++++
 po/da/qapt-gst-helper.po                           |  376 +++++
 po/da/qaptbatch.po                                 |  378 +++++
 po/de/plasma_runner_installer.po                   |   31 +
 po/de/qapt-deb-installer.po                        |  292 ++++
 po/de/qapt-gst-helper.po                           |  385 +++++
 po/de/qaptbatch.po                                 |  390 +++++
 po/el/plasma_runner_installer.po                   |   33 +
 po/el/qapt-deb-installer.po                        |  296 ++++
 po/el/qapt-gst-helper.po                           |  387 +++++
 po/el/qaptbatch.po                                 |  384 +++++
 po/en_GB/plasma_runner_installer.po                |   31 +
 po/en_GB/qapt-deb-installer.po                     |  290 ++++
 po/en_GB/qapt-gst-helper.po                        |  380 +++++
 po/en_GB/qaptbatch.po                              |  381 +++++
 po/eo/qaptbatch.po                                 |  355 +++++
 po/es/plasma_runner_installer.po                   |   32 +
 po/es/qapt-deb-installer.po                        |  294 ++++
 po/es/qapt-gst-helper.po                           |  384 +++++
 po/es/qaptbatch.po                                 |  383 +++++
 po/et/plasma_runner_installer.po                   |   32 +
 po/et/qapt-deb-installer.po                        |  292 ++++
 po/et/qapt-gst-helper.po                           |  374 +++++
 po/et/qaptbatch.po                                 |  376 +++++
 po/fa/plasma_runner_installer.po                   |   32 +
 po/fi/plasma_runner_installer.po                   |   35 +
 po/fi/qapt-deb-installer.po                        |  296 ++++
 po/fi/qapt-gst-helper.po                           |  381 +++++
 po/fi/qaptbatch.po                                 |  376 +++++
 po/fr/plasma_runner_installer.po                   |   37 +
 po/fr/qapt-deb-installer.po                        |  299 ++++
 po/fr/qapt-gst-helper.po                           |  393 +++++
 po/fr/qaptbatch.po                                 |  388 +++++
 po/ga/plasma_runner_installer.po                   |   32 +
 po/ga/qapt-deb-installer.po                        |  288 ++++
 po/ga/qapt-gst-helper.po                           |  364 +++++
 po/ga/qaptbatch.po                                 |  362 +++++
 po/gl/plasma_runner_installer.po                   |   35 +
 po/gl/qapt-deb-installer.po                        |  297 ++++
 po/gl/qapt-gst-helper.po                           |  383 +++++
 po/gl/qaptbatch.po                                 |  384 +++++
 po/hu/plasma_runner_installer.po                   |   32 +
 po/hu/qapt-deb-installer.po                        |  293 ++++
 po/hu/qapt-gst-helper.po                           |  384 +++++
 po/hu/qaptbatch.po                                 |  378 +++++
 po/it/plasma_runner_installer.po                   |   31 +
 po/it/qapt-deb-installer.po                        |  292 ++++
 po/it/qapt-gst-helper.po                           |  382 +++++
 po/it/qaptbatch.po                                 |  382 +++++
 po/ja/plasma_runner_installer.po                   |   29 +
 po/ja/qapt-deb-installer.po                        |  279 ++++
 po/ja/qapt-gst-helper.po                           |  348 +++++
 po/ja/qaptbatch.po                                 |  353 +++++
 po/kk/plasma_runner_installer.po                   |   32 +
 po/kk/qapt-deb-installer.po                        |  285 ++++
 po/kk/qapt-gst-helper.po                           |  356 +++++
 po/kk/qaptbatch.po                                 |  361 +++++
 po/ko/plasma_runner_installer.po                   |   31 +
 po/ko/qapt-deb-installer.po                        |  289 ++++
 po/ko/qapt-gst-helper.po                           |  355 +++++
 po/ko/qaptbatch.po                                 |  361 +++++
 po/lt/plasma_runner_installer.po                   |   35 +
 po/lt/qapt-deb-installer.po                        |  301 ++++
 po/lt/qapt-gst-helper.po                           |  405 ++++++
 po/lt/qaptbatch.po                                 |  402 ++++++
 po/mai/qaptbatch.po                                |  358 +++++
 po/mr/plasma_runner_installer.po                   |   32 +
 po/mr/qapt-deb-installer.po                        |  290 ++++
 po/mr/qapt-gst-helper.po                           |  369 +++++
 po/mr/qaptbatch.po                                 |  372 +++++
 po/nb/plasma_runner_installer.po                   |   34 +
 po/nb/qapt-deb-installer.po                        |  281 ++++
 po/nb/qapt-gst-helper.po                           |  366 +++++
 po/nb/qaptbatch.po                                 |  355 +++++
 po/nds/plasma_runner_installer.po                  |   34 +
 po/nds/qapt-deb-installer.po                       |  327 +++++
 po/nds/qapt-gst-helper.po                          |  398 ++++++
 po/nds/qaptbatch.po                                |  415 ++++++
 po/nl/plasma_runner_installer.po                   |   32 +
 po/nl/qapt-deb-installer.po                        |  292 ++++
 po/nl/qapt-gst-helper.po                           |  383 +++++
 po/nl/qaptbatch.po                                 |  382 +++++
 po/pa/plasma_runner_installer.po                   |   32 +
 po/pa/qapt-gst-helper.po                           |  351 +++++
 po/pl/plasma_runner_installer.po                   |   33 +
 po/pl/qapt-deb-installer.po                        |  293 ++++
 po/pl/qapt-gst-helper.po                           |  398 ++++++
 po/pl/qaptbatch.po                                 |  394 +++++
 po/pt/plasma_runner_installer.po                   |   27 +
 po/pt/qapt-deb-installer.po                        |  286 ++++
 po/pt/qapt-gst-helper.po                           |  380 +++++
 po/pt/qaptbatch.po                                 |  382 +++++
 po/pt_BR/plasma_runner_installer.po                |   33 +
 po/pt_BR/qapt-deb-installer.po                     |  293 ++++
 po/pt_BR/qapt-gst-helper.po                        |  384 +++++
 po/pt_BR/qaptbatch.po                              |  384 +++++
 po/ro/plasma_runner_installer.po                   |   33 +
 po/ro/qapt-deb-installer.po                        |  296 ++++
 po/ro/qapt-gst-helper.po                           |  397 ++++++
 po/ro/qaptbatch.po                                 |  393 +++++
 po/ru/plasma_runner_installer.po                   |   36 +
 po/ru/qapt-deb-installer.po                        |  303 ++++
 po/ru/qapt-gst-helper.po                           |  408 ++++++
 po/ru/qaptbatch.po                                 |  402 ++++++
 po/sk/plasma_runner_installer.po                   |   30 +
 po/sk/qapt-deb-installer.po                        |  292 ++++
 po/sk/qapt-gst-helper.po                           |  385 +++++
 po/sk/qaptbatch.po                                 |  382 +++++
 po/sl/plasma_runner_installer.po                   |   34 +
 po/sl/qapt-deb-installer.po                        |  297 ++++
 po/sl/qapt-gst-helper.po                           |  404 ++++++
 po/sl/qaptbatch.po                                 |  398 ++++++
 po/sr/plasma_runner_installer.po                   |   36 +
 po/sr/qapt-deb-installer.po                        |  298 ++++
 po/sr/qapt-gst-helper.po                           |  406 ++++++
 po/sr/qaptbatch.po                                 |  400 ++++++
 po/sr at ijekavian/plasma_runner_installer.po         |   36 +
 po/sr at ijekavian/qapt-deb-installer.po              |  298 ++++
 po/sr at ijekavian/qapt-gst-helper.po                 |  406 ++++++
 po/sr at ijekavian/qaptbatch.po                       |  400 ++++++
 po/sr at ijekavianlatin/plasma_runner_installer.po    |   36 +
 po/sr at ijekavianlatin/qapt-deb-installer.po         |  298 ++++
 po/sr at ijekavianlatin/qapt-gst-helper.po            |  407 ++++++
 po/sr at ijekavianlatin/qaptbatch.po                  |  400 ++++++
 po/sr at latin/plasma_runner_installer.po             |   36 +
 po/sr at latin/qapt-deb-installer.po                  |  298 ++++
 po/sr at latin/qapt-gst-helper.po                     |  407 ++++++
 po/sr at latin/qaptbatch.po                           |  400 ++++++
 po/sv/plasma_runner_installer.po                   |   32 +
 po/sv/qapt-deb-installer.po                        |  291 ++++
 po/sv/qapt-gst-helper.po                           |  379 +++++
 po/sv/qaptbatch.po                                 |  379 +++++
 po/th/qaptbatch.po                                 |  396 +++++
 po/tr/plasma_runner_installer.po                   |   34 +
 po/tr/qapt-deb-installer.po                        |  293 ++++
 po/tr/qapt-gst-helper.po                           |  373 +++++
 po/tr/qaptbatch.po                                 |  374 +++++
 po/ug/plasma_runner_installer.po                   |   32 +
 po/ug/qapt-deb-installer.po                        |  281 ++++
 po/ug/qapt-gst-helper.po                           |  349 +++++
 po/ug/qaptbatch.po                                 |  355 +++++
 po/uk/plasma_runner_installer.po                   |   35 +
 po/uk/qapt-deb-installer.po                        |  297 ++++
 po/uk/qapt-gst-helper.po                           |  407 ++++++
 po/uk/qaptbatch.po                                 |  408 ++++++
 po/zh_CN/plasma_runner_installer.po                |   32 +
 po/zh_CN/qapt-deb-installer.po                     |  284 ++++
 po/zh_CN/qapt-gst-helper.po                        |  351 +++++
 po/zh_CN/qaptbatch.po                              |  357 +++++
 po/zh_TW/plasma_runner_installer.po                |   32 +
 po/zh_TW/qapt-deb-installer.po                     |  284 ++++
 po/zh_TW/qapt-gst-helper.po                        |  350 +++++
 po/zh_TW/qaptbatch.po                              |  355 +++++
 qaptversion.h.cmake                                |  116 ++
 src/CMakeLists.txt                                 |   87 ++
 src/backend.cpp                                    | 1508 ++++++++++++++++++++
 src/backend.h                                      |  808 +++++++++++
 src/cache.cpp                                      |   93 ++
 src/cache.h                                        |   97 ++
 src/changelog.cpp                                  |  263 ++++
 src/changelog.h                                    |  139 ++
 src/config.cpp                                     |  234 +++
 src/config.h                                       |  143 ++
 src/dbusinterfaces_p.h.cmake                       |   19 +
 src/debfile.cpp                                    |  369 +++++
 src/debfile.h                                      |  227 +++
 src/dependencyinfo.cpp                             |  162 +++
 src/dependencyinfo.h                               |  133 ++
 src/downloadprogress.cpp                           |  221 +++
 src/downloadprogress.h                             |  137 ++
 src/globals.h                                      |  340 +++++
 src/history.cpp                                    |  300 ++++
 src/history.h                                      |  189 +++
 src/markingerrorinfo.cpp                           |   87 ++
 src/markingerrorinfo.h                             |   83 ++
 src/package.cpp                                    | 1319 +++++++++++++++++
 src/package.h                                      |  642 +++++++++
 src/sourceentry.cpp                                |  328 +++++
 src/sourceentry.h                                  |   76 +
 src/sourceslist.cpp                                |  279 ++++
 src/sourceslist.h                                  |   63 +
 src/transaction.cpp                                |  708 +++++++++
 src/transaction.h                                  |  538 +++++++
 src/worker/CMakeLists.txt                          |   69 +
 src/worker/aptlock.cpp                             |   57 +
 src/worker/aptlock.h                               |   43 +
 src/worker/aptworker.cpp                           |  692 +++++++++
 src/worker/aptworker.h                             |  133 ++
 src/worker/main.cpp                                |   28 +
 src/worker/org.kubuntu.qaptworker.conf.cmake       |   16 +
 src/worker/org.kubuntu.qaptworker.policy.cmake     |   43 +
 src/worker/org.kubuntu.qaptworker.service.cmake    |    5 +
 .../org.kubuntu.qaptworker.transaction.xml.cmake   |   70 +
 src/worker/org.kubuntu.qaptworker.xml.cmake        |   39 +
 src/worker/qaptauthorization.h                     |   43 +
 src/worker/qaptworker.actions.cmake                |  380 +++++
 src/worker/transaction.cpp                         |  641 +++++++++
 src/worker/transaction.h                           |  186 +++
 src/worker/transactionqueue.cpp                    |  169 +++
 src/worker/transactionqueue.h                      |   66 +
 src/worker/urihelper.h.cmake                       |   19 +
 src/worker/workeracquire.cpp                       |  237 +++
 src/worker/workeracquire.h                         |   61 +
 src/worker/workerdaemon.cpp                        |  189 +++
 src/worker/workerdaemon.h                          |   74 +
 src/worker/workerinstallprogress.cpp               |  228 +++
 src/worker/workerinstallprogress.h                 |   48 +
 utils/CMakeLists.txt                               |   10 +
 utils/plasma-runner-installer/CMakeLists.txt       |   11 +
 utils/plasma-runner-installer/installerrunner.cpp  |  123 ++
 utils/plasma-runner-installer/installerrunner.h    |   47 +
 .../plasma-runner-installer.desktop                |   96 ++
 utils/qapt-batch/CMakeLists.txt                    |   17 +
 utils/qapt-batch/detailswidget.cpp                 |  118 ++
 utils/qapt-batch/detailswidget.h                   |   55 +
 utils/qapt-batch/main.cpp                          |  115 ++
 utils/qapt-batch/qaptbatch.cpp                     |  431 ++++++
 utils/qapt-batch/qaptbatch.h                       |   81 ++
 utils/qapt-deb-installer/CMakeLists.txt            |   20 +
 utils/qapt-deb-installer/ChangesDialog.cpp         |  128 ++
 utils/qapt-deb-installer/ChangesDialog.h           |   45 +
 utils/qapt-deb-installer/DebCommitWidget.cpp       |  212 +++
 utils/qapt-deb-installer/DebCommitWidget.h         |   68 +
 utils/qapt-deb-installer/DebInstaller.cpp          |  461 ++++++
 utils/qapt-deb-installer/DebInstaller.h            |   87 ++
 utils/qapt-deb-installer/DebViewer.cpp             |  292 ++++
 utils/qapt-deb-installer/DebViewer.h               |   77 +
 utils/qapt-deb-installer/main.cpp                  |   90 ++
 .../qapt-deb-installer/qapt-deb-installer.desktop  |  136 ++
 utils/qapt-deb-thumbnailer/CMakeLists.txt          |   10 +
 utils/qapt-deb-thumbnailer/DebThumbnailer.cpp      |  109 ++
 utils/qapt-deb-thumbnailer/DebThumbnailer.h        |   42 +
 utils/qapt-deb-thumbnailer/debthumbnailer.desktop  |   49 +
 utils/qapt-gst-helper/CMakeLists.txt               |   23 +
 utils/qapt-gst-helper/GstMatcher.cpp               |  136 ++
 utils/qapt-gst-helper/GstMatcher.h                 |   48 +
 utils/qapt-gst-helper/PluginFinder.cpp             |   82 ++
 utils/qapt-gst-helper/PluginFinder.h               |   59 +
 utils/qapt-gst-helper/PluginHelper.cpp             |  530 +++++++
 utils/qapt-gst-helper/PluginHelper.h               |   91 ++
 utils/qapt-gst-helper/PluginInfo.cpp               |  146 ++
 utils/qapt-gst-helper/PluginInfo.h                 |   71 +
 utils/qapt-gst-helper/main.cpp                     |   96 ++
 310 files changed, 69499 insertions(+), 92 deletions(-)

diff --cc debian/changelog
index e07c1a4,7943df6..0ed5512
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,28 -31,27 +31,46 @@@ libqapt (3.0.0-1) experimental; urgency
    * 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.
 +
 +  [ Dmitry Shachnev ]
 +  * Export QT_SELECT=qt5 in debian/rules to make lconvert call succeed.
- 
-  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 10 Feb 2015 15:06:04 +0100
+   * 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.
+ 
+   [ Maximiliano Curia ]
+   * Prepare experimental version.
+   * Add myself as Uploader.
+   * Bump Standards-Version to 3.9.6, no changes needed.
+   * Update copyright information.
+   * Update build dependencies to build against experimental and to
+     follow cmake.
+   * Remove patch: remove_tests.diff
+   * Add basic autopkgtests support.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Feb 2015 09:28:30 +0100
  
 +libqapt (3.0.0-0ubuntu2.2) vivid; urgency=medium
 +
 +  * Add upstream_cmake-configure-kf5iconthemes.diff to fix compile
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Apr 2015 13:49:23 +0200
 +
 +libqapt (3.0.0-0ubuntu2.1) vivid; urgency=medium
 +
 +  * SRU two fixes LP: #1448929
 +   - make sure that the changesdialog in muon apps shows the right
 +    packages with the right states
 +   - upstream_fix-heldness-state.diff
 +   - upstream_exclude-broken-state-changes.diff
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 27 Apr 2015 10:38:24 +0200
 +
  libqapt (3.0.0-0ubuntu2) vivid; urgency=medium
  
    * Add build-dep on qttools5-dev-tools

-- 
qapt packaging



More information about the pkg-kde-commits mailing list