[SCM] dolphin-plugins packaging branch, master, updated. debian/4.12.4-1-47-ge05b158
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jul 30 14:18:46 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/dolphin-plugins.git;a=commitdiff;h=ccd9a8b
The following commit has been merged in the master branch:
commit ccd9a8bdb9944b99cbe2163254e6b5974dfbca35
Author: Rohan Garg <rohangarg at kubuntu.org>
Date: Mon Jun 2 15:28:23 2014 +0200
* Merge with Debian, no remaining changes
---
debian/changelog | 41 +++++++++++++++++++++++++++++++++++++++++
debian/control | 37 +++++++++++++++++--------------------
debian/copyright | 15 ++++++++++++---
debian/rules | 4 ++--
debian/source/local-options | 1 +
debian/watch | 1 -
6 files changed, 73 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8eaf6c2..12d1796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dolphin-plugins (4:4.13.1-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge with Debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Mon, 02 Jun 2014 15:28:10 +0200
+
+dolphin-plugins (4:4.13.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 26 May 2014 13:34:38 +0200
+
dolphin-plugins (4:4.13.0-0ubuntu1) trusty; urgency=medium
* New upstream KDE Software Compilation release
@@ -34,12 +47,26 @@ dolphin-plugins (4:4.12.90-0ubuntu1) trusty; urgency=medium
-- Jonathan Riddell <jriddell at ubuntu.com> Wed, 19 Mar 2014 10:33:02 +0000
+dolphin-plugins (4:4.12.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:24:09 +0200
+
dolphin-plugins (4:4.12.3-0ubuntu1) trusty; urgency=medium
* New upstream bugfix release
-- Rohan Garg <rohangarg at kubuntu.org> Tue, 04 Mar 2014 20:25:29 +0100
+dolphin-plugins (4:4.12.2-1) experimental; urgency=medium
+
+ * 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:06 +0100
+
dolphin-plugins (4:4.12.2-0ubuntu1) trusty; urgency=medium
* New upstream bugfix release
@@ -76,6 +103,19 @@ dolphin-plugins (4:4.11.80-0ubuntu1) trusty; urgency=low
-- Rohan Garg <rohangarg at kubuntu.org> Sat, 23 Nov 2013 17:25:11 +0100
+dolphin-plugins (4:4.11.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Sat, 09 Nov 2013 14:25:40 +0100
+
+dolphin-plugins (4:4.11.2-1) experimental; urgency=low
+
+ * First release of kdesdk after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 08 Oct 2013 10:59:29 +0200
+
dolphin-plugins (4:4.11.2-0ubuntu1) saucy; urgency=low
* New upstream bugfix release
@@ -123,3 +163,4 @@ dolphin-plugins (4:4.10.80-0ubuntu1) saucy; urgency=low
* Initial package, split from dolphin-plugins
-- Jonathan Riddell <jriddell at ubuntu.com> Fri, 21 Jun 2013 02:40:41 +0100
+
diff --git a/debian/control b/debian/control
index d932fc0..ede0476 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,27 @@ Source: dolphin-plugins
Section: kde
Priority: optional
Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.13.0), libkonq5-dev (>= 4:4.13.0)
-Standards-Version: 3.9.4
-Homepage: http://www.kde.org
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/dolphin-plugins
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/dolphin-plugins
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Sune Vuorela <sune at debian.org>,
+ Fathi Boudra <fabo at debian.org>,
+ Modestas Vainius <modax at debian.org>,
+ George Kiagiadakis <kiagiadakis.george at gmail.com>,
+ 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,
+ pkg-kde-tools (>= 0.12)
+Standards-Version: 3.9.5
+Homepage: http://www.kde.org/
+X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/dolphin-plugins.git
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/dolphin-plugins.git
Package: kdesdk-dolphin-plugins
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, dolphin
+Depends: dolphin, ${misc:Depends}, ${shlibs:Depends}
Replaces: dolphin (<< 4:4.5.0)
Enhances: dolphin
Description: dolphin VCS plugins
@@ -26,15 +35,3 @@ Description: dolphin VCS plugins
* Subversion
.
This package is part of the KDE Software Development Kit module.
-
-Package: kdesdk-dolphin-plugins-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${misc:Depends}, kde-runtime-dbg, kate-dbg, kdesdk-dolphin-plugins (= ${binary:Version})
-Replaces: kdeutils-dbg (<< 4:4.6), kdesdk-dbg
-Breaks: kdeutils-dbg (<< 4:4.6), kdesdk-dbg
-Description: debugging symbols for the KDE Software Development Kit module
- This package contains debugging files used to investigate problems with
- binaries included in the KDE Software Development Kit module.
-
diff --git a/debian/copyright b/debian/copyright
index b317462..58cbc21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,23 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: dolphin-plugins
+Upstream-Contact: Jeremy Paul Whiting <jpwhiting at kde.org>
+ Michael Pyne <mpyne at kde.org>
+ Sebastian Doerner <sebastian at sebastian-doerner.de>
Source: http://www.kde.org/download/
Files: *
-Copyright: 2009-2011, Peter Penz <peter.penz at gmx.at>
+Copyright: 2011, Canonical Ltd.
2010, Johannes Steffen <johannes.steffen at st.ovgu.de>
+ 2009-2011, Peter Penz <peter.penz19 at gmail.com>
2010, Sebastian Doerner <sebastian at sebastian-doerner.de>
- 2011, Canonical Ltd. by Jonathan Riddell <jriddell at ubuntu.com>
2011, Vishesh Yadav <vishesh3y at gmail.com>
License: GPL-2+
+
+Files: debian/*
+Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+License: GPL-2+
+
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -16,7 +25,7 @@ License: GPL-2+
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
diff --git a/debian/rules b/debian/rules
index 688c993..244905c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,5 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-override_dh_strip:
- $(overridden_command) --dbg-package=kdesdk-dolphin-plugins-dbg
+override_dh_auto_install:
+ $(overridden_command) --destdir=debian/tmp
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
index 3bf9494..845f245 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=3
-opts=dversionmangle=s/\+dfsg(\.\d+)?$// \
ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/dolphin-plugins-([\d\.]*).tar.xz
--
dolphin-plugins packaging
More information about the pkg-kde-commits
mailing list