[SCM] konsole packaging branch, kubuntu_unstable, updated. debian/4.14.2-1-15-g722ba2b

Harald Sitter apachelogger-guest at moszumanska.debian.org
Tue Dec 2 11:12:10 UTC 2014 

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

The following commit has been merged in the kubuntu_unstable branch:
commit fb72335d237e52b4b86e29944ef4179bdf1f4bd4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 28 20:24:52 2014 +0100

     New upstream RC release
    
    * New upstream RC release
    * New upstream release
    * Split kpart into its own package
      + With konsole5 on the horizon we need to enable the installation of
        the konsole4 kpart alongside the konsole5 package to ensure that
        4.x applications relying on the kpart still have access to it.
      + New package konsole4-kpart
      + konsole depends binary:Version of konsole4-kpart
      + konsole4-kpart contains libkonsolepart.so and libkonsoleprivate.so
        along with the relevant kpart desktop file.
        All other files remain in konsole package.
      + konsole4-kpart breaks and replaces old versions of konsole
      + Once the konsole frameworks 5 port gets released this source should then
        be renamed to konsole4 and loose the konsole package (i.e. only produce
        konsole4-kpart)
    * New upstream release
    * New upstream release
    * New upstream beta release RC
    * New upstream beta release
    * New upstream beta release
    * New upstream release
    * Merge with Debian, no changes
---
 debian/changelog       | 78 ++++++++++++++++++++++++++++++++++++++++++++++----
 debian/control         | 15 ++++++----
 debian/konsole.install | 71 +++++++++++++++++++++++----------------------
 debian/rules           |  2 +-
 4 files changed, 119 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07963b0..22f228f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+konsole (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 19:23:42 +0100
+
 konsole (4:4.14.2-1) unstable; urgency=medium
 
   * New upstream release (4.14.2).
@@ -29,6 +35,65 @@ konsole (4:4.13.2-0ubuntu1) utopic; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:41:55 +0100
 
+konsole (4:4.14.2-0ubuntu1) vivid; urgency=medium
+
+  [ Scarlett Clark ]
+  * New upstream release
+
+  [ Harald Sitter ]
+  * Split kpart into its own package
+    + With konsole5 on the horizon we need to enable the installation of
+      the konsole4 kpart alongside the konsole5 package to ensure that
+      4.x applications relying on the kpart still have access to it.
+    + New package konsole4-kpart
+    + konsole depends binary:Version of konsole4-kpart
+    + konsole4-kpart contains libkonsolepart.so and libkonsoleprivate.so
+      along with the relevant kpart desktop file.
+      All other files remain in konsole package.
+    + konsole4-kpart breaks and replaces old versions of konsole
+    + Once the konsole frameworks 5 port gets released this source should then
+      be renamed to konsole4 and loose the konsole package (i.e. only produce
+      konsole4-kpart)
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 05:53:49 -0700
+
+konsole (4:4.14.1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 17:26:14 +0200
+
+konsole (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 13:18:06 +0200
+
+konsole (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release RC
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 17:00:57 +0200
+
+konsole (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 18:27:45 +0200
+
+konsole (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 23:21:14 +0200
+
+konsole (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:41:55 +0100
+
 konsole (4:4.13.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -331,7 +396,7 @@ konsole (4:4.10.90-0ubuntu1) saucy; urgency=low
   * New upstream beta release
 
   [ Philip Muškovac ]
-  * Add doc picture to konsole.install
+  * Add doc picture to konsole.install 
 
  -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 18:19:44 +0100
 
@@ -341,8 +406,8 @@ konsole (4:4.10.80-0ubuntu1) saucy; urgency=low
   * New upstream release
 
   [ Philip Muškovac ]
-  * Refresh debian-T-addition.diff
-  * Update konsole.install
+  * Refresh debian-T-addition.diff 
+  * Update konsole.install 
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:28:57 +0100
 
@@ -569,7 +634,7 @@ konsole (4:4.8.2-0ubuntu1) precise; urgency=low
 
 konsole (4:4.8.1-0ubuntu1) precise; urgency=low
 
-  * New upstream release
+  * New upstream release 
 
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 04 Mar 2012 20:39:13 +0100
 
@@ -635,7 +700,7 @@ konsole (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
   * New upstream release (LP: #872506)
 
   [ Philip Muškovac ]
-  * Add libx11-dev to build-deps so XKB is found.
+  * Add libx11-dev to build-deps so XKB is found. 
 
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 18 Oct 2011 07:28:12 +0200
 
@@ -664,8 +729,9 @@ konsole (4:4.7.0-0ubuntu1) oneiric; urgency=low
 
 konsole (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
 
-  * New upstream release candidate
+  * New upstream release candidate 
     - update for split packaging
   * Repack upstream tar to include COPYING files
 
  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 08 Jul 2011 12:41:10 +0200
+
diff --git a/debian/control b/debian/control
index 328dd9a..67c2bc3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: konsole
 Section: kde
 Priority: optional
-Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 Uploaders: Sune Vuorela <sune at debian.org>,
            Eshat Cakar <info at eshat.de>,
@@ -9,12 +9,15 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev (>= 4:4.11),
-               libkonq5-dev (>= 4:4.11),
-               libphonon-dev (>= 4:4.3.0),
+               kdoctools-dev,
+               kinit-dev,
+               libkf5kdelibs4support-dev,
+               libkf5notifyconfig-dev,
+               libkf5parts-dev,
+               libkf5pty-dev,
                libxkbfile-dev,
-               pkg-kde-tools (>= 0.12)
+               pkg-kde-tools (>= 0.12),
+               qtscript5-dev
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest
 Homepage: http://www.kde.org/
diff --git a/debian/konsole.install b/debian/konsole.install
index 5f41648..5440b09 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -1,36 +1,39 @@
 usr/bin/konsole
 usr/bin/konsoleprofile
-usr/lib/kde4/libkonsolepart.so
-usr/lib/libkdeinit4_konsole.so
-usr/lib/libkonsoleprivate.so
-usr/share/applications/kde4/konsole.desktop
-usr/share/doc/kde/HTML/*/konsole/
-usr/share/kde4/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
-usr/share/kde4/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
-usr/share/kde4/apps/kconf_update/konsole-2.9.0-global-options.sh
-usr/share/kde4/apps/kconf_update/konsole.upd
-usr/share/kde4/apps/kconf_update/konsole_remove_background_mode.upd
-usr/share/kde4/apps/konsole/BlackOnLightYellow.colorscheme
-usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
-usr/share/kde4/apps/konsole/BlackOnWhite.colorscheme
-usr/share/kde4/apps/konsole/BlueOnBlack.colorscheme
-usr/share/kde4/apps/konsole/DarkPastels.colorscheme
-usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
-usr/share/kde4/apps/konsole/Linux.colorscheme
-usr/share/kde4/apps/konsole/README.KeyTab
-usr/share/kde4/apps/konsole/RedOnBlack.colorscheme
-usr/share/kde4/apps/konsole/Shell.profile
-usr/share/kde4/apps/konsole/Solarized.colorscheme
-usr/share/kde4/apps/konsole/SolarizedLight.colorscheme
-usr/share/kde4/apps/konsole/WhiteOnBlack.colorscheme
-usr/share/kde4/apps/konsole/default.keytab
-usr/share/kde4/apps/konsole/konsole.notifyrc
-usr/share/kde4/apps/konsole/konsoleui.rc
-usr/share/kde4/apps/konsole/linux.keytab
-usr/share/kde4/apps/konsole/partui.rc
-usr/share/kde4/apps/konsole/sessionui.rc
-usr/share/kde4/apps/konsole/solaris.keytab
-usr/share/kde4/services/ServiceMenus/konsolehere.desktop
-usr/share/kde4/services/ServiceMenus/konsolerun.desktop
-usr/share/kde4/services/konsolepart.desktop
-usr/share/kde4/servicetypes/terminalemulator.desktop
+usr/lib/*/libkdeinit5_konsole.so
+usr/lib/*/libkonsoleprivate.so.3.0.0
+usr/lib/*/libkonsoleprivate.so.3
+usr/lib/*/qt5/plugins/konsolepart.so
+usr/share/knotifications5/konsole.notifyrc
+usr/share/kxmlgui5/konsole/sessionui.rc
+usr/share/kxmlgui5/konsole/partui.rc
+usr/share/kxmlgui5/konsole/konsoleui.rc
+usr/share/kservices5/konsolepart.desktop
+usr/share/kservices5/ServiceMenus/konsolehere.desktop
+usr/share/kservices5/ServiceMenus/konsolerun.desktop
+usr/share/doc/HTML/en/konsole/draganddrop-contextmenu.png
+usr/share/doc/HTML/en/konsole/index.docbook
+usr/share/doc/HTML/en/konsole/index.cache.bz2
+usr/share/applications/org.kde.konsole.desktop
+usr/share/konsole/linux.keytab
+usr/share/konsole/default.keytab
+usr/share/konsole/Linux.colorscheme
+usr/share/konsole/Solarized.colorscheme
+usr/share/konsole/WhiteOnBlack.colorscheme
+usr/share/konsole/solaris.keytab
+usr/share/konsole/README.KeyTab
+usr/share/konsole/DarkPastels.colorscheme
+usr/share/konsole/BlackOnLightYellow.colorscheme
+usr/share/konsole/Shell.profile
+usr/share/konsole/BlackOnWhite.colorscheme
+usr/share/konsole/BlackOnRandomLight.colorscheme
+usr/share/konsole/BlueOnBlack.colorscheme
+usr/share/konsole/GreenOnBlack.colorscheme
+usr/share/konsole/SolarizedLight.colorscheme
+usr/share/konsole/RedOnBlack.colorscheme
+usr/share/kservicetypes5/terminalemulator.desktop
+usr/share/kconf_update/konsole.upd
+usr/share/kconf_update/konsole_remove_background_mode.upd
+usr/share/kconf_update/konsole-2.9.0-global-options.sh
+usr/share/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
+usr/share/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
diff --git a/debian/rules b/debian/rules
index 4496f59..a1d26dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_configure:
 	$(overridden_command)

-- 
konsole packaging

More information about the pkg-kde-commits mailing list