[SCM] kate packaging branch, master, updated. debian/4.14.2-2-1-gb9de9d2

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Fri Dec 5 14:48:03 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kate.git;a=commitdiff;h=b9de9d2

The following commit has been merged in the master branch:
commit b9de9d2b130dafb106cd6cd4c23ef1e3734422a8
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 15:47:59 2014 +0100

     Rename source to kate4
    
    * Rename source to kate4
    * Drop kate, kwrite and kate-dbg package, now provided by kate (kf5)
    * Keep katepart for applications to use
    * Don't install manpage in kate-data
    * Fix autopkgtest run by making sure DEB_HOST_MULTIARCH is defined in the
      testsuite
    * kate-data breaks/replaces katepart << 4:4.14.3-0ubuntu2~ (LP: #1395466)
    * Remove files from kate that conflict with kate-data
    * kate-data breaks/replaces kate << 4:4.14.3-0ubuntu2~
    * Merge with debian unstable, remaining changes:
      - add appropriate breaks/replaces
      - build pate:
        + build-depend on python
        + point dh_auto_configure to the correct libpython location
    * Update Vcs urls for the new repository location.
    * Bump Standards-Version to 3.9.6, no changes needed.
    * Update the maintainer
    * New upstream bugfix release
    * New upstream release
    * New upstream release
    * Add missing file to katepart.
    * wrap-and-sort
    * New upstream release
    * Bump breaks/replaces for Kubuntu versions
    * New upstream beta release RC
    * Update kate-data install file
    * Add hacky second build for pate build failure
    * New upstream beta release
    * New upstream beta release
    * Remove version from libkactivities-dev depend as it has not had
      a new release.
    * Commented out install file that is missing in i386, needs research.
    * Add pate files back to kate-data.install
    * new upstream release
    * Fix install files
    * Merge with Debian, remaining changes:
      - Add appropriate Breaks/Replaces
    * New upstream KDE Software Compilation release
    * New upstream release candidate
    * New upstream beta release
    * Update install files
    * New upstream beta release
    * Override license-problem-json-evil for js_lint.py as the file only
      references the evil file
    * New upstream bugfix release
    * New upstream bugfix release
    * New upstream bugfix release
    * New upstream release
    * New upstream RC release
    * New upstream beta release
    * New upstream beta release
    * Update the katepart install file, added the new files to it
    * New upstream bugfix release
    * Set PYTHON_LIBRARY manually, fixes LP: #1233215 Python plugins fail
      to load
    * New upstream bugfix release.
    * New upstream release
    * New upstream release
    * New upstream RC 2 release
    * New upstream RC 2 release
    * New upstream RC release
    * Add new syntax files to kate-data
    * New upstream bet release
    * kate-data breaks/replaces kate << 4:4.10.80 for moved pate files
    * New upstream release
      - Update and sort install files
      - Drop kubuntu_pate_find_python.diff, kubuntu_kate_initial_preference.patch,
        kubuntu_find_python.diff from debian/patches , not required
    * New upstream release
    * New upstream bugfix release
    * New upstream release
    * Merge with Debian, remaining changes:
     - Add patches kubuntu_find_python.diff,
       kubuntu_kate_initial_preference.patch,
       kubuntu_pate_find_python.diff
     - build-dep on python and libqt4-opengl-dev and libqtwebkit-dev
     - in debian/rules Move go.xml to go-lang.xml in rules and
       kate-data.install to prevent clash with golang kate-syntax-go (LP:
       #968734)
    * New upstream bugfix release
    * New upstream bugfix release
    * refresh kate-data.install
    * New upstream release
    * New upstream release candidate
    * New upstream release candidate
    * Add kubuntu_pate_find_python.diff
    * New upstream RC release
    * Add build-dep on libpython2.7-dev
    * Add kubuntu_multiarch_python.diff to work around multiarch python
    * New upstream beta release
    * Remove fix_pate_includes.diff now upstream
    * Remove kubuntu_kate_initial_preference.patch now upstream
    * Update .install file
    * New upstream beta release
    * Add build-dep on python-dev packages and add pate files to kate.install
    * Add libkactivities-dev, libqtwebkit-dev, and libqt4-opengl-dev to
      build-depends
    * Add debian/patches/fix_pate_includes.diff to add Qt webkit includes for
      pate
    * Update kate, kate-part, and kate-data install files for upstream additions
      and deletions
    * New upstream release (LP: #1074747)
    * Restore kubuntu_kate_initial_preference.patch lost in the split from
      kdesdk (LP: #1062086). It ensures that kate is chosen over other text
      processing apps (namely libreoffice-writer) for the file types kate
      is associated with (such as text/*)
    * New upstream bugfix release
    * New upstream release
    * Change sonames from 4.9.0 to 4.9.*
    * Build-dep on kdelibs 4.9.0a, adjust .install files to new library
      version no
    * Use direct build-depends versions rather than kde-sc-dev-latest
    * New upstream release
    * New upstream beta release.
    * Move go.xml to go-lang.xml in rules and kate-data.install to prevent
      clash with golang kate-syntax-go (LP: #968734)
    * New upstream beta release:
      - Update .install files
    * Merge with Debian Qt/KDE Git, remaining changes:
      - Drop kate-dev package
    * New upstream release
    * New upstream release
    * New upstream release.
    * Update installed files.
    * Update not-installed files.
    * Bump kdelibs5-dev build dependency to version 4:4.8.
    * Bump kde-sc-dev-latest build dependency to version 4:4.8.3.
    * Bump Standards-Version to 3.9.3, no changes needed.
    * Drop README.Debian, wrongly copied from kde4libs.
    * New upstream release
    * New upstream release
    * New upstream RC release
    * New upstream release candidate
      - update kate-data.install
    * Kill the kate-dev package. It doesn't have any reverse-dependencies so
      we can't test the package.
    * Remove the libkatepartinterfaces4 and libkateinterfaces4 symbol files.
    * New upstream beta release
    * New upstream release
    * Merge with Debian packaging from Git, changes:
     - reenable kate-dev (smokekde should use it)
     - Add .symbols files
    * New upstream release (LP: #872506)
    * No-change rebuild so translations aren't stripped from .desktop
      files anymore.
    * New upstream release
      - update libkatepartinterfaces4.symbols
    * New upstream release
      - update libkatepartinterfaces4.symbols
    * move katepart.desktop from kate to katepart
    * Initial release
    * Include copy of the BSD license rather than refering to the deprecated
      /usr/share/common-licenses/BSD.
    * Add katepart package which contains the KPart and ktexteditor plugins.
    * Repackage upstream tarball:
      - Add COPYING.DOC and COPYING.GPL2
      - Drop part/syntax/data/cmake-gen.sh,
        part/syntax/data/find-trivial-regexpr.sh,
        part/syntax/data/list-keywords-ldif.sh and part/tests/hl/highlight.sh
        because of unclear licensing.
---
 debian/.gitattributes       |   1 -
 debian/changelog            | 543 ++++++++++++++++++++++++++++++++++++++++++--
 debian/control              |  84 ++-----
 debian/kate-data.install    |  21 +-
 debian/kate.install         |   3 +
 debian/rules                |   5 +-
 debian/source/local-options |   1 -
 debian/tests/testsuite      |   1 +
 8 files changed, 562 insertions(+), 97 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 8bc14ff..e8d75b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,38 +1,115 @@
-kate (4:4.14.2-2) unstable; urgency=medium
+kate4 (4:4.14.3-0ubuntu4) vivid; urgency=medium
 
-  * Move data files to data package. (Closes: #766143)
+  * Rename source to kate4
+  * Drop kate, kwrite and kate-dbg package, now provided by kate (kf5)
+  * Keep katepart for applications to use
+  * Don't install manpage in kate-data
 
- -- Maximiliano Curia <maxy at debian.org>  Tue, 21 Oct 2014 13:52:57 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Dec 2014 15:04:55 +0100
 
-kate (4:4.14.2-1) unstable; urgency=medium
+kate (4:4.14.3-0ubuntu3) vivid; urgency=medium
 
-  * New upstream release (4.14.2).
-  * Update install files.
+  * Fix autopkgtest run by making sure DEB_HOST_MULTIARCH is defined in the
+    testsuite
 
- -- Maximiliano Curia <maxy at debian.org>  Mon, 20 Oct 2014 17:12:57 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Thu, 27 Nov 2014 21:12:08 +0100
 
-kate (4:4.14.1-1) unstable; urgency=medium
+kate (4:4.14.3-0ubuntu2) vivid; urgency=medium
 
-  * New upstream release (4.14.1).
+  * kate-data breaks/replaces katepart << 4:4.14.3-0ubuntu2~ (LP: #1395466)
+  * Remove files from kate that conflict with kate-data
+  * kate-data breaks/replaces kate << 4:4.14.3-0ubuntu2~
 
- -- Maximiliano Curia <maxy at debian.org>  Wed, 17 Sep 2014 09:44:22 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Tue, 25 Nov 2014 19:42:45 +0100
 
-kate (4:4.14.0-1) unstable; urgency=medium
+kate (4:4.14.3-0ubuntu1) vivid; urgency=medium
 
-  * Build with tests disabled.
-  * New patch: do_not_enforce_tests
-  * New upstream release.
-  * Update install files.
+  * Merge with debian unstable, remaining changes:
+    - add appropriate breaks/replaces
+    - build pate:
+      + build-depend on python
+      + point dh_auto_configure to the correct libpython location
+  * Update Vcs urls for the new repository location.
+  * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update the maintainer
+  * New upstream bugfix release
 
- -- Maximiliano Curia <maxy at debian.org>  Mon, 25 Aug 2014 00:05:54 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 22 Nov 2014 21:07:44 +0100
 
-kate (4:4.13.3-1) unstable; urgency=medium
+kate (4:4.14.2-0ubuntu1) vivid; urgency=medium
 
-  * New upstream release.
-  * Remove patch: debian-disable-tests.diff, test are run with
-    autopkgtest.
+  * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 04:04:06 -0700
+
+kate (4:4.14.1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Add missing file to katepart. 
+  * wrap-and-sort
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 16:32:18 +0200
+
+kate (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 12:35:44 +0200
+
+kate (4:4.13.97-0ubuntu2) utopic; urgency=medium
+
+  * Bump breaks/replaces for Kubuntu versions
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 08 Aug 2014 17:52:37 +0200
+
+kate (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+  [ Scarlett Clark ]
+  * New upstream beta release RC
+
+  [ Jonathan Riddell ]
+  * Update kate-data install file
+  * Add hacky second build for pate build failure
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 16:18:22 +0200
+
+kate (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 17:30:23 +0200
+
+kate (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+  [ Scarlett Clark ]
+  * New upstream beta release
+  * Remove version from libkactivities-dev depend as it has not had
+    a new release.
+  * Commented out install file that is missing in i386, needs research.
+
+  [ Jonathan Riddell ]
+  * Add pate files back to kate-data.install
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 17:38:34 +0200
+
+kate (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+  * new upstream release
 
- -- Maximiliano Curia <maxy at debian.org>  Fri, 01 Aug 2014 09:12:12 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:44:15 +0100
+
+kate (4:4.13.1-2ubuntu2) utopic; urgency=medium
+
+  * Fix install files
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 05 Jun 2014 15:50:23 +0200
+
+kate (4:4.13.1-2ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Add appropriate Breaks/Replaces
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 05 Jun 2014 13:22:43 +0200
 
 kate (4:4.13.1-2) unstable; urgency=medium
 
@@ -58,6 +135,38 @@ kate (4:4.13.1-1) unstable; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 26 May 2014 14:13:35 +0200
 
+kate (4:4.13.0-0ubuntu1) trusty; urgency=medium
+
+  * New upstream KDE Software Compilation release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 21:40:02 +0100
+
+kate (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:11:31 +0200
+
+kate (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+  * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 11:58:21 +0100
+
+kate (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+  [ Rohan Garg ]
+  * Update install files
+
+  [ Jonathan Riddell ]
+  * New upstream beta release
+
+  [ Philip Muškovac ]
+  * Override license-problem-json-evil for js_lint.py as the file only
+    references the evil file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:38:16 +0000
+
 kate (4:4.12.4-1) unstable; urgency=medium
 
   * New upstream release.
@@ -70,6 +179,12 @@ kate (4:4.12.3-1) experimental; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:05:24 +0100
 
+kate (4:4.12.3-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:31:12 +0100
+
 kate (4:4.12.2-1) experimental; urgency=medium
 
   * New upstream release.
@@ -79,6 +194,46 @@ kate (4:4.12.2-1) experimental; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:28 +0100
 
+kate (4:4.12.2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Feb 2014 23:39:36 +0000
+
+kate (4:4.12.1-0ubuntu1) trusty; urgency=low
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 16 Jan 2014 07:58:46 +0000
+
+kate (4:4.12.0-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Dec 2013 16:28:23 +0000
+
+kate (4:4.11.97-0ubuntu1) trusty; urgency=low
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 29 Nov 2013 12:34:43 +0000
+
+kate (4:4.11.95-0ubuntu1) trusty; urgency=low
+
+  * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 25 Nov 2013 17:46:09 +0100
+
+kate (4:4.11.80-0ubuntu1) trusty; urgency=low
+
+  [ Rohan Garg ]
+  * New upstream beta release
+
+  [ Ovidiu-Florin Bogdan ]
+  * Update the katepart install file, added the new files to it
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:28:40 +0100
+
 kate (4:4.11.5-1) unstable; urgency=low
 
   * New upstream release.
@@ -108,6 +263,15 @@ kate (4:4.11.3-1) unstable; urgency=low
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 08 Nov 2013 14:07:22 +0100
 
+kate (4:4.11.2a-0ubuntu1) saucy; urgency=low
+
+  [ Jonathan Riddell ]
+  * New upstream bugfix release
+  * Set PYTHON_LIBRARY manually, fixes LP: #1233215 Python plugins fail
+    to load
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 30 Sep 2013 13:59:34 +0100
+
 kate (4:4.11.2-2) experimental; urgency=low
 
   * Bump kdelibs5-dev build dependency.
@@ -126,6 +290,64 @@ kate (4:4.11.2-1) experimental; urgency=low
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 05 Oct 2013 13:20:22 +0200
 
+kate (4:4.11.1-0ubuntu1) saucy; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Howard Chan <smartboyhw at gmail.com>  Fri, 06 Sep 2013 22:07:03 +0100
+
+kate (4:4.11.0-0ubuntu1) saucy; urgency=low
+
+  [ Howard Chan ]
+  * New upstream release
+
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 13 Aug 2013 23:59:54 +0100
+
+kate (4:4.10.97-0ubuntu1) saucy; urgency=low
+
+  * New upstream RC 2 release
+  * New upstream RC 2 release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 19:07:46 +0100
+
+kate (4:4.10.95-0ubuntu1) saucy; urgency=low
+
+  [ Rohan Garg ]
+  * New upstream RC release
+
+  [ Philip Muškovac ]
+  * Add new syntax files to kate-data
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:31:54 +0000
+
+kate (4:4.10.90-0ubuntu1) saucy; urgency=low
+
+  * New upstream bet release
+
+ -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 18:00:49 +0100
+
+kate (4:4.10.80-0ubuntu2) saucy; urgency=low
+
+  * kate-data breaks/replaces kate << 4:4.10.80 for moved pate files 
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 22 Jun 2013 15:51:54 +0200
+
+kate (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+  [ Rohan Garg ]
+  * New upstream release
+    - Update and sort install files
+    - Drop kubuntu_pate_find_python.diff, kubuntu_kate_initial_preference.patch,
+      kubuntu_find_python.diff from debian/patches , not required
+
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Jun 2013 00:48:29 +0100
+
 kate (4:4.10.5-2) unstable; urgency=low
 
   * Team upload.
@@ -151,6 +373,26 @@ kate (4:4.10.4-1) experimental; urgency=low
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 09:31:57 +0200
 
+kate (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 06 Jun 2013 23:37:25 +0100
+
+kate (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Merge with Debian, remaining changes:
+   - Add patches kubuntu_find_python.diff,
+     kubuntu_kate_initial_preference.patch,
+     kubuntu_pate_find_python.diff
+   - build-dep on python and libqt4-opengl-dev and libqtwebkit-dev
+   - in debian/rules Move go.xml to go-lang.xml in rules and
+     kate-data.install to prevent clash with golang kate-syntax-go (LP:
+     #968734)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 08 May 2013 16:08:44 +0000
+
 kate (4:4.10.2-2) experimental; urgency=low
 
   [ Pino Toscano ]
@@ -188,6 +430,137 @@ kate (4:4.10.2-1) experimental; urgency=low
 
  -- Sune Vuorela <sune at debian.org>  Wed, 03 Apr 2013 06:43:08 +0000
 
+kate (4:4.10.2-0ubuntu1) raring; urgency=low
+
+  * New upstream bugfix release
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:37:50 +0200
+
+kate (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream bugfix release
+  * refresh kate-data.install
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 15:14:47 +0000
+
+kate (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:32:37 +0000
+
+kate (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream release candidate
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 14:58:53 +0000
+
+kate (4:4.9.97-0ubuntu1~ubuntu13.04) raring; urgency=low
+
+  [ Philip Muškovac ]
+  * New upstream release candidate
+
+  [ Rohan Garg ]
+  * Add kubuntu_pate_find_python.diff
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:25:27 +0100
+
+kate (4:4.9.95-0ubuntu1) raring; urgency=low
+
+  * New upstream RC release
+  * Add build-dep on libpython2.7-dev
+  * Add kubuntu_multiarch_python.diff to work around multiarch python
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:17:40 +0000
+
+kate (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream beta release
+  * Remove fix_pate_includes.diff now upstream
+  * Remove kubuntu_kate_initial_preference.patch now upstream
+  * Update .install file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:37:41 +0000
+
+kate (4:4.9.80-0ubuntu1) raring; urgency=low
+
+  [ Jonathan Riddell ]
+  * New upstream beta release
+  * Add build-dep on python-dev packages and add pate files to kate.install
+
+  [ Scott Kitterman ]
+  * Add libkactivities-dev, libqtwebkit-dev, and libqt4-opengl-dev to
+    build-depends
+  * Add debian/patches/fix_pate_includes.diff to add Qt webkit includes for
+    pate
+  * Update kate, kate-part, and kate-data install files for upstream additions
+    and deletions
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 21 Nov 2012 02:42:57 -0500
+
+kate (4:4.9.3-0ubuntu1) raring; urgency=low
+
+  [ Philip Muškovac ]
+  * New upstream release (LP: #1074747)
+
+  [ Harald Sitter ]
+  * Restore kubuntu_kate_initial_preference.patch lost in the split from
+    kdesdk (LP: #1062086). It ensures that kate is chosen over other text
+    processing apps (namely libreoffice-writer) for the file types kate
+    is associated with (such as text/*)
+
+ -- Harald Sitter <apachelogger at ubuntu.com>  Tue, 06 Nov 2012 22:23:17 +0100
+
+kate (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream bugfix release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 02 Oct 2012 15:11:48 +0100
+
+kate (4:4.9.1-0ubuntu1) quantal; urgency=low
+
+  [ Harald Sitter ]
+  * New upstream release
+
+  [ Philip Muškovac ]
+  * Change sonames from 4.9.0 to 4.9.* 
+
+ -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 10 Sep 2012 18:17:04 +0530
+
+kate (4:4.9.0-0ubuntu2) quantal; urgency=low
+
+  * Build-dep on kdelibs 4.9.0a, adjust .install files to new library
+    version no
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Aug 2012 11:57:47 +0100
+
+kate (4:4.9.0-0ubuntu1) quantal; urgency=low
+
+  * Use direct build-depends versions rather than kde-sc-dev-latest
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Jul 2012 17:02:37 +0100
+
+kate (4:4.8.90-0ubuntu1) quantal; urgency=low
+
+  [ Felix Geyer ]
+  * New upstream beta release.
+
+  [ Jonathan Riddell ]
+  * Move go.xml to go-lang.xml in rules and kate-data.install to prevent
+    clash with golang kate-syntax-go (LP: #968734)
+
+ -- Felix Geyer <debfx at ubuntu.com>  Mon, 11 Jun 2012 22:05:23 +0200
+
+kate (4:4.8.80a-0ubuntu1) quantal; urgency=low
+
+  * New upstream beta release:
+    - Update .install files
+  * Merge with Debian Qt/KDE Git, remaining changes:
+    - Drop kate-dev package
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org>  Fri, 25 May 2012 19:46:22 -0400
+
 kate (4:4.8.4-1) unstable; urgency=low
 
   * New upstream version.
@@ -224,12 +597,77 @@ kate (4:4.8.3-1) experimental; urgency=low
 
  -- Modestas Vainius <modax at debian.org>  Sun, 27 May 2012 17:13:18 +0300
 
+kate (4:4.8.3-0ubuntu1) quantal; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Kolberg <bulldog98 at kubuntu.org>  Mon, 30 Apr 2012 23:32:27 +0200
+
+kate (4:4.8.2-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 30 Mar 2012 20:38:48 +0200
+
+kate (4:4.8.3-0r1) raring; urgency=low
+
+  * New upstream release.
+
+  [ Eshat Cakar ]
+  * Update installed files.
+  * Update not-installed files.
+  * Bump kdelibs5-dev build dependency to version 4:4.8.
+  * Bump kde-sc-dev-latest build dependency to version 4:4.8.3.
+  * Bump Standards-Version to 3.9.3, no changes needed.
+
+ -- Eshat Cakar <info at eshat.de>  Thu, 08 Mar 2012 18:29:52 +0100
+
+kate (4:4.7.4-3) raring; urgency=low
+
+  [ Pino Toscano ]
+  * Drop README.Debian, wrongly copied from kde4libs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 12:13:57 +0100
+
+kate (4:4.8.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release 
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 07 Mar 2012 17:51:28 +0100
+
 kate (4:4.7.4-2) unstable; urgency=low
 
   * Team upload. Upload to unstable.
 
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 06 Mar 2012 10:00:51 +0100
 
+kate (4:4.8.0-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 19 Jan 2012 12:01:25 +0000
+
+kate (4:4.7.97-0ubuntu1) precise; urgency=low
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 04 Jan 2012 13:15:00 +0000
+
+kate (4:4.7.95-0ubuntu1) precise; urgency=low
+
+  * New upstream release candidate
+    - update kate-data.install
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 24 Dec 2011 15:38:02 +0100
+
+kate (4:4.7.90-0ubuntu2) precise; urgency=low
+
+  * Kill the kate-dev package. It doesn't have any reverse-dependencies so
+    we can't test the package.
+  * Remove the libkatepartinterfaces4 and libkateinterfaces4 symbol files.
+
+ -- Felix Geyer <debfx at ubuntu.com>  Thu, 22 Dec 2011 14:19:07 +0100
+
 kate (4:4.7.4-1) experimental; urgency=low
 
   * New upstream release.
@@ -241,8 +679,71 @@ kate (4:4.7.4-1) experimental; urgency=low
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Dec 2011 01:35:02 +0100
 
+kate (4:4.7.90-0ubuntu1) precise; urgency=low
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Dec 2011 13:28:06 +0000
+
+kate (4:4.7.3-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Merge with Debian packaging from Git, changes:
+   - reenable kate-dev (smokekde should use it)
+   - Add .symbols files
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 14:02:22 +0000
+
 kate (4:4.7.2-1) experimental; urgency=low
 
   * Initial release. Start from the Ubuntu packaging, thanks!
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:43:09 -0300
+
+kate (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
+
+  * New upstream release (LP: #872506)
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Thu, 13 Oct 2011 13:56:40 +0200
+
+kate (4:4.7.1-0ubuntu2) oneiric; urgency=low
+
+  * No-change rebuild so translations aren't stripped from .desktop
+    files anymore.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 15 Sep 2011 23:13:18 +0200
+
+kate (4:4.7.1-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release
+    - update libkatepartinterfaces4.symbols
+
+ -- Jonathan Kolberg <bulldog98 at kubuntu-de.org>  Wed, 07 Sep 2011 18:33:38 +0200
+
+kate (4:4.7.0-0ubuntu1) oneiric; urgency=low
+
+  [ Philip Muškovac ]
+  * New upstream release
+    - update libkatepartinterfaces4.symbols
+  * move katepart.desktop from kate to katepart
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 23 Jul 2011 02:50:33 +0200
+
+kate (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
+
+  [ Rohan Garg ]
+  * Initial release
+
+  [ Felix Geyer ]
+  * Include copy of the BSD license rather than refering to the deprecated
+    /usr/share/common-licenses/BSD.
+  * Add katepart package which contains the KPart and ktexteditor plugins.
+  * Repackage upstream tarball:
+    - Add COPYING.DOC and COPYING.GPL2
+    - Drop part/syntax/data/cmake-gen.sh,
+      part/syntax/data/find-trivial-regexpr.sh,
+      part/syntax/data/list-keywords-ldif.sh and part/tests/hl/highlight.sh
+      because of unclear licensing.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 20 Jul 2011 19:56:03 +0200
+
diff --git a/debian/control b/debian/control
index 823d3cd..be32751 100644
--- a/debian/control
+++ b/debian/control
@@ -1,48 +1,29 @@
-Source: kate
+Source: kate4
 Section: kde
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>,
            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.12),
-               libkactivities-dev (>= 4:4.11),
+               kdelibs5-dev (>= 4:4.14.2),
+               libkactivities-dev,
+               libpython2.7-dev,
                libqjson-dev,
+               libqt4-opengl-dev,
+               libqtwebkit-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-Standards-Version: 3.9.5
+               python-kde4-dev (>= 4:4.9.80),
+               python-qt4-dev,
+               python-sip-dev
+Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
 Homepage: http://kate-editor.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kate.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kate.git
-
-Package: kate
-Section: editors
-Architecture: any
-Depends: kate-data (>= ${source:Version}),
-         katepart (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: aspell | ispell | hspell, khelpcenter4, konsole
-Description: powerful text editor
- Kate is a powerful text editor that can open multiple files simultaneously.
- .
- With a built-in terminal, syntax highlighting, and tabbed sidebar, it performs
- as a lightweight but capable development environment.  Kate's many tools,
- plugins, and scripts make it highly customizable.
- .
- Kate's features include:
- .
-  * Multiple saved sessions, each with numerous files
-  * Scriptable syntax highlighting, indentation, and code-folding
-  * Configurable templates and text snippets
-  * Symbol viewers for C, C++, and Python
-  * XML completion and validation
- .
- This package is part of the KDE 4 Base applications module.
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-applications/kate.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kate.git
 
 Package: katepart
 Architecture: any
@@ -61,8 +42,12 @@ Description: embeddable text editor component
 Package: kate-data
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: kate (<< 4:4.14.2-2~), kdelibs5-data (<< 4:4.6.90)
-Replaces: kate (<< 4:4.14.2-2~), kdelibs5-data (<< 4:4.6.90)
+Breaks: kate (<< 4:4.14.3-0ubuntu2~),
+        katepart (<< 4:4.14.3-0ubuntu2~),
+        kdelibs5-data (<< 4:4.6.90)
+Replaces: kate (<< 4:4.14.3-0ubuntu2~),
+          katepart (<< 4:4.14.3-0ubuntu2~),
+          kdelibs5-data (<< 4:4.6.90)
 Description: shared data files for Kate text editor
  This package contains the architecture-independent shared data files needed
  for Kate editor
@@ -91,34 +76,3 @@ Description: plugin interface for the kate editor
  integration into the app like tool views
  .
  This package is part of the KDE 4 Base applications module
-
-Package: kwrite
-Section: editors
-Architecture: any
-Depends: katepart (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: simple text editor
- KWrite is a simple text editor built on the KDE Platform. It uses the Kate
- editor component, so it supports powerful features such as flexible syntax
- highlighting, automatic indentation, and numerous other text tools.
- .
- This package is part of the KDE 4 Base applications module.
-
-Package: kate-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: katepart (= ${binary:Version}),
-         kde-runtime-dbg (>= 4:4.6.90),
-         ${allLibraries},
-         ${misc:Depends}
-Breaks: kdebase-dbg (<< 4:4.6.90),
-        kdelibs5-dbg (<< 4:4.6.90),
-        kdesdk-dbg (<< 4:4.6.90)
-Replaces: kdebase-dbg (<< 4:4.6.90),
-          kdelibs5-dbg (<< 4:4.6.90),
-          kdesdk-dbg (<< 4:4.6.90)
-Description: debugging symbols for Kate
- This package contains debugging files used to investigate problems with
- binaries included in Kate.
- .
- This package is part of the KDE 4 base applications module.
diff --git a/debian/kate-data.install b/debian/kate-data.install
index f86b1e5..098dbac 100644
--- a/debian/kate-data.install
+++ b/debian/kate-data.install
@@ -1,10 +1,8 @@
+usr/lib/python2.7/dist-packages/PyKate4/__init__.py
 usr/share/doc/kde/HTML/*/kate/*
-usr/share/icons/hicolor/*/apps/kate.png
-usr/share/icons/hicolor/*/actions/debug-kategdb.png
-usr/share/icons/hicolor/scalable/apps/kate.svgz
-usr/share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz
 usr/share/kde4/apps/kate/icons/
 usr/share/kde4/apps/kate/kateui.rc
+usr/share/kde4/apps/kate/pate/
 usr/share/kde4/apps/kate/plugins/
 usr/share/kde4/apps/kate/tips
 usr/share/kde4/apps/katepart/
@@ -18,5 +16,18 @@ usr/share/kde4/config/katerc
 usr/share/kde4/config/kateschemarc
 usr/share/kde4/config/katesyntaxhighlightingrc
 usr/share/kde4/config/ktexteditor_codesnippets_core.knsrc
+usr/share/kde4/services/katepate_block.desktop
+usr/share/kde4/services/katepate_color_tools.desktop
+usr/share/kde4/services/katepate_commentar.desktop
+usr/share/kde4/services/katepate_format.desktop
+usr/share/kde4/services/katepate_gid.desktop
+usr/share/kde4/services/katepate_python_autocomplete.desktop
+usr/share/kde4/services/katepate_python_autocomplete_jedi.desktop
+usr/share/kde4/services/katepate_python_console_classic.desktop
+usr/share/kde4/services/katepate_python_console_ipython.desktop
+usr/share/kde4/services/katepate_python_utils.desktop
+usr/share/kde4/services/katepate_try_open_file.desktop
+usr/share/kde4/services/katepate_xml_pretty.desktop
 usr/share/kde4/services/katesnippetsplugin.desktop
-usr/share/man/man1/kate.1
+usr/share/kde4/services/pate.desktop
+usr/share/kde4/servicetypes/katepythonplugin.desktop
diff --git a/debian/kate.install b/debian/kate.install
index 683996d..96d8c86 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -11,6 +11,8 @@ usr/lib/kde4/kategdbplugin.so
 usr/lib/kde4/katekonsoleplugin.so
 usr/lib/kde4/katemailfilesplugin.so
 usr/lib/kde4/kateopenheaderplugin.so
+usr/lib/kde4/katepateplugin.so
+usr/lib/kde4/kateprojectplugin.so
 usr/lib/kde4/kateprojectplugin.so
 usr/lib/kde4/katereplicodeplugin.so
 usr/lib/kde4/katesearchplugin.so
@@ -25,6 +27,7 @@ usr/lib/kde4/katexmltoolsplugin.so
 usr/lib/kde4/ktexteditor_lumen.so
 usr/lib/kde4/plasma_applet_katesession.so
 usr/lib/libkdeinit4_kate.so
+usr/lib/python2.7/dist-packages/PyKate4/kate.so
 usr/share/applications/kde4/kate.desktop
 usr/share/kde4/services/kate_kttsd.desktop
 usr/share/kde4/services/katebacktracebrowserplugin.desktop
diff --git a/debian/rules b/debian/rules
index ec20498..fdb956b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DKDE4_BUILD_TESTS=false
+	$(overridden_command) -- -DPYTHON_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libpython2.7.so.1
 
 .PHONY: override_dh_auto_test
 
@@ -19,6 +19,3 @@ override_dh_auto_install:
 	# these would belong to kate-dev
 	rm -rf debian/tmp/usr/include
 	find debian/tmp/usr/lib -maxdepth 1 -name '*.so' -type l -delete
-
-override_dh_strip:
-	$(overridden_command) --dbg-package=kate-dbg
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index e784c01..c7052fc 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -5,6 +5,7 @@ if [ -d /usr/lib/ccache ]; then
     export PATH="/usr/lib/ccache:$PATH"
 fi
 debian/rules clean 2>&1
+export DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
 dpkg-source --before-build .
 debian/rules build 2>&1
 

-- 
kate packaging



More information about the pkg-kde-commits mailing list