Jonathan Kolberg has proposed merging lp:~bulldog98/kdepim/ubuntu-4.6 into lp:~kubuntu-packagers/kdepim/ubuntu-4.6.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~bulldog98/kdepim/ubuntu-4.6/+merge/60388 Update for the new beta -- https://code.launchpad.net/~bulldog98/kdepim/ubuntu-4.6/+merge/60388 Your team Kubuntu Members is subscribed to branch lp:~kubuntu-packagers/kdepim/ubuntu-4.6.
=== modified file 'debian/akonadiconsole.install' --- debian/akonadiconsole.install 2009-12-21 15:04:24 +0000 +++ debian/akonadiconsole.install 2011-05-09 14:41:19 +0000 @@ -1,3 +1,10 @@ usr/bin/akonadiconsole usr/share/applications/kde4/akonadiconsole.desktop usr/share/kde4/apps/akonadiconsole/akonadiconsoleui.rc +usr/share/icons/hicolor/64x64/apps/akonadiconsole.png +usr/share/icons/hicolor/32x32/apps/akonadiconsole.png +usr/share/icons/hicolor/48x48/apps/akonadiconsole.png +usr/share/icons/hicolor/16x16/apps/akonadiconsole.png +usr/share/icons/hicolor/128x128/apps/akonadiconsole.png +usr/share/icons/hicolor/256x256/apps/akonadiconsole.png +usr/share/icons/hicolor/22x22/apps/akonadiconsole.png === modified file 'debian/akregator.install' --- debian/akregator.install 2010-12-01 18:05:10 +0000 +++ debian/akregator.install 2011-05-09 14:41:19 +0000 @@ -19,6 +19,7 @@ usr/share/icons/hicolor/16x16/apps/akregator.png usr/share/icons/hicolor/16x16/apps/akregator_empty.png usr/share/icons/hicolor/22x22/apps/akregator.png +usr/share/icons/hicolor/256x256/apps/akregator.png usr/share/icons/hicolor/32x32/apps/akregator.png usr/share/icons/hicolor/48x48/apps/akregator.png usr/share/icons/hicolor/64x64/apps/akregator.png === modified file 'debian/changelog' --- debian/changelog 2011-02-10 08:39:59 +0000 +++ debian/changelog 2011-05-09 14:41:19 +0000 @@ -1,3 +1,10 @@ +kdepim (4:4.5.95-0ubuntu0~ppa1) natty; urgency=low + + * New upstream beta release + - added dblatex as build dep to generate mobile license + + -- Jonathan Kolberg <[email protected]> Sat, 23 Apr 2011 20:39:49 +0200 + kdepim (4:4.5.94.1-0ubuntu1~ppa3) natty; urgency=low * Rebuild with libindicate-qt 0.2.5.91-0ubuntu2 to fix dependency === modified file 'debian/control' --- debian/control 2011-02-10 08:39:59 +0000 +++ debian/control 2011-05-09 14:41:19 +0000 @@ -15,7 +15,7 @@ libstrigihtmlgui-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3), zlib1g-dev, libakonadi-dev (>= 1.4.1), libpisock-dev, shared-desktop-ontologies (>= 0.2), libindicate-qt-dev (>= 0.2.5.91), kdepim-runtime (>= 4:4.5.94), libxml2-dev, sharutils, libgrantlee-dev, - libqt4-opengl-dev + libqt4-opengl-dev, dblatex Standards-Version: 3.8.4 Homepage: http://pim.kde.org/ Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdepim/ubuntu === modified file 'debian/kaddressbook-mobile.install' --- debian/kaddressbook-mobile.install 2010-12-01 18:05:10 +0000 +++ debian/kaddressbook-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,5 +1,4 @@ usr/bin/kaddressbook-mobile -usr/bin/kaddressbook-mobile.sh usr/share/kde4/apps/kaddressbook-mobile/BulkActionComponent.qml usr/share/kde4/apps/kaddressbook-mobile/ConfigDialog.qml usr/share/kde4/apps/kaddressbook-mobile/contact-editor.qml === modified file 'debian/kaddressbook.install' --- debian/kaddressbook.install 2010-12-01 18:05:10 +0000 +++ debian/kaddressbook.install 2011-05-09 14:41:19 +0000 @@ -9,10 +9,13 @@ usr/lib/libkaddressbookprivate.so.4 usr/lib/libkaddressbookprivate.so.4.6.0 usr/share/applications/kde4/kaddressbook.desktop +usr/share/icons/hicolor/128x128/apps/kaddressbook.png usr/share/icons/hicolor/16x16/apps/kaddressbook.png usr/share/icons/hicolor/22x22/apps/kaddressbook.png usr/share/icons/hicolor/32x32/apps/kaddressbook.png usr/share/icons/hicolor/48x48/apps/kaddressbook.png +usr/share/icons/hicolor/64x64/apps/kaddressbook.png +usr/share/icons/hicolor/scalable/apps/kaddressbook.svgz usr/share/kde4/apps/kaddressbook/kaddressbookui.rc usr/share/kde4/apps/kaddressbook/printing/detailed-style.png usr/share/kde4/apps/kaddressbook/printing/mike-style.png === modified file 'debian/kjots.install' --- debian/kjots.install 2010-12-04 14:09:05 +0000 +++ debian/kjots.install 2011-05-09 14:41:19 +0000 @@ -15,6 +15,13 @@ usr/share/icons/oxygen/32x32/actions/edit-delete-page.png usr/share/icons/oxygen/48x48/actions/edit-delete-page.png usr/share/icons/oxygen/scalable/actions/edit-delete-page.svgz +usr/share/icons/hicolor/64x64/apps/korg-journal.png +usr/share/icons/hicolor/32x32/apps/korg-journal.png +usr/share/icons/hicolor/48x48/apps/korg-journal.png +usr/share/icons/hicolor/16x16/apps/korg-journal.png +usr/share/icons/hicolor/128x128/apps/korg-journal.png +usr/share/icons/hicolor/22x22/apps/korg-journal.png +usr/share/icons/hicolor/scalable/apps/korg-journal.svgz usr/share/kde4/apps/kjots/kjotspartui.rc usr/share/kde4/apps/kjots/kjotsui.rc usr/share/kde4/apps/kontact/ksettingsdialog/kjots.setdlg === modified file 'debian/kleopatra.install' --- debian/kleopatra.install 2010-12-04 14:09:05 +0000 +++ debian/kleopatra.install 2011-05-09 14:41:19 +0000 @@ -11,14 +11,6 @@ usr/share/doc/kde/HTML/en/kleopatra/common usr/share/doc/kde/HTML/en/kleopatra/index.cache.bz2 usr/share/doc/kde/HTML/en/kleopatra/index.docbook -usr/share/icons/oxygen/128x128/apps/kleopatra.png -usr/share/icons/oxygen/16x16/apps/kleopatra.png -usr/share/icons/oxygen/22x22/apps/kleopatra.png -usr/share/icons/oxygen/256x256/apps/kleopatra.png -usr/share/icons/oxygen/32x32/apps/kleopatra.png -usr/share/icons/oxygen/48x48/apps/kleopatra.png -usr/share/icons/oxygen/64x64/apps/kleopatra.png -usr/share/icons/oxygen/scalable/apps/kleopatra.svgz usr/share/kde4/apps/kleopatra/kleopatra.rc usr/share/kde4/apps/kleopatra/pics/gpg4win-compact.png usr/share/kde4/apps/kleopatra/pics/gpg4win.png @@ -45,3 +37,11 @@ usr/share/kde4/services/kleopatra_decryptverifyfolders.desktop usr/share/kde4/services/kleopatra_signencryptfiles.desktop usr/share/kde4/services/kleopatra_signencryptfolders.desktop +usr/share/icons/hicolor/64x64/apps/kleopatra.png +usr/share/icons/hicolor/32x32/apps/kleopatra.png +usr/share/icons/hicolor/48x48/apps/kleopatra.png +usr/share/icons/hicolor/16x16/apps/kleopatra.png +usr/share/icons/hicolor/128x128/apps/kleopatra.png +usr/share/icons/hicolor/256x256/apps/kleopatra.png +usr/share/icons/hicolor/22x22/apps/kleopatra.png +usr/share/icons/hicolor/scalable/apps/kleopatra.svgz === modified file 'debian/kmail-mobile.install' --- debian/kmail-mobile.install 2011-02-10 08:39:59 +0000 +++ debian/kmail-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,5 +1,4 @@ usr/bin/kmail-mobile -usr/bin/kmail-mobile.sh usr/share/kde4/apps/kmail-mobile/AclEditor.qml usr/share/kde4/apps/kmail-mobile/AttachmentEditor.qml usr/share/kde4/apps/kmail-mobile/BulkActionComponent.qml === modified file 'debian/knode.install' --- debian/knode.install 2010-12-01 18:05:10 +0000 +++ debian/knode.install 2011-05-09 14:41:19 +0000 @@ -6,15 +6,12 @@ usr/lib/libknodecommon.so.4.6.0 usr/share/applications/kde4/KNode.desktop usr/share/icons/hicolor/128x128/apps/knode.png -usr/share/icons/hicolor/128x128/apps/knode2.png usr/share/icons/hicolor/16x16/apps/knode.png -usr/share/icons/hicolor/16x16/apps/knode2.png +usr/share/icons/hicolor/22x22/apps/knode.png usr/share/icons/hicolor/32x32/apps/knode.png -usr/share/icons/hicolor/32x32/apps/knode2.png usr/share/icons/hicolor/48x48/apps/knode.png -usr/share/icons/hicolor/48x48/apps/knode2.png usr/share/icons/hicolor/64x64/apps/knode.png -usr/share/icons/hicolor/64x64/apps/knode2.png +usr/share/icons/hicolor/scalable/apps/knode.svgz usr/share/kde4/apps/kconf_update/knode.upd usr/share/kde4/apps/knode/filters/1.fltr usr/share/kde4/apps/knode/filters/2.fltr === modified file 'debian/knotes-mobile.install' --- debian/knotes-mobile.install 2010-12-04 14:09:05 +0000 +++ debian/knotes-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,5 +1,4 @@ usr/bin/notes-mobile -usr/bin/notes-mobile.sh usr/share/kde4/apps/notes-mobile/notes.qml usr/share/kde4/apps/notes-mobile/NoteActions.qml usr/share/kde4/apps/notes-mobile/BulkActionComponent.qml === modified file 'debian/knotes.install' --- debian/knotes.install 2009-11-15 23:53:38 +0000 +++ debian/knotes.install 2011-05-09 14:41:19 +0000 @@ -9,10 +9,11 @@ usr/share/icons/hicolor/32x32/apps/knotes.png usr/share/icons/hicolor/48x48/apps/knotes.png usr/share/icons/hicolor/64x64/apps/knotes.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png -usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png +usr/share/icons/hicolor/scalable/apps/knotes.svgz +usr/share/icons/oxygen/16x16/actions/knotes_alarm.png +usr/share/icons/oxygen/16x16/actions/knotes_delete.png +usr/share/icons/oxygen/16x16/actions/knotes_close.png +usr/share/icons/oxygen/16x16/actions/knotes_date.png usr/share/kde4/apps/knotes/knotes_part.rc usr/share/kde4/apps/knotes/knotesappui.rc usr/share/kde4/apps/knotes/knotesui.rc === modified file 'debian/kontact-mobile.install' --- debian/kontact-mobile.install 2010-12-04 21:11:26 +0000 +++ debian/kontact-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,3 +1,5 @@ usr/share/kde4/apps/kontact-touch/licenses.pdf -usr/share/doc/kde/HTML/de/kontact-touch/manual/index.html -usr/share/doc/kde/HTML/en/kontact-touch/manual/index.html +usr/share/kde4/apps/kontact-touch/de/manual/index.html +usr/share/kde4/apps/kontact-touch/de/mail/templateshelp.html +usr/share/kde4/apps/kontact-touch/en/manual/index.html +usr/share/kde4/apps/kontact-touch/en/mail/templateshelp.html === modified file 'debian/kontact.install' --- debian/kontact.install 2010-12-01 18:05:10 +0000 +++ debian/kontact.install 2011-05-09 14:41:19 +0000 @@ -14,6 +14,7 @@ usr/share/icons/hicolor/32x32/apps/kontact.png usr/share/icons/hicolor/48x48/apps/kontact.png usr/share/icons/hicolor/64x64/apps/kontact.png +usr/share/icons/hicolor/scalable/apps/kontact.svgz usr/share/kde4/apps/kontact/about/kontact.css usr/share/kde4/apps/kontact/about/main.html usr/share/kde4/apps/kontact/about/top-left-kontact.png === modified file 'debian/korganizer-mobile.install' --- debian/korganizer-mobile.install 2010-12-01 18:05:10 +0000 +++ debian/korganizer-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,5 +1,4 @@ usr/bin/korganizer-mobile -usr/bin/korganizer-mobile.sh usr/share/kde4/apps/korganizer-mobile/BulkActionComponent.qml usr/share/kde4/apps/korganizer-mobile/ConfigDialog.qml usr/share/kde4/apps/korganizer-mobile/korganizer-mobile.qml === modified file 'debian/korganizer.install' --- debian/korganizer.install 2010-12-01 18:05:10 +0000 +++ debian/korganizer.install 2011-05-09 14:41:19 +0000 @@ -38,7 +38,6 @@ usr/share/kde4/apps/kconf_update/korganizer.upd usr/share/kde4/apps/kontact/ksettingsdialog/korganizer.setdlg usr/share/kde4/apps/kontact/ksettingsdialog/specialdates.setdlg -usr/share/kde4/apps/korgac/icons/hicolor/22x22/actions/korgac.png usr/share/kde4/apps/korganizer/korganizer_part.rc usr/share/kde4/apps/korganizer/korganizerui.rc usr/share/kde4/apps/korganizer/sounds/alert.wav @@ -47,6 +46,13 @@ usr/share/kde4/apps/korganizer/sounds/onscreen.wav usr/share/kde4/apps/korganizer/sounds/spinout.wav usr/share/kde4/apps/korganizer/tips +usr/share/kde4/apps/korgac/icons/hicolor/32x32/apps/korgac.png +usr/share/kde4/apps/korgac/icons/hicolor/16x16/apps/korgac.png +usr/share/kde4/apps/korgac/icons/hicolor/64x64/apps/korgac.png +usr/share/kde4/apps/korgac/icons/hicolor/128x128/apps/korgac.png +usr/share/kde4/apps/korgac/icons/hicolor/256x256/apps/korgac.png +usr/share/kde4/apps/korgac/icons/hicolor/22x22/apps/korgac.png +usr/share/kde4/apps/korgac/icons/hicolor/scalable/apps/korgac.svgz usr/share/kde4/config.kcfg/korganizer.kcfg usr/share/kde4/config/korganizer.knsrc usr/share/kde4/services/kcmapptsummary.desktop === modified file 'debian/ktimetracker.install' --- debian/ktimetracker.install 2009-11-15 23:53:38 +0000 +++ debian/ktimetracker.install 2011-05-09 14:41:19 +0000 @@ -11,6 +11,7 @@ usr/share/icons/hicolor/48x48/apps/ktimetracker.png usr/share/icons/hicolor/64x64/apps/ktimetracker.png usr/share/kde4/apps/kontact/ksettingsdialog/ktimetracker.setdlg +usr/share/kde4/apps/kontact/ktimetrackerui.rc usr/share/kde4/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png usr/share/kde4/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png usr/share/kde4/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png === modified file 'debian/notes-mobile.install' --- debian/notes-mobile.install 2010-12-01 18:05:10 +0000 +++ debian/notes-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,5 +1,4 @@ usr/bin/notes-mobile -usr/bin/notes-mobile.sh usr/share/applications/kde4/notes-mobile.desktop usr/share/kde4/apps/notes-mobile/BulkActionComponent.qml usr/share/kde4/apps/notes-mobile/notes.qml === modified file 'debian/patches/kubuntu_01_install_headers.diff' --- debian/patches/kubuntu_01_install_headers.diff 2010-12-01 18:05:10 +0000 +++ debian/patches/kubuntu_01_install_headers.diff 2011-05-09 14:41:19 +0000 @@ -1,7 +1,7 @@ -Index: kdepim-4.5.80/kleopatra/libkleopatraclient/CMakeLists.txt +Index: kdepim-4.5.95/kleopatra/libkleopatraclient/CMakeLists.txt =================================================================== ---- kdepim-4.5.80.orig/kleopatra/libkleopatraclient/CMakeLists.txt 2010-11-27 22:25:47.000000000 +0000 -+++ kdepim-4.5.80/kleopatra/libkleopatraclient/CMakeLists.txt 2010-11-27 23:59:59.868693834 +0000 +--- kdepim-4.5.95.orig/kleopatra/libkleopatraclient/CMakeLists.txt 2011-04-12 00:49:40.000000000 +0200 ++++ kdepim-4.5.95/kleopatra/libkleopatraclient/CMakeLists.txt 2011-04-23 20:53:23.000000000 +0200 @@ -6,3 +6,8 @@ add_subdirectory( tests ) @@ -11,10 +11,10 @@ + DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient + ) + -Index: kdepim-4.5.80/kleopatra/libkleopatraclient/core/CMakeLists.txt +Index: kdepim-4.5.95/kleopatra/libkleopatraclient/core/CMakeLists.txt =================================================================== ---- kdepim-4.5.80.orig/kleopatra/libkleopatraclient/core/CMakeLists.txt 2010-11-27 22:25:47.000000000 +0000 -+++ kdepim-4.5.80/kleopatra/libkleopatraclient/core/CMakeLists.txt 2010-11-27 23:59:59.878693825 +0000 +--- kdepim-4.5.95.orig/kleopatra/libkleopatraclient/core/CMakeLists.txt 2011-04-12 00:49:40.000000000 +0200 ++++ kdepim-4.5.95/kleopatra/libkleopatraclient/core/CMakeLists.txt 2011-04-23 20:53:23.000000000 +0200 @@ -56,3 +56,11 @@ ) @@ -27,11 +27,11 @@ + signencryptfilescommand.h + DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core + ) -\ No newline at end of file -Index: kdepim-4.5.80/kleopatra/libkleopatraclient/gui/CMakeLists.txt +\ Kein Zeilenumbruch am Dateiende. +Index: kdepim-4.5.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt =================================================================== ---- kdepim-4.5.80.orig/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2010-11-27 22:25:47.000000000 +0000 -+++ kdepim-4.5.80/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2010-11-27 23:59:59.878693825 +0000 +--- kdepim-4.5.95.orig/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2011-04-12 00:49:40.000000000 +0200 ++++ kdepim-4.5.95/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2011-04-23 20:53:23.000000000 +0200 @@ -20,3 +20,8 @@ DESTINATION ${LIB_INSTALL_DIR} ) @@ -41,11 +41,11 @@ + certificaterequester.h + DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui + ) -\ No newline at end of file -Index: kdepim-4.5.80/libkpgp/CMakeLists.txt +\ Kein Zeilenumbruch am Dateiende. +Index: kdepim-4.5.95/libkpgp/CMakeLists.txt =================================================================== ---- kdepim-4.5.80.orig/libkpgp/CMakeLists.txt 2010-11-27 22:25:47.000000000 +0000 -+++ kdepim-4.5.80/libkpgp/CMakeLists.txt 2010-11-27 23:59:59.878693825 +0000 +--- kdepim-4.5.95.orig/libkpgp/CMakeLists.txt 2011-04-12 00:49:40.000000000 +0200 ++++ kdepim-4.5.95/libkpgp/CMakeLists.txt 2011-04-23 20:53:23.000000000 +0200 @@ -35,3 +35,11 @@ install(FILES kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) install(PROGRAMS kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) === modified file 'debian/patches/kubuntu_30_debianize_akregator_default.diff' --- debian/patches/kubuntu_30_debianize_akregator_default.diff 2009-11-24 20:32:37 +0000 +++ debian/patches/kubuntu_30_debianize_akregator_default.diff 2011-05-09 14:41:19 +0000 @@ -1,6 +1,8 @@ ---- a/akregator/src/akregator_part.cpp -+++ b/akregator/src/akregator_part.cpp -@@ -133,6 +133,25 @@ namespace { +Index: kdepim-4.5.95/akregator/src/akregator_part.cpp +=================================================================== +--- kdepim-4.5.95.orig/akregator/src/akregator_part.cpp 2011-04-12 00:49:40.000000000 +0200 ++++ kdepim-4.5.95/akregator/src/akregator_part.cpp 2011-04-23 20:53:23.000000000 +0200 +@@ -140,6 +140,25 @@ look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf";); mainFolder.appendChild(look); === modified file 'debian/tasks-mobile.install' --- debian/tasks-mobile.install 2010-12-01 18:05:10 +0000 +++ debian/tasks-mobile.install 2011-05-09 14:41:19 +0000 @@ -1,5 +1,4 @@ usr/bin/tasks-mobile -usr/bin/tasks-mobile.sh usr/share/kde4/apps/tasks-mobile/BulkActionComponent.qml usr/share/kde4/apps/tasks-mobile/ConfigDialog.qml usr/share/kde4/apps/tasks-mobile/tasks.qml @@ -9,3 +8,10 @@ usr/share/icons/hicolor/48x48/apps/tasks-mobile.png usr/share/icons/hicolor/64x64/apps/tasks-mobile.png usr/share/applications/kde4/tasks-mobile.desktop +usr/share/icons/hicolor/64x64/apps/korg-todo.png +usr/share/icons/hicolor/32x32/apps/korg-todo.png +usr/share/icons/hicolor/48x48/apps/korg-todo.png +usr/share/icons/hicolor/16x16/apps/korg-todo.png +usr/share/icons/hicolor/128x128/apps/korg-todo.png +usr/share/icons/hicolor/22x22/apps/korg-todo.png +usr/share/icons/hicolor/scalable/apps/korg-todo.svgz
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
