[SCM] poxml packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-12-g779907f

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/poxml.git;a=commitdiff;h=779907f

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 779907fd4c76066dbef075e7a7ae27a21c0e7831
Merge: 79e88669aab654503f4c81e8e5a07df96482fc78 f756f71099d5e3ebf304ed2fd1eccf830d7e564a
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Feb 8 19:03:53 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog     | 12 ++++++++++--
 debian/control       |  7 ++-----
 debian/not-installed |  7 ++-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 725477b,c367826..ef12079
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,75 -1,9 +1,83 @@@
- poxml (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++poxml (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian 
 +  * Adding required build-dependencies
 +  * Bumped /usr/share/pkg-kde-tools/qt-kde-team/2 to 3
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:42:36 +0000
++ -- Clive Johnston <clivejo at aol.com>  Mon, 08 Feb 2016 19:00:36 +0000
++
+ poxml (4:15.12.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:48 +0100
+ 
 +
 +poxml (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 13:05:50 +0100
 +
 +poxml (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:46:10 +0100
 +
 +poxml (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 18:21:13 +0100
 +
 +poxml (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 12:32:25 +0100
 +
 +poxml (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * New upstream release
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 22:42:40 +0200
 +
 +poxml (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:59:10 -0700
 +
 +poxml (4:14.12.2-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +  * Remove unstable from watch file, uscan fails with 
 +    remote site does not even have current version
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 08:52:02 -0800
 +
 +poxml (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:19:57 +0100
 +
 +poxml (4:14.11.97-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream RC release
 +  * Merge with Debian, remaining changes:
 +   - not-installed
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 01 Dec 2014 18:03:53 +0100
 +
  poxml (4:4.14.0-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index e54e21f,89e8af3..ab5ce48
--- a/debian/control
+++ b/debian/control
@@@ -17,11 -15,10 +15,10 @@@ Build-Depends: antlr
                 libgettextpo-dev,
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
- XS-Testsuite: autopkgtest
  Homepage: http://www.kde.org/
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/poxml.git
 -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/poxml.git
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/poxml.git/
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/poxml.git
  
  Package: poxml
  Architecture: any

-- 
poxml packaging