[SCM] zeroconf-ioslave packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-22-gfa2c63c

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/zeroconf-ioslave.git;a=commitdiff;h=fa2c63c

The following commit has been merged in the kubuntu_xenial_archive branch:
commit fa2c63cd87a7f324c3c34e27c23abad034fc0131
Merge: 49ac5ba67e58f750d80a732c1a20320055ba2da7 4c8ad9b7c7f3859fd6ddff70cdd4baa440f1ad24
Author: Clive Johnston <clivejo at aol.com>
Date:   Sun Feb 7 14:54:38 2016 +0000

    Merging with Debian and New upstream release

 debian/.gitattributes |   1 +
 debian/changelog      |  34 ++++++++++++++--
 debian/compat         |   2 +-
 debian/control        |   9 +++--
 debian/copyright      | 106 +++++++++++++++++++++++++++-----------------------
 debian/rules          |   5 ++-
 6 files changed, 99 insertions(+), 58 deletions(-)

diff --cc debian/changelog
index 3642b80,9332b2c..f6ede74
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,30 +1,78 @@@
- zeroconf-ioslave (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++zeroconf-ioslave (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release 
++  * Merged with Debian
 +
-  -- Clive Johnston <clivejo at aol.com>  Sun, 03 Jan 2016 00:01:33 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sun, 07 Feb 2016 14:50:43 +0000
++
+ zeroconf-ioslave (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:43 +0100
+ 
+ zeroconf-ioslave (4:15.08.3-1) experimental; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:25 +0100
  
 +zeroconf-ioslave (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 13:10:06 +0100
 +
 +zeroconf-ioslave (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:49:07 +0100
 +
 +zeroconf-ioslave (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 18:24:47 +0100
 +
 +zeroconf-ioslave (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 12:36:25 +0100
 +
+ zeroconf-ioslave (4:15.04.2-1) experimental; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:13:45 +0200
+ 
 +zeroconf-ioslave (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * wrap-and-sort 
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 22:46:40 +0200
 +
 +zeroconf-ioslave (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:54:29 -0700
 +
+ zeroconf-ioslave (4:14.12.2-1) experimental; urgency=medium
+ 
+   * Prepare initial Debian release.
+   * Bump Standards-Version to 3.9.6, no changes needed.
+   * Update copyright information.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 16:18:08 +0100
+ 
  zeroconf-ioslave (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
zeroconf-ioslave packaging