Merge lp:~thedac/ubuntu/wily/python-pyscss/debian-merge into lp:ubuntu/wily/python-pyscss

[David Ames]

Debian merge

[Corey Bryant (corey.bryant)]

Just a note that we decided to sync this instead of the merge.

[Daniel Holbach (dholbach)]

Rejecting based on the comment above.

Unmerged revisions

11. By David Ames on 2015-08-17

* Merge from Debian unstable. Remaining changes:
  - Removed conflict in debian/control
* Add python-enum34 build-dep (Closes: #795521). Thanks Chris Lamb!
* Re-add missing manual page.
* New upstream version.
* Add missing build-deps python-pathlib and dh-python.
* Run unittests for Python 2.7 and 3.4.
* Removed obsolete patches python3-fixup and python-3.2-six.u.
* Lintian: Removed *.postrm.
* New standards version 3.9.6, no changes.

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-30 11:59:32 +0000
+++ debian/changelog	2015-08-17 19:03:49 +0000
@@ -1,3 +1,28 @@
+python-pyscss (1.3.4-2ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Removed conflict in debian/control
+
+ -- David Ames <[e-mail]>  Sat, 15 Aug 2015 04:09:17 +0000
+
+python-pyscss (1.3.4-2) unstable; urgency=medium
+
+  * Add python-enum34 build-dep (Closes: #795521). Thanks Chris Lamb!
+  * Re-add missing manual page.
+
+ -- W. Martin Borgert <[e-mail]>  Fri, 14 Aug 2015 23:02:06 +0000
+
+python-pyscss (1.3.4-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Add missing build-deps python-pathlib and dh-python.
+  * Run unittests for Python 2.7 and 3.4.
+  * Removed obsolete patches python3-fixup and python-3.2-six.u.
+  * Lintian: Removed *.postrm.
+  * New standards version 3.9.6, no changes.
+
+ -- W. Martin Borgert <[e-mail]>  Fri, 31 Jul 2015 23:33:35 +0000
+
 python-pyscss (1.3.4-0ubuntu2) wily; urgency=medium
 
   * Enable unit tests for python 3.4.
@@ -74,3 +99,4 @@
   * initial release (Closes: #705735)
 
  -- W. Martin Borgert <[e-mail]>  Sun, 21 Apr 2013 17:40:59 +0000
+

=== modified file 'debian/control'
--- debian/control	2015-06-30 11:59:32 +0000
+++ debian/control	2015-08-17 19:03:49 +0000
@@ -22,7 +22,7 @@
                python3-pytest,
                python3-setuptools,
                python3-six,
-               xsltproc,
+               xsltproc
 Standards-Version: 3.9.6
 Homepage: https://github.com/Kronuz/pyScss
 Vcs-Git: git://anonscm.debian.org/collab-maint/python-pyscss.git

=== modified file 'debian/copyright'
--- debian/copyright	2013-04-21 17:40:59 +0000
+++ debian/copyright	2015-08-17 19:03:49 +0000
@@ -7,6 +7,10 @@
 Copyright: 2011-2012, German M. Bravo (Kronuz) <[e-mail]>
 License: MIT
 
+Files: debian/*.dbk
+Copyright: 2013, W. Martin Borgert <[e-mail]>
+License: MIT
+
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2014-06-26 12:10:36 +0000
+++ debian/gbp.conf	2015-08-17 19:03:49 +0000
@@ -1,7 +1,7 @@
 [DEFAULT]
-upstream-branch = master
-debian-branch = debian
+upstream-branch = upstream
+debian-branch = master
 upstream-tag = %(version)s
 
-[git-buildpackage]
+[buildpackage]
 export-dir = ../build-area/

=== modified file 'debian/pyscss.dbk'
--- debian/pyscss.dbk	2013-04-21 17:40:59 +0000
+++ debian/pyscss.dbk	2015-08-17 19:03:49 +0000
@@ -2,22 +2,11 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
+<!-- (c) 2013 W. Martin Borgert <[e-mail]>
+     Date: 2013-04-21
+     License of this manual: MIT -->
+
 <refentry>
-  <refentryinfo>
-    <address>
-      <email>[e-mail]</email>
-    </address>
-    <author>
-      <firstname>W.</firstname>
-      <othername>Martin</othername>
-      <surname>Borgert</surname>
-    </author>
-    <copyright>
-      <year>2013</year>
-      <holder>W. Martin Borgert</holder>
-    </copyright>
-    <date>2013-04-21</date>
-  </refentryinfo>
   <refmeta>
     <refentrytitle>pyscss</refentrytitle>
     <manvolnum>1</manvolnum>
@@ -54,13 +43,4 @@
       </programlisting>
     </para>
   </refsect1>
-
-  <refsect1>
-    <title>Copyright for this manual</title>
-
-    <para>Copyright 2013 W. Martin Borgert. Redistribution and use in
-    source and binary forms, with or without modification, are
-    permitted under the terms of the <abbrev>MIT</abbrev>
-    License.</para>
-  </refsect1>
 </refentry>

=== added file 'debian/python-pyscss.lintian-overrides'
--- debian/python-pyscss.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/python-pyscss.lintian-overrides	2015-08-17 19:03:49 +0000
@@ -0,0 +1,1 @@
+python-pyscss: binary-without-manpage usr/bin/python2-pyscss

=== added file 'debian/python-pyscss.manpages'
--- debian/python-pyscss.manpages	1970-01-01 00:00:00 +0000
+++ debian/python-pyscss.manpages	2015-08-17 19:03:49 +0000
@@ -0,0 +1,1 @@
+pyscss.1

=== added file 'debian/python3-pyscss.lintian-overrides'
--- debian/python3-pyscss.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/python3-pyscss.lintian-overrides	2015-08-17 19:03:49 +0000
@@ -0,0 +1,1 @@
+python3-pyscss: binary-without-manpage usr/bin/python3-pyscss

=== added file 'debian/python3-pyscss.manpages'
--- debian/python3-pyscss.manpages	1970-01-01 00:00:00 +0000
+++ debian/python3-pyscss.manpages	2015-08-17 19:03:49 +0000
@@ -0,0 +1,1 @@
+pyscss.1