[SCM] parley packaging branch, master, updated. debian/4.13.1-1-123-g80421b1
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 29 11:26:05 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/parley.git;a=commitdiff;h=95d98d9
The following commit has been merged in the master branch:
commit 95d98d95265640105aac5c8c3340fe8089448918
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Tue Jun 17 17:06:27 2014 +0100
merge with debian
---
debian/.gitattributes | 1 +
debian/changelog | 101 ++++++++++++++++++++++++++++++++++++++++++++
debian/compat | 2 +-
debian/control | 31 ++++++++------
debian/copyright | 2 +-
debian/source/local-options | 1 +
debian/watch | 2 +
7 files changed, 125 insertions(+), 15 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 1b612fa..bf0f067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,104 @@
+parley (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:42:04 +0100
+
+parley (4:4.13.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 23 May 2014 12:39:10 +0200
+
+parley (4:4.12.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:24:56 +0200
+
+parley (4:4.12.3-1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 04 Mar 2014 00:05:27 +0100
+
+parley (4:4.12.2-1) experimental; urgency=low
+
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * New upstream release.
+ * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 10 Feb 2014 11:32:11 +0100
+
+parley (4:4.11.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 08 Nov 2013 15:23:46 +0100
+
+parley (4:4.11.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 07 Oct 2013 16:52:50 +0200
+
+parley (4:4.10.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 12 Jul 2013 16:43:02 +0200
+
+parley (4:4.10.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Pino Toscano ]
+ * Add the pkg-config build dependency.
+
+ [ Maximiliano Curia ]
+ * Add watch file.
+ * Bump debhelper build-dep and compat to 9.
+ * Bump Standards-Version to 3.9.4.
+ * Add myself to uploaders.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 14 Jun 2013 14:31:02 +0200
+
+parley (4:4.10.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Pino Toscano ]
+ * Bump the kde-sc-dev-latest, kdelibs5-dev and libkdeedu-dev build
+ dependencies to 4.10.
+ * Update Uploaders.
+ * Update copyright.
+
+ -- Sune Vuorela <sune at debian.org> Fri, 12 Apr 2013 20:21:32 +0000
+
+parley (4:4.8.4-1) unstable; urgency=low
+
+ * New upstream
+
+ -- Sune Vuorela <sune at debian.org> Wed, 20 Jun 2012 10:07:35 +0200
+
+parley (4:4.7.4-2) unstable; urgency=low
+
+ * Team upload. Upload to unstable.
+
+ -- Pino Toscano <pino at debian.org> Wed, 07 Mar 2012 17:26:53 +0100
+
+parley (4:4.7.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+ * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 18 Dec 2011 01:37:44 +0100
+
parley (4:4.13.0-0ubuntu1) trusty; urgency=medium
* New upstream KDE Software Compilation release
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b38d31f..6d259f3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,20 @@ Section: kde
Priority: optional
Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Eshat Cakar <info at eshat.de>,
-Build-Depends: kde-sc-dev-latest (>= 4:4.10),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.13.0),
- libkdeedu-dev (>= 4:4.13.0),
- libattica-dev,
- libxml2-dev,
- libxslt-dev,
- libx11-dev,
- libxrender-dev
-Standards-Version: 3.9.2
+Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.12),
+ kdelibs5-dev (>= 4:4.11),
+ libattica-dev,
+ libkdeedu-dev (>= 4:4.11),
+ libx11-dev,
+ libxml2-dev,
+ libxrender-dev,
+ libxslt-dev,
+ pkg-config,
+ pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
Homepage: https://projects.kde.org/projects/kde/kdeedu/parley
X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/parley.git
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
@@ -22,8 +25,10 @@ X-Debian-Vcs-Browser: http://anonscm.debian.org/git/pkg-kde/kde-sc/parley.git
Package: parley
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- parley-data (>= ${source:Version}), kdeedu-kvtml-data
+Depends: kdeedu-kvtml-data,
+ parley-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: krosspython, python-kde4
Suggests: khelpcenter4
Description: vocabulary trainer
diff --git a/debian/copyright b/debian/copyright
index 0fbcb92..50edee8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: parley
-Source: https://projects.kde.org/projects/kde/kdeedu/parley
+Source: https://projects.kde.org/projects/kde/kdeedu/parley
Files: *
Copyright: 2007-2010 Frederik Gladhorn <frederik.gladhorn at kdemail.net>
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..64c6a7d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/parley-([\d\.]*).tar.xz
--
parley packaging
More information about the pkg-kde-commits
mailing list