[SCM] kompare packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-15-g3c9ea73
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Sep 1 10:14:48 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kompare.git;a=commitdiff;h=24c3fad
The following commit has been merged in the master branch:
commit 24c3fad6d3741f0fa95f9b2a10bc1f4376ced4b1
Merge: b975ecfd52e8e1097e9226a7953f90fd8ef3f879 4d9fad47473ff4a485ec580666d213f346af6fda
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Aug 30 23:58:30 2015 +0200
Merge remote-tracking branch 'origin/kubuntu_wily_archive'
debian/.gitattributes | 1 -
debian/changelog | 232 ++++++++++++++++++++++++++++++++
debian/control | 66 +++++++--
debian/copyright | 2 +-
debian/kompare.install | 33 +----
debian/kpart5-kompare.install | 10 ++
debian/kpart5-kompare.lintian-overrides | 1 +
debian/libkompareinterface-dev.install | 2 +
debian/libkompareinterface5.install | 1 +
debian/not-installed | 4 +
debian/rules | 5 +-
debian/source/local-options | 1 -
debian/watch | 1 +
13 files changed, 309 insertions(+), 50 deletions(-)
diff --cc debian/changelog
index 42a2adc,e771c62..f097ac1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,63 +1,72 @@@
+kompare (4:15.08.0-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (15.04.0).
+ * New upstream release (15.04.1).
+ * New upstream release (15.04.3).
+ * New upstream release (15.08.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Sun, 30 Aug 2015 23:56:02 +0200
+
+ kompare (4:15.08.0-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+
+ -- Clive Johnston <clivejo at aol.com> Wed, 26 Aug 2015 17:33:03 +0100
+
+ kompare (4:15.07.90-0ubuntu1) wily; urgency=medium
+
+ * new upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Aug 2015 10:50:06 +0100
+
+ kompare (4:15.04.2-0ubuntu1) wily; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream release
+
+ [ José Manuel SantamarÃa Lema ]
+ * Add epoch to kpart5-kompare Breaks/Replaces against kompare.
+ * Fix kompare.install file so it doesn't share files with kpart5-
+ kompare
+
+ [ Scarlett Clark ]
+ * New upstream release
+ * Vivid backport
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 09 Jun 2015 19:14:39 +0200
+
+ kompare (4:14.12.3-0ubuntu1) vivid; urgency=medium
+
+ * Add back kdelibs parent version depend
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 13 Mar 2015 14:19:09 -0700
+
+ kompare (4:14.12.2-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 10 Feb 2015 09:13:38 -0800
+
+ kompare (4:14.12.0-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Remove kdelibs5-dev depend version as there was not a new release.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 15 Dec 2014 16:56:58 +0100
+
+ kompare (4:14.11.97-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, remaining changes:
+ - not-installed
+ - fix copyright for dep5
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 28 Nov 2014 18:36:11 +0100
+
kompare (4:4.14.0-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 5c34dee,827f1f0..3b66166
--- a/debian/control
+++ b/debian/control
@@@ -7,11 -7,9 +7,9 @@@ Uploaders: Sune Vuorela <sune at debian.or
Modestas Vainius <modax at debian.org>,
George Kiagiadakis <kiagiadakis.george at gmail.com>,
Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake,
+Build-Depends: cmake (>= 2.8.12~),
debhelper (>= 9),
- extra-cmake-modules (>= 0.0.9),
+ extra-cmake-modules (>= 0.0.9~),
- kde-sc-dev-latest (>= 4:4.12),
- kdelibs5-dev (>= 4:4.11),
kdoctools-dev,
libkf5codecs-dev,
libkf5config-dev,
--
kompare packaging
More information about the pkg-kde-commits
mailing list