[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.6.5-1-19-gdb98a9f

Sun Oct 9 23:56:40 UTC 2011

The following commit has been merged in the master branch:
commit cd9f5e324ffe555680b91f1ce6dbcacfde1006b3
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Oct 10 01:34:01 2011 +0200

    Rename some binay packages, add dummy packages.
---
 debian/changelog                                   |   10 +++-
 debian/control                                     |   66 +++++++++++++++++---
 ...debase-bin.install => kde-baseapps-bin.install} |    0
 debian/kde-baseapps-bin.lintian-overrides          |    3 +
 ...base-data.install => kde-baseapps-data.install} |    0
 debian/kdebase-bin.lintian-overrides               |    3 -
 debian/rules                                       |    2 +-
 debian/source.lintian-overrides                    |    2 +
 8 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index decd783..9b9f0ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,14 @@ kde-baseapps (4:4.7.2-0r0) UNRELEASED; urgency=low
   * Bump kdelibs5-dev build dependency to version 4:4.7.
   * Rename source package from kdebase to kdebase-apps in order to match
     upstream naming.
+  * Rename the following binary packages:
+    - kde-baseapps -> kdebase-apps
+    - kdebase-bin -> kde-baseapps-bin
+    - kdebase-data -> kde-baseapps-data
+    - kdebase-dbg -> kde-baseapps-dbg
+  * Add the following dummy packages:
+    - kdebase-apps
+    - kdebase-dbg
   * Konsole isn't shipped in kdebase source package anymore:
     - Disable debian-T-addition.diff (which only changes Konsole).
     - Comment out konsole binary package in debian/control.
@@ -14,7 +22,7 @@ kde-baseapps (4:4.7.2-0r0) UNRELEASED; urgency=low
   * Add konq-plugins package.
   * Add libtidy-dev build depend.
   * Update installed files.
-  * Remove kdebase-apps metapackage, moved to src:meta-kde.
+  * Update lintian overrides.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Sep 2011 19:44:23 +0200
 
diff --git a/debian/control b/debian/control
index 03ce34d..b1b6478 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,37 @@ Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase.git
 Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdebase.git
 
+Package: kde-baseapps
+Architecture: all
+Depends: ${misc:Depends},
+ dolphin (>= ${source:Version}),
+ kde-baseapps-bin (>= ${source:Version}),
+ kdepasswd (>= ${source:Version}),
+ kfind (>= ${source:Version}), 
+ konqueror (>= ${source:Version}),
+ konsole, 
+ kwrite,
+ plasma-widget-folderview (>= ${source:Version})
+Recommends: konqueror-nsplugins (>= ${source:Version})
+Breaks: kdebase-apps (<< 4:4.7.2)
+Replaces: kdebase-apps (<< 4:4.7.2)
+Description: base applications from the official KDE release (meta-package)
+ KDE is produced by an international technology team that creates free and open
+ source software for desktop and portable computing. Among KDE's products are a
+ modern desktop system for Linux and UNIX platforms, comprehensive office
+ productivity and groupware suites and hundreds of software titles in many
+ categories including Internet and web applications, multimedia, entertainment,
+ educational, graphics and software development.
+ .
+ This package provides core applications for the KDE 4 desktop.
+
+Package: kdebase-apps
+Architecture: all
+Depends: kde-baseapps, ${misc:Depends}
+Description: Transitional package for kde-baseapps
+ This transitional package takes care of pulling in the new kde-baseapps
+ package and can safely be removed after installation.
+
 Package: dolphin
 Section: utils
 Architecture: any
@@ -39,19 +70,22 @@ Description: file manager
  .
  This package is part of the KDE base applications module.
 
-Package: kdebase-bin
+Package: kde-baseapps-bin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-data (= ${source:Version})
-Breaks: kdesktop, kcontrol
+Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Version})
+Breaks: kdesktop, kcontrol, kdebase-bin (<< 4:4.7.2)
+Replaces: kdebase-bin (<< 4:4.7.2)
 Description: core binaries for the KDE base applications
  This package contains miscellaneous programs needed by other KDE
  applications, particularly those in the KDE base module.
  .
  This package is part of the KDE base applications module.
 
-Package: kdebase-data
+Package: kde-baseapps-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: kde-baseapps-data (<< 4:4.7.2)
+Replaces: kde-baseapps-data (<< 4:4.7.2)
 Description: shared data files for the KDE base applications
  This package contains the architecture-independent shared data files needed
  for a basic KDE 4 desktop installation.
@@ -61,7 +95,7 @@ Description: shared data files for the KDE base applications
 Package: kdepasswd
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Version})
 Description: graphical password changing utility
  kdepasswd allows users to change their password, user icon, and other
  information.  A variety of user icons are included.
@@ -81,8 +115,8 @@ Package: konqueror
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-data (= ${source:Version}),
- kdebase-bin (= ${binary:Version}), install-info
+Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Version}),
+ kde-baseapps-bin (= ${binary:Version}), install-info
 Suggests: konq-plugins (>= 4:4.1~)
 Recommends: konqueror-nsplugins (= ${binary:Version}), dolphin
 Description:  advanced file manager, web browser and document viewer
@@ -255,12 +289,24 @@ Description: plasma widget showing the content of a folder
  .
  This package is part of the KDE base applications module.
 
-Package: kdebase-dbg
+Package: kde-baseapps-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: kdebase-runtime-dbg, ${misc:Depends}
-Suggests: kdebase (= ${source:Version})
+Depends: ${misc:Depends}, kde-runtime-dbg, konsole-dbg
+Suggests: kde-baseapps (= ${source:Version})
+Breaks: kdebase-dbg (<< 4:4.7.2)
+Replaces: kdebase-dbg (<< 4:4.7.2)
 Description: debugging symbols for the KDE base applications module
  This package contains debugging files used to investigate problems with
  binaries included in the KDE base applications module.
+
+Package: kdebase-dbg
+Section: debug
+Architecture: all
+Priority: extra
+Depends: kde-baseapps-dbg, ${misc:Depends}
+Description: Transitional package for kde-baseapps-dbg
+ This transitional package takes care of pulling in the new kde-baseapps-dbg
+ package and can safely be removed after installation.
+
diff --git a/debian/kdebase-bin.install b/debian/kde-baseapps-bin.install
similarity index 100%
rename from debian/kdebase-bin.install
rename to debian/kde-baseapps-bin.install
diff --git a/debian/kde-baseapps-bin.lintian-overrides b/debian/kde-baseapps-bin.lintian-overrides
new file mode 100644
index 0000000..63ca065
--- /dev/null
+++ b/debian/kde-baseapps-bin.lintian-overrides
@@ -0,0 +1,3 @@
+kde-baseapps-bin: package-name-doesnt-match-sonames libkbookmarkmodel-private4
+kde-baseapps-bin: breaks-without-version kcontrol
+kde-baseapps-bin: breaks-without-version kdesktop
diff --git a/debian/kdebase-data.install b/debian/kde-baseapps-data.install
similarity index 100%
rename from debian/kdebase-data.install
rename to debian/kde-baseapps-data.install
diff --git a/debian/kdebase-bin.lintian-overrides b/debian/kdebase-bin.lintian-overrides
deleted file mode 100644
index 542a1f9..0000000
--- a/debian/kdebase-bin.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-kdebase-bin: package-name-doesnt-match-sonames libkbookmarkmodel-private4
-kdebase-bin: breaks-without-version kcontrol
-kdebase-bin: breaks-without-version kdesktop
diff --git a/debian/rules b/debian/rules
index 5c93de7..1ab3fcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@ override_dh_makeshlibs:
 	$(overridden_command) -- -c0
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=kdebase-dbg
+	$(overridden_command) --dbg-package=kde-baseapps-dbg
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..e3d5b06
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+kde-baseapps source: dbg-package-missing-depends kdebase-dbg
+kde-baseapps source: dbg-package-missing-depends kde-baseapps-dbg

-- 
KDE Base Applications module packaging

