[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.4.5-2-54-g509a0cf
Modestas Vainius
modax at alioth.debian.org
Tue Mar 29 01:17:18 UTC 2011
The following commit has been merged in the master branch:
commit ee3dedcf55f0c65e0d3920f757be0791498cb217
Merge: 5e4fce4931748c5ec1c4ca9d944bd752349bfec4 8c980478307db032d4ad5b03b7469560677fbaff
Author: Modestas Vainius <modax at debian.org>
Date: Tue Mar 29 03:24:32 2011 +0300
Merge branch 'kde4.4'
Conflicts:
debian/changelog
debian/control
debian/libkonq5a.install
debian/changelog | 8 ++++++++
debian/control | 14 +++++++++++++-
.../{libkonq5a.install => libkonq-common.install} | 2 --
debian/libkonq5a.install | 12 ------------
4 files changed, 21 insertions(+), 15 deletions(-)
diff --cc debian/changelog
index 5f84cea,b82a8fc..6c50648
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,57 -1,11 +1,65 @@@
+kdebase (4:4.6.1-0r1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - fixes broken keyboard navigation in "column view" mode in dolphin
+ (Closes: #582023)
+ - waits for the screen saver lock before suspending (Closes: #580370)
+ - fixes faulty deletion of cookie policies when the policy list is filtered
+ (Closes: #602140)
+ - fixes WebDAV PUT requests not being issued (Closes: #602939)
+ - fixes first-letter search in konqueror details mode (Closes: #354874)
+ - places are now added below the currently selected place (Closes: #547559)
+ - better handling of whitespace in man: urls (Closes: #283472)
+ - adds metadata to the file properties dialog (Closes: #532411)
+ - adds context menu for Konsole tabs (Closes: #532412)
+ - Konqueror now detects duplicate web shortcuts (Closes: #479965)
+ * Update installed files.
+ * Update libkonq symbols file.
+
+ [ George Kiagiadakis ]
+ * Change my email address in uploaders.
+ * Remove the kinfocenter package (moved to kdebase-workspace).
+ * Remove the kappfinder package (removed upstream).
+ * Refresh patches.
+ * Remove unused build dependencies:
+ - libsmbclient-dev
+ - libusb-dev
+ - libraw1394-dev
+ - libglu1-mesa-dev
+ - libpci-dev
+ - libxext-dev
+ * Rename libkonq5 to libkonq5a because BC was broken.
+ * Fix some lintian warnings related to package descriptions.
+ * Make dolphin suggest kdesdk-dolphin-plugins.
+ * Bump kdelibs5-dev build dependency to version 4:4.6.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
+ * Bump S-V to 3.9.1; update Replaces/Breaks/Conflicts.
+ * Refresh debian-T-addition.diff.
+ * Make Konsole long description smaller than 80 columns.
+ * Add lintian overrides.
+ * Add myself to Uploaders.
+
+ [ Pino Toscano ]
+ * Modify the descriptions of few packages:
+ - improve konqueror-nsplugins. (Closes: #614947)
+ - fix typo in kwrite. (Closes: #618041)
+
+ [ Modestas Vainius ]
+ * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
+ * Do not run testsuite.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 15 Nov 2010 14:20:25 +0200
+
+ kdebase (4:4.4.5-3) unstable; urgency=low
+
+ * Split off support files from libkonq5 to the libkonq-common package and
+ make libkonq5 depend on libkonq-common. This is needed for better
+ co-installability with KDE SC 4.6.
+
+ -- Modestas Vainius <modax at debian.org> Tue, 29 Mar 2011 03:03:39 +0300
+
kdebase (4:4.4.5-2) unstable; urgency=high
* Point debian/control Vcs fields to the new Git repository.
diff --cc debian/control
index f776824,095ae1a..052f9ca
--- a/debian/control
+++ b/debian/control
@@@ -165,12 -177,11 +165,12 @@@ Description: simple graphical text edit
.
This package is part of the KDE base applications module.
-Package: libkonq5
+Package: libkonq5a
Section: libs
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq5-templates
+ Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq-common (>= ${binary:Version})
-Replaces: kdebase-data (<< 4:4.1.80), kdebase-bin (<< 4:4.1.80)
+Replaces: kdebase-data (<< 4:4.1.80), kdebase-bin (<< 4:4.1.80), libkonq5
+Breaks: kdebase-data (<< 4:4.1.80), kdebase-bin (<< 4:4.1.80), libkonq5
Description: core libraries for Konqueror
This package contains libraries used by several KDE 4 applications,
particularly Konqueror.
diff --cc debian/libkonq5a.install
index 0e13ec6,0000000..285e4fe
mode 100644,000000..100644
--- a/debian/libkonq5a.install
+++ b/debian/libkonq5a.install
@@@ -1,14 -1,0 +1,2 @@@
- usr/lib/kde4/kded_favicons.so
- usr/lib/kde4/konq_sound.so
+usr/lib/libkonq.so.5
+usr/lib/libkonq.so.5.6.0
- usr/share/kde4/apps/kbookmark/directory_bookmarkbar.desktop
- usr/share/kde4/apps/kconf_update/favicons.upd
- usr/share/kde4/apps/kconf_update/move_favicons.sh
- usr/share/kde4/apps/konqueror/pics/arrow_bottomleft.png
- usr/share/kde4/apps/konqueror/pics/arrow_bottomright.png
- usr/share/kde4/apps/konqueror/pics/arrow_topleft.png
- usr/share/kde4/apps/konqueror/pics/arrow_topright.png
- usr/share/kde4/services/kded/favicons.desktop
- usr/share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
- usr/share/kde4/servicetypes/konqpopupmenuplugin.desktop
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list