[Python-modules-commits] [sqlobject] 01/01: Remove ss-by-ca-2.0 licensed files. Document copyright of the compat helper script added for python 3 support

[Neil Muller]

This is an automated email from the git hooks/post-receive script.

drnlmza-guest pushed a commit to branch master
in repository sqlobject.

commit fb08f57ae0435e470411ece3edb9a7a3c07cae41
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Sun Jul 3 22:16:45 2016 +0200

    Remove ss-by-ca-2.0 licensed files. Document copyright of the compat helper script added for python 3 support
---
 debian/copyright | 27 +++++++++++++++++++++++++++
 debian/watch     |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index f34f91c..73762bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,21 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SQLObject
 Upstream-Contact: Oleg Broytman <phd at phdru.name>
+Files-Excluded: docs/presentation-2004-11/ui/*
 Source: http://sqlobject.org/
+ The presentation uses s5 v1.0, which was released under the CC-BY-SA
+ version 2.0 (documented at http://meyerweb.com/eric/tools/s5/faq.html),
+ which is not acceptable for Debian main.
 
 Files: *
 Copyright: 2000-2008 Ian Bicking
  2008-2016 Oleg Broytman
 License: LGPL-2.1+
 
+Files: sqlobject/compat.py
+ 2015-2016 Oleg Broytman
+ License: MIT
+
 Files: debian/*
 Copyright: 2004, Carlos Perelló Marín
  2006-2009 Fabio Tranchitella
@@ -27,3 +35,22 @@ License: LGPL-2.1+
  You should have received a copy of the GNU Lesser General Public License
  along with this package; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+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 in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
diff --git a/debian/watch b/debian/watch
index 2284c8c..ad6f932 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-opts="pgpsigurlmangle=s/$/.asc/" https://pypi.debian.net/SQLObject/SQLObject-([\d\.]*)\.tar\.gz
+opts=pgpsigurlmangle=s/$/.asc/,repacksuffix=+dfsg,dversionmangle=s/\+dfsg\d*$// \
+     https://pypi.debian.net/SQLObject/SQLObject-([\d\.]*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sqlobject.git