[SCM] KDE Base Workspace module packaging branch, kde4.8, updated. debian/4.7.4-2-16-gb14e173
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sun Mar 18 21:01:52 UTC 2012
The following commit has been merged in the kde4.8 branch:
commit b14e1734388f145880536b61bf542b1429e8f068
Merge: 4bb81c83d0a3b71e3c22e435df565aebc9005c81 b6723e2397513082f22b69cff7176ca700a1f9c6
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sun Mar 18 22:00:25 2012 +0100
Merge branch 'master' into kde4.8
Conflicts:
debian/changelog
debian/changelog | 14 ++++++++++++++
debian/control | 5 ++++-
debian/libkwineffects1abi2.symbols | 6 +++---
debian/libkworkspace4.symbols | 10 +++++-----
debian/libplasmaclock4abi2.symbols | 6 +++---
debian/libprocesscore4abi1.symbols | 6 +++---
debian/libtaskmanager4abi2.symbols | 6 +++---
7 files changed, 35 insertions(+), 18 deletions(-)
diff --cc debian/changelog
index 7fd5621,3bfe858..fb82bc5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,31 @@@
+kde-workspace (4:4.8.1-0r0) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ [ Eshat Cakar ]
+ * Add myself to uploaders.
+ * Bump kdelibs5-dev build dependency to version 4:4.8.
+ * Refresh patches.
+ * Build-depend on kdepimlibs >= 4.8.0 and new libkactivities-dev.
+ * Update not-installed files.
+ * Update installed files.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 04 Jan 2012 18:52:11 +0100
+
+ kde-workspace (4:4.7.4-2) unstable; urgency=low
+
+ * Team upload. Upload to unstable.
+ * Update uploaders, remove Armin.
+
+ [ José Manuel Santamaría Lema ]
+ * Confirm symbols files on more architectures.
+ * The following dummy transitional packages have now priority "extra":
+ - kdebase-workspace
+ - kdebase-workspace-bin
+ - kdebase-workspace-dev
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Tue, 06 Mar 2012 16:12:45 +0100
+
kde-workspace (4:4.7.4-1) experimental; urgency=low
* New upstream release.
diff --cc debian/control
index dd2a805,43ec2f3..004e75c
--- a/debian/control
+++ b/debian/control
@@@ -2,13 -2,13 +2,13 @@@ Source: kde-workspac
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>, Armin Berres <armin+debian at space-based.de>,
+ Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
- José Manuel Santamaría Lema <panfaust at gmail.com>
+ José Manuel Santamaría Lema <panfaust at gmail.com>, Eshat Cakar <info at eshat.de>
Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), dpkg-dev (>= 1.15.5),
- libdlrestrictions-dev (>= 0.14), kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7),
- libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3),
+ libdlrestrictions-dev (>= 0.14), kdelibs5-dev (>= 4:4.8), kdepimlibs5-dev (>= 4:4.8.0),
+ libkactivities-dev, libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3),
libqimageblitz-dev (>= 1:0.0.4-2),
zlib1g-dev,
libdbusmenu-qt-dev (>= 0.6.0),
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list