[SCM] konsole packaging branch, master, updated. debian/14.12.3-1-15-gc94e1a4

Fri Jul 24 01:16:47 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=990b6e4

The following commit has been merged in the master branch:
commit 990b6e42fd423cbdb0335e2cf7e94f62018524e2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 23 22:13:37 2015 -0300

    Revert the src and binary renaming.
    
    We fixed the upgrade by renaming the old src:konsole to src:konsole4
    which only provides konsole4-kpart.
    
    Now this src package can still be named src:konsole and provide
    bin:konsole without a rename.
---
 debian/changelog                                   |  4 +---
 debian/control                                     | 24 +++++++++++-----------
 ...onsole5-kpart.install => konsole-kpart.install} |  0
 debian/konsole-kpart.lintian-overrides             |  1 +
 debian/{konsole5.install => konsole.install}       |  0
 debian/konsole.lintian-overrides                   |  5 +++++
 debian/{konsole5.postinst => konsole.postinst}     |  0
 debian/{konsole5.prerm => konsole.prerm}           |  0
 debian/konsole5-kpart.lintian-overrides            |  1 -
 debian/konsole5.lintian-overrides                  |  5 -----
 debian/rules                                       |  2 +-
 11 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed07d3c..c079011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-konsole5 (4:15.04.3-1~) UNRELEASED; urgency=medium
+konsole (4:15.04.3-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.04.0).
   * New upstream release (15.04.1).
   * Remove upstream patch: upstream_control-space.diff
   * New upstream release (15.04.2).
   * New upstream release (15.04.3).
-  * Rename src and binary packages to konsole5 (qt5 version) to allow a
-    smooth upgrade path.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:30:14 +0200
 
diff --git a/debian/control b/debian/control
index b1e6380..ef4aa9f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: konsole5
+Source: konsole
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -39,14 +39,14 @@ Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/konsole.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/konsole.git
 
-Package: konsole5
+Package: konsole
 Architecture: any
-Depends: konsole5-kpart (= ${binary:Version}),
+Depends: konsole-kpart (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: konsole (<= 4:15.04.3-1~)
-Replaces: konsole (<= 4:15.04.3-1~)
 Provides: x-terminal-emulator
+Conflicts: konsole5
+Replaces: konsole5
 Description: X terminal emulator
  Konsole is a terminal emulator built on the KDE Platform. It can contain
  multiple terminal sessions inside one window using detachable tabs.
@@ -54,11 +54,11 @@ Description: X terminal emulator
  Konsole supports powerful terminal features, such as customizable schemes,
  saved sessions, and output monitoring.
 
-Package: konsole5-kpart
+Package: konsole-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: konsole-kpart (<= 4:15.04.3-1~)
-Replaces: konsole-kpart (<= 4:15.04.3-1~)
+Conflicts: konsole5
+Replaces: konsole5
 Description: Konsole plugin for Qt applications
  Konsole is a terminal emulator built on the KDE Platform. It can contain
  multiple terminal sessions inside one window using detachable tabs.
@@ -66,13 +66,13 @@ Description: Konsole plugin for Qt applications
  Konsole supports powerful terminal features, such as customizable schemes,
  saved sessions, and output monitoring.
 
-Package: konsole5-dbg
+Package: konsole-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: konsole5 (= ${binary:Version}), ${misc:Depends}
-Breaks: konsole-dbg (<= 4:15.04.3-1~)
-Replaces: konsole-dbg (<= 4:15.04.3-1~)
+Depends: konsole (= ${binary:Version}), ${misc:Depends}
+Breaks: kdebase-dbg (<< 4:4.6.80)
+Replaces: kdebase-dbg (<< 4:4.6.80)
 Description: debugging symbols for the KDE X terminal emulator
  This package contains debugging files used to investigate problems with
  binaries included in the KDE X terminal emulator.
diff --git a/debian/konsole5-kpart.install b/debian/konsole-kpart.install
similarity index 100%
rename from debian/konsole5-kpart.install
rename to debian/konsole-kpart.install
diff --git a/debian/konsole-kpart.lintian-overrides b/debian/konsole-kpart.lintian-overrides
new file mode 100644
index 0000000..c83032e
--- /dev/null
+++ b/debian/konsole-kpart.lintian-overrides
@@ -0,0 +1 @@
+konsole-kpart: package-name-doesnt-match-sonames libkonsoleprivate3
diff --git a/debian/konsole5.install b/debian/konsole.install
similarity index 100%
rename from debian/konsole5.install
rename to debian/konsole.install
diff --git a/debian/konsole.lintian-overrides b/debian/konsole.lintian-overrides
new file mode 100644
index 0000000..a8d4a3c
--- /dev/null
+++ b/debian/konsole.lintian-overrides
@@ -0,0 +1,5 @@
+konsole: package-name-doesnt-match-sonames libkdeinit5-konsole
+konsole: shlib-without-versioned-soname usr/lib/*/libkdeinit5_konsole.so libkdeinit5_konsole.so
+konsole: binary-without-manpage usr/bin/konsole
+konsole: binary-without-manpage usr/bin/konsoleprofile
+konsole: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_konsole.so
\ No newline at end of file
diff --git a/debian/konsole5.postinst b/debian/konsole.postinst
similarity index 100%
rename from debian/konsole5.postinst
rename to debian/konsole.postinst
diff --git a/debian/konsole5.prerm b/debian/konsole.prerm
similarity index 100%
rename from debian/konsole5.prerm
rename to debian/konsole.prerm
diff --git a/debian/konsole5-kpart.lintian-overrides b/debian/konsole5-kpart.lintian-overrides
deleted file mode 100644
index 3de28e9..0000000
--- a/debian/konsole5-kpart.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-konsole5-kpart: package-name-doesnt-match-sonames libkonsoleprivate*
diff --git a/debian/konsole5.lintian-overrides b/debian/konsole5.lintian-overrides
deleted file mode 100644
index d97484e..0000000
--- a/debian/konsole5.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-konsole5: package-name-doesnt-match-sonames libkdeinit5-konsole
-konsole5: shlib-without-versioned-soname usr/lib/*/libkdeinit5_konsole.so libkdeinit5_konsole.so
-konsole5: binary-without-manpage usr/bin/konsole
-konsole5: binary-without-manpage usr/bin/konsoleprofile
-konsole5: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_konsole.so
diff --git a/debian/rules b/debian/rules
index 589f583..cd4fd62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@ override_dh_auto_test:
 	:
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=konsole5-dbg
+	$(overridden_command) --dbg-package=konsole-dbg

-- 
konsole packaging

