[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:13 UTC 2015


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

The following commit has been merged in the experimental branch:
commit 67dca773341cb723ae7bdbfb2afdd272715a4bb3
Merge: 2b5263772e1953f0430f763eac20886ca96b154a 604498a1bcf533b22acacd30098649cc485435ef
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Feb 13 21:57:14 2015 +0100

    Merge tag 'upstream/3.0.0' into experimental
    
    Upstream version 3.0.0
    
    Conflicts:
    	.gitignore
    	CMakeLists.txt
    	ChangeLog
    	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/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/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/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/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.cpp
    	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

 .gitignore                                         |    6 +-
 .krazy                                             |    1 +
 CMakeLists.txt                                     |  315 +++--
 COPYING                                            |  676 +++++++++++
 ChangeLog                                          |  134 ++-
 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 +
 doxy.config.in                                     | 1254 ++++++++++++++++++++
 example/CMakeLists.txt                             |   26 +
 example/cacheupdatewidget.cpp                      |  154 +++
 .../DebViewer.h => example/cacheupdatewidget.h     |   77 +-
 .../ChangesDialog.h => example/commitwidget.cpp    |   50 +-
 .../ChangesDialog.h => example/commitwidget.h      |   34 +-
 .../ChangesDialog.h => example/main.cpp            |   38 +-
 example/qapttest.cpp                               |  318 +++++
 .../DebViewer.h => example/qapttest.h              |   82 +-
 libqapt.pc.cmake                                   |   10 +
 po/CMakeLists.txt                                  |   54 -
 po/bs/plasma_runner_installer.po                   |   35 +
 po/bs/qapt-deb-installer.po                        |  298 +++++
 po/bs/qapt-gst-helper.po                           |  336 +++---
 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                           |  249 ++--
 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 => ca at valencia}/qapt-gst-helper.po          |  271 +++--
 po/ca at valencia/qaptbatch.po                        |  385 ++++++
 po/cs/plasma_runner_installer.po                   |   32 +
 po/cs/qapt-deb-installer.po                        |  194 ++-
 po/cs/qapt-gst-helper.po                           |  256 ++--
 po/cs/qaptbatch.po                                 |  337 +++---
 po/da/plasma_runner_installer.po                   |   32 +
 po/da/qapt-deb-installer.po                        |  292 +++++
 po/da/qapt-gst-helper.po                           |  246 ++--
 po/da/qaptbatch.po                                 |  378 ++++++
 ...ner-installer.po => plasma_runner_installer.po} |    8 +-
 po/de/qapt-deb-installer.po                        |  292 +++++
 po/de/qapt-gst-helper.po                           |  250 ++--
 po/de/qaptbatch.po                                 |  318 ++---
 po/el/plasma_runner_installer.po                   |   33 +
 po/el/qapt-deb-installer.po                        |  195 ++-
 po/el/qapt-gst-helper.po                           |  244 ++--
 po/el/{qapt-gst-helper.po => qaptbatch.po}         |  389 +++---
 po/en_GB/plasma_runner_installer.po                |   31 +
 po/en_GB/qapt-deb-installer.po                     |  290 +++++
 po/en_GB/qapt-gst-helper.po                        |  249 ++--
 po/en_GB/qaptbatch.po                              |  381 ++++++
 po/{ga => eo}/qaptbatch.po                         |  307 ++---
 po/es/plasma_runner_installer.po                   |   32 +
 po/es/qapt-deb-installer.po                        |  294 +++++
 po/es/qapt-gst-helper.po                           |  263 ++--
 po/es/qaptbatch.po                                 |  383 ++++++
 po/et/plasma_runner_installer.po                   |   32 +
 po/et/qapt-deb-installer.po                        |  191 ++-
 po/et/qapt-gst-helper.po                           |  242 ++--
 po/et/qaptbatch.po                                 |  376 ++++++
 po/fa/plasma_runner_installer.po                   |   32 +
 ...ner-installer.po => plasma_runner_installer.po} |   14 +-
 po/fi/qapt-deb-installer.po                        |  213 ++--
 po/fi/qapt-gst-helper.po                           |  311 ++---
 po/fi/qaptbatch.po                                 |  337 +++---
 po/fr/plasma_runner_installer.po                   |   37 +
 po/fr/qapt-deb-installer.po                        |  235 ++--
 po/fr/qapt-gst-helper.po                           |  329 ++---
 po/fr/qaptbatch.po                                 |  392 +++---
 po/ga/plasma_runner_installer.po                   |   32 +
 po/ga/qapt-deb-installer.po                        |  192 ++-
 po/ga/qapt-gst-helper.po                           |  227 ++--
 po/ga/qaptbatch.po                                 |  286 ++---
 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                           |  245 ++--
 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                           |  248 ++--
 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                           |  223 ++--
 po/{ga => ja}/qaptbatch.po                         |  305 +++--
 po/kk/CMakeLists.txt                               |    2 -
 ...ner-installer.po => plasma_runner_installer.po} |    8 +-
 po/kk/qapt-deb-installer.po                        |  235 ++--
 po/kk/qapt-gst-helper.po                           |  310 ++---
 po/kk/qaptbatch.po                                 |  312 ++---
 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                           |  251 ++--
 po/lt/qaptbatch.po                                 |  402 +++++++
 po/{ga => mai}/qaptbatch.po                        |  310 ++---
 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                        |  176 ++-
 po/nb/qapt-gst-helper.po                           |  225 ++--
 po/nb/qaptbatch.po                                 |  288 ++---
 po/nds/plasma_runner_installer.po                  |   34 +
 po/nds/qapt-deb-installer.po                       |  327 +++++
 po/nds/qapt-gst-helper.po                          |  257 ++--
 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                           |  247 ++--
 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                        |  221 ++--
 po/pl/qapt-gst-helper.po                           |  289 ++---
 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                           |  242 ++--
 po/pt/qaptbatch.po                                 |  382 ++++++
 po/pt_BR/plasma_runner_installer.po                |   33 +
 po/pt_BR/qapt-deb-installer.po                     |  201 ++--
 po/pt_BR/qapt-gst-helper.po                        |  254 ++--
 po/pt_BR/qaptbatch.po                              |  323 +++--
 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                           |  250 ++--
 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                           |  244 ++--
 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                        |  194 ++-
 po/sr/qapt-gst-helper.po                           |  250 ++--
 po/sr/qaptbatch.po                                 |  400 +++++++
 po/sr at ijekavian/plasma_runner_installer.po         |   36 +
 po/sr at ijekavian/qapt-deb-installer.po              |  194 ++-
 po/sr at ijekavian/qapt-gst-helper.po                 |  250 ++--
 po/sr at ijekavian/qaptbatch.po                       |  400 +++++++
 po/sr at ijekavianlatin/plasma_runner_installer.po    |   36 +
 po/sr at ijekavianlatin/qapt-deb-installer.po         |  194 ++-
 po/sr at ijekavianlatin/qapt-gst-helper.po            |  250 ++--
 po/sr at ijekavianlatin/qaptbatch.po                  |  400 +++++++
 po/sr at latin/plasma_runner_installer.po             |   36 +
 po/sr at latin/qapt-deb-installer.po                  |  194 ++-
 po/sr at latin/qapt-gst-helper.po                     |  250 ++--
 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                           |  243 ++--
 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                           |  251 ++--
 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                           |  256 ++--
 po/uk/{qapt-gst-helper.po => qaptbatch.po}         |  423 +++----
 po/zh_CN/plasma_runner_installer.po                |   32 +
 po/zh_CN/qapt-deb-installer.po                     |  284 +++++
 po/zh_CN/qapt-gst-helper.po                        |  303 ++---
 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                        |  244 ++--
 po/zh_TW/qaptbatch.po                              |  355 ++++++
 qaptversion.h.cmake                                |  116 ++
 src/CMakeLists.txt                                 |   87 ++
 src/backend.cpp                                    |  688 +++++------
 src/backend.h                                      |  301 ++---
 src/cache.cpp                                      |   34 +-
 src/cache.h                                        |   97 ++
 src/changelog.cpp                                  |  263 ++++
 src/changelog.h                                    |  139 +++
 src/config.cpp                                     |   30 +-
 src/config.h                                       |    7 +-
 src/dbusinterfaces_p.h.cmake                       |   19 +
 src/debfile.cpp                                    |   23 +-
 src/debfile.h                                      |  227 ++++
 src/dependencyinfo.cpp                             |  162 +++
 src/dependencyinfo.h                               |  133 +++
 src/downloadprogress.cpp                           |  221 ++++
 src/downloadprogress.h                             |  137 +++
 src/globals.h                                      |  305 ++---
 src/history.cpp                                    |   83 +-
 src/history.h                                      |   47 +-
 .../PluginFinder.cpp => src/markingerrorinfo.cpp   |   85 +-
 src/markingerrorinfo.h                             |   83 ++
 src/package.cpp                                    |  581 +++++----
 src/package.h                                      |  150 +--
 src/sourceentry.cpp                                |  328 +++++
 src/sourceentry.h                                  |   76 ++
 src/sourceslist.cpp                                |  279 +++++
 .../ChangesDialog.h => src/sourceslist.h           |   46 +-
 src/transaction.cpp                                |  708 +++++++++++
 src/transaction.h                                  |  538 +++++++++
 src/worker/CMakeLists.txt                          |   69 ++
 .../ChangesDialog.h => src/worker/aptlock.cpp      |   48 +-
 .../ChangesDialog.h => src/worker/aptlock.h        |   32 +-
 src/worker/aptworker.cpp                           |  692 +++++++++++
 src/worker/aptworker.h                             |  133 +++
 .../ChangesDialog.h => src/worker/main.cpp         |   29 +-
 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 +++
 .../PluginInfo.h => src/worker/transactionqueue.h  |   72 +-
 src/worker/urihelper.h.cmake                       |   19 +
 src/worker/worker.cpp                              |  780 ------------
 src/worker/worker.h                                |  112 --
 src/worker/workeracquire.cpp                       |  200 ++--
 src/worker/workeracquire.h                         |   54 +-
 src/worker/workerdaemon.cpp                        |  189 +++
 src/worker/workerdaemon.h                          |   74 ++
 src/worker/workerinstallprogress.cpp               |  105 +-
 .../worker/workerinstallprogress.h                 |   35 +-
 utils/CMakeLists.txt                               |   10 +
 utils/plasma-runner-installer/CMakeLists.txt       |   11 +
 utils/plasma-runner-installer/installerrunner.cpp  |  123 ++
 .../installerrunner.h}                             |   38 +-
 .../plasma-runner-installer.desktop                |   21 +-
 utils/qapt-batch/CMakeLists.txt                    |   17 +
 utils/qapt-batch/detailswidget.cpp                 |  118 ++
 .../ChangesDialog.h => qapt-batch/detailswidget.h} |   40 +-
 utils/qapt-batch/main.cpp                          |  106 +-
 utils/qapt-batch/qaptbatch.cpp                     |  431 +++++++
 .../DebViewer.h => qapt-batch/qaptbatch.h}         |   81 +-
 utils/qapt-deb-installer/CMakeLists.txt            |   17 +-
 utils/qapt-deb-installer/ChangesDialog.cpp         |   14 +-
 utils/qapt-deb-installer/ChangesDialog.h           |    4 +-
 utils/qapt-deb-installer/DebCommitWidget.cpp       |  212 ++++
 .../DebCommitWidget.h}                             |   72 +-
 utils/qapt-deb-installer/DebInstaller.cpp          |  220 ++--
 utils/qapt-deb-installer/DebInstaller.h            |   27 +-
 utils/qapt-deb-installer/DebViewer.cpp             |   66 +-
 utils/qapt-deb-installer/DebViewer.h               |   11 +-
 utils/qapt-deb-installer/main.cpp                  |   55 +-
 .../qapt-deb-installer/qapt-deb-installer.desktop  |   47 +-
 utils/qapt-deb-thumbnailer/CMakeLists.txt          |   10 +
 utils/qapt-deb-thumbnailer/DebThumbnailer.cpp      |  109 ++
 .../DebThumbnailer.h}                              |   29 +-
 utils/qapt-deb-thumbnailer/debthumbnailer.desktop  |   10 +-
 utils/qapt-gst-helper/CMakeLists.txt               |   23 +
 utils/qapt-gst-helper/GstMatcher.cpp               |   75 +-
 .../GstMatcher.h}                                  |   33 +-
 utils/qapt-gst-helper/PluginFinder.cpp             |    4 +-
 .../PluginFinder.h}                                |   42 +-
 utils/qapt-gst-helper/PluginHelper.cpp             |  418 ++++---
 utils/qapt-gst-helper/PluginHelper.h               |   37 +-
 utils/qapt-gst-helper/PluginInfo.cpp               |  146 +++
 utils/qapt-gst-helper/PluginInfo.h                 |    9 +-
 utils/qapt-gst-helper/main.cpp                     |   81 +-
 298 files changed, 46978 insertions(+), 10839 deletions(-)

-- 
qapt packaging



More information about the pkg-kde-commits mailing list