[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=6b195f6
The following commit has been merged in the master branch:
commit 6b195f6de686503213a9af27dd438b447e99eb51
Merge: 6908333526c64fb577cad3da5d14c72a4d71d5de 40855ef3c1a39e1401bb376ab75a5547c5a392c9
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Jul 30 16:08:59 2014 +0200
Merge commit '40855ef3c1a39e1401bb376ab75a5547c5a392c9'
Conflicts:
debian/changelog
debian/control
debian/watch
debian/changelog | 136 ++++++++++++++++++++++++++++++++++++++++
debian/control | 5 +-
debian/source/lintian-overrides | 1 +
debian/watch | 2 +-
4 files changed, 142 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index ff8bd0d,727c569..04be41e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+dolphin-plugins (4:4.13.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Jul 2014 13:25:16 +0200
+
+ dolphin-plugins (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+ [ Rohan Garg ]
+ * Merge with Debian, no remaining changes
+
+ [ Jonathan Riddell ]
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 18 Jun 2014 11:39:53 +0100
+
dolphin-plugins (4:4.13.1-1) unstable; urgency=medium
* New upstream release.
@@@ -11,6 -15,42 +21,42 @@@
-- 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
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 10 Apr 2014 21:35:05 +0100
+
+ dolphin-plugins (4:4.12.97-0ubuntu2) trusty; urgency=medium
+
+ * Batch import fixes between 4.12.97 and current git KDE/4.13 in
- debian/patches/upstream_git/
++ debian/patches/upstream_git/
+ + KDE Bug: #332481
+
+ -- Harald Sitter <apachelogger at kubuntu.org> Wed, 09 Apr 2014 16:17:47 +0200
+
+ dolphin-plugins (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org> Wed, 02 Apr 2014 11:06:23 +0200
+
+ dolphin-plugins (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sun, 23 Mar 2014 11:53:25 +0100
+
+ dolphin-plugins (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+ [ Jonathan Riddell ]
+ * New upstream beta release
+
+ [ Philip Muškovac ]
+ * Add fileviewdropboxplugin to install file
+
+ -- 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.
@@@ -37,3 -119,52 +125,51 @@@ dolphin-plugins (4:4.11.2-1) experiment
* 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
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 30 Sep 2013 13:55:22 +0100
+
+ dolphin-plugins (4:4.11.1-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Howard Chan <smartboyhw at gmail.com> Fri, 06 Sep 2013 22:03:47 +0100
+
+ dolphin-plugins (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:55:14 +0100
+
+ dolphin-plugins (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:02:00 +0100
+
+ dolphin-plugins (4:4.10.95-0ubuntu1) saucy; urgency=low
+
+ * New upstream RC release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 19 Jul 2013 12:31:40 +0000
+
+ dolphin-plugins (4:4.10.90-0ubuntu1) saucy; urgency=low
+
+ * New upstream bet release
+
+ -- Michał Zając <quintasan at kubuntu.org> Fri, 28 Jun 2013 17:57:29 +0100
+
+ dolphin-plugins (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+ * Initial package, split from dolphin-plugins
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 21 Jun 2013 02:40:41 +0100
-
diff --cc debian/control
index d7ae869,f97c525..075a77a
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
Source: dolphin-plugins
Section: kde
Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++Maintainer: Debian/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>,
Fathi Boudra <fabo at debian.org>,
Modestas Vainius <modax at debian.org>,
@@@ -15,8 -16,8 +16,10 @@@ Build-Depends: cmake
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
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/dolphin-plugins.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/dolphin-plugins.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/dolphin-plugins
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/dolphin-plugins
Package: kdesdk-dolphin-plugins
Architecture: any
diff --cc debian/watch
index d781301,845f245..2317497
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,2 +1,2 @@@
version=3
- http://download.kde.org/stable/([\d.]+)/src/dolohin-plugins-([\d.]+).tar.xz
-ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/dolphin-plugins-([\d\.]*).tar.xz
++http://download.kde.org/stable/([\d.]+)/src/dolphin-plugins-([\d.]+).tar.xz
--
dolphin-plugins packaging
More information about the pkg-kde-commits
mailing list