[SCM] KDE PIM module packaging branch, experimental, updated. debian/4.4.11.1+l10n-3-72-g86d9371

Modestas Vainius modax at alioth.debian.org
Sun Jun 10 15:19:38 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=10c6393

The following commit has been merged in the experimental branch:
commit 10c6393c5e48912ace9067f25afc24924904a04a
Merge: f681811cd2f82e84722bcfeca38fa664831feda4 4008eaff5a9bf324b98902d3077d9443db99f38b
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 10 18:06:11 2012 +0300

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/akregator.install
    	debian/blogilo.install
    	debian/changelog
    	debian/kaddressbook.install
    	debian/kalarm.install
    	debian/kdepim-groupware.install
    	debian/kdepim-kresources.install
    	debian/kdepim-wizards.install
    	debian/kjots.install
    	debian/kleopatra.install
    	debian/kmail.install
    	debian/knode.install
    	debian/knotes.install
    	debian/konsolekalendar.install
    	debian/kontact.install
    	debian/korganizer.install
    	debian/ktimetracker.install
    	debian/libkdepim4.install
    	debian/libkleo4.install
    	debian/libkpgp4.install
    	debian/libksieve4.install
    	debian/libmessagecore4.install
    	debian/libmessagelist4.install
    	debian/libmessageviewer0.install
    	debian/patches/series

 debian/changelog                                   |   39 ++++++++++++++-
 debian/patches/debian_set_library_version.diff     |   22 +++++++++
 debian/patches/debianize_akregator_default.diff    |    6 ++-
 debian/patches/series                              |    5 ++
 ...Fix-crash-displaying-New-Alarm-dialog-fro.patch |   50 ++++++++++++++++++++
 debian/patches/upstream_Build-with-clang.patch     |   25 ++++++++++
 .../upstream_Fix-crash-in-Folder-destructor.patch  |   36 ++++++++++++++
 ...g-c4_String-only-call-memset-if-the-numbe.patch |   31 ++++++++++++
 8 files changed, 210 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 735b2f4,fb266de..1878a73
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,40 +1,99 @@@
 +kdepim (4:4.8.4-0r0) UNRELEASED; urgency=low
 +
 +  * TODO: copyright, package descriptions,
 +          figure out how to pull kdepim-runtime 4:4.6 (Breaks maybe?).
 +
 +  * New upstream release.
 +
 +  [ George Kiagiadakis ]
 +  * Add myself to uploaders.
 +  * Refresh patches.
 +  * Add build dependency on libgrantlee-dev.
 +  * Add new library packages:
 +    - libincidenceeditors4;
 +    - libkdepimdbusinterfaces4;
 +    - libmessagecomposer4;
 +    - libtemplateparser4;
 +  * Update lintian overrides.
 +
 +  [ Jan Losinski ]
 +  * Update installed files.
 +
 +  [ Adrian von Bidder ]
 +  * Adjust build dependencies.
 +  * Add new library packages:
 +    - libcalendarsupport4;
 +    - libincidenceeditorsng4 (renamed from libincidenceeditors4);
 +    - libeventviews4;
 +    - libkdgantt2-0;
 +    - libkmanagesieve4;
 +    - libksieveui4;
 +    - libmailcommon4;
 +    - libmessageviewer4 (renamed from libmessageviewer0).
 +
 +  [ Modestas Vainius ]
-   * Wildcardize l10n stuff in *.install files.
-   * Wildcardize documentation.
 +  * Drop kdepim_l10n.diff patch, not needed.
 +  * Drop displaying_only_unread_issue.diff patch, applied upstream.
 +  * Do not build mobile components for now (-DKDEPIM_BUILD_MOBILE=OFF).
 +  * Remove unused translations right after they dh_auto_install'ed. This
 +    will unclutter debian/not-installed.
 +  * Move kdepim-dbg to the bottom of debian/control.
 +  * Drop ${perl:Depends} from kdepim-groupware Depends.
 +  * Add ${perl:Depends} to libkpgp4 Depends.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
 +  * Bump build depends on other KDE SC packages to 4:4.7.
 +  * Bump shared-desktop-ontologies build depend to 0.6.50.
 +  * Update installed files.
 +
 +  [ Eshat Cakar ]
 +  * Add myself to uploaders.
 +  * Bump kdelibs5-dev and kdepimlibs5-dev build dependecies to 4:4.8.
 +  * Add libprision-dev for QR Code support of contacts.
 +  * Remove empty kdepim-groupware and kdepim-wizard packages.
 +  * Bump libakonadi-dev build dependency to 1.7.2.
 +  * Add watch file.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 21:42:03 +0100
 +
+ kdepim (4:4.4.11.1+l10n-3) unstable; urgency=low
+ 
+   * Team upload.
+ 
+   [ Pino Toscano ]
+   * Backport upstream commit 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd to fix
+     the Akregator shutdown with qDeleteAll() of Qt 4.8; patch
+     upstream_Fix-crash-in-Folder-destructor.patch. (Closes: #675498)
+   * Backport upstream commit 645cefecafc3b40f4cb91675703335bfdc8f8b91 to fix
+     building with FORTIFY & GCC 4.7; patch
+     upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch.
+ 
+   [ Modestas Vainius ]
+   * Wildcardize program translations in install files.
+   * Wildcardize documentation translations in install files.
+   * Wildcardize manual page translations in install files.
+ 
+  -- Modestas Vainius <modax at debian.org>  Sun, 10 Jun 2012 15:12:20 +0300
+ 
+ kdepim (4:4.4.11.1+l10n-2) unstable; urgency=low
+ 
+   * Team upload.
+ 
+   [ Pino Toscano ]
+   * debianize_akregator_default.diff: switch from news.debian.net (no more
+     active) to the official news feed @ debian.org. (Closes: #665985)
+   * Override GENERIC_LIB_VERSION and KDE_NON_GENERIC_LIB_VERSION to not depend
+     on the kdelibs version. (Closes: #665083)
+   * Backport upstream commit 4b504e760e0c994e676b55bfaca731d74841f1f4 to fix
+     KAlarm crashes with Qt 4.8.x; patch
+     upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch.
+     (Closes: #671619)
+   * Backport upstream commit 4aa4059b40aed27ae76201baa48f419d1ba09576 to fix
+     building with GCC 4.7; patch upstream_Build-with-clang.patch.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 25 May 2012 16:31:55 -0300
+ 
  kdepim (4:4.4.11.1+l10n-1) unstable; urgency=low
  
    [ José Manuel Santamaría Lema ]
diff --cc debian/patches/series
index 4235252,2a23e3e..f6065f9
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,8 +1,6 @@@
  debianize_akregator_default.diff
 -kdepim_l10n.diff
 -displaying_only_unread_issue.diff
+ debian_set_library_version.diff
+ upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
+ upstream_Build-with-clang.patch
+ upstream_Fix-crash-in-Folder-destructor.patch
+ upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch

-- 
KDE PIM module packaging



More information about the pkg-kde-commits mailing list