[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.4.5-2-26-g1362acd

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1362acd721b35adc21dd64475a1f85ce19abd8df
Merge: c200477460a663a1a2b08b0054fb0a3909b98d46 25e551c9bca55209b125d971fbedcd39f371319e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Jan 14 20:59:17 2011 +0200

    Merge branch 'squeeze'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |   11 ++++++++---
 debian/control   |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 5ee8b8c,7a44d9e..c803faf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,11 +1,40 @@@
 +kdebase (4:4.5.95-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
-   [ Modestas Vainius ]
-   * Point debian/control Vcs fields to the new Git repository.
- 
 +  [ George Kiagiadakis ]
 +  * Change my email address in uploaders.
 +  * Remove the kinfocenter package (moved to kdebase-workspace).
 +  * Remove the kappfinder package (removed upstream).
 +  * Refresh patches.
 +  * Update installed files.
 +  * 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.
 +  * Update libkonq5a.symbols.
 +  * Fix some lintian warnings related to package descriptions.
 +  * Make dolphin suggest kdesdk-dolphin-plugins.
 +  * Bump kdelibs5-dev build dependency to version 4:4.5.95.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update installed files.
 +  * Update libkonq5a.symbols.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Nov 2010 14:20:25 +0200
 +
+ kdebase (4:4.4.5-2) unstable; urgency=high
+ 
+   * Point debian/control Vcs fields to the new Git repository.
+   * Remove '| kdestop' from libkonq5 Depends. Just confuses apt pointlessly.
+   * Urgengy=high, important for squeeze release.
+ 
+  -- Modestas Vainius <modax at debian.org>  Thu, 13 Jan 2011 21:38:54 +0200
+ 
  kdebase (4:4.4.5-1) unstable; urgency=low
  
    [ Modestas Vainius ]
diff --cc debian/control
index 107c5d8,40d20d3..06b135f
--- a/debian/control
+++ b/debian/control
@@@ -158,12 -177,11 +158,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 | kdesktop
+ Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq5-templates
 -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
 +Conflicts: libkonq5
  Description: core libraries for Konqueror
   This package contains libraries used by several KDE 4 applications,
   particularly Konqueror.

-- 
KDE Base Applications module packaging