[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.10_git20111001-1-2-g04d0ae4

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Shockwave Flash (SWF) player".

The branch, master has been updated
       via  04d0ae4560973cdd183ef85db9b8fbcb52166f08 (commit)
       via  6533b8926fedba83a6a43d37adbc26ff9ef70048 (commit)
      from  96d6a48dc2c38891aa8c70fcabed8ba087963e09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 04d0ae4560973cdd183ef85db9b8fbcb52166f08
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Oct 23 03:48:30 2011 +0200

    Fix d/copyright according to DEP-5.

commit 6533b8926fedba83a6a43d37adbc26ff9ef70048
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Oct 23 02:13:46 2011 +0200

    Transition to dh_python2.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    7 +++++++
 debian/control   |    4 ++--
 debian/copyright |   14 +++++++++-----
 debian/rules     |    5 +----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a13af6..67dee11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnash (0.8.10~git20111001-2) UNRELEASED; urgency=low
+
+  * Transition to dh_python2.
+  * Fix d/copyright according to DEP-5.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 23 Oct 2011 03:47:47 +0200
+
 gnash (0.8.10~git20111001-1) unstable; urgency=low
 
   * Git snapshot.
diff --git a/debian/control b/debian/control
index 1b952ca..0ac858a 100644
--- a/debian/control
+++ b/debian/control
@@ -45,13 +45,13 @@ Build-Depends: autoconf,
                libtool,
                libxmu-dev,
                libxv-dev,
-               python-all-dev,
+               python-all-dev (>= 2.6.6-3~),
                python-gtk2-dev,
-               python-support,
                qt4-qmake,
                sng,
                xsltproc,
                xulrunner-dev
+XS-Python-Version: current
 Standards-Version: 3.9.2
 Section: video
 Homepage: http://www.gnu.org/software/gnash/
diff --git a/debian/copyright b/debian/copyright
index eb5e66b..35f0438 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Gnash - GNU Shockwave Flash (SWF) player
-Maintainer: Gnash development team <gnash-dev at gnu.org>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Upstream-Name: Gnash - GNU Shockwave Flash (SWF) player
+Upstream-Contact: Gnash development team <gnash-dev at gnu.org>
 Source: http://www.gnu.org/software/gnash/
 
+Files: *
 Copyright: 2005-2011 Free Software Foundation, Inc.
 License: GPL-3+ and GFDL-1.2+
  Source code is released under GPL-3+ license.
@@ -39,7 +40,10 @@ Copyright: 2004, Apple Computer Inc. and The Mozilla Foundation.
 License: BSD-3-clause
 
 Files: libcore/fontlib.cpp
-Copyright: Public domain
+Copyright: none
+License: public-domain
+ This source code has been donated to the Public Domain. Do whatever you want
+ with it.
 
 Files: testsuite/media/Bitstream-Vera-Sans.fdb
 Copyright: 2003, Bitstream Inc.
@@ -111,7 +115,7 @@ License: GPL-3+
  On Debian systems, the complete text of the GNU General Public License
  version 3 can be found in '/usr/share/common-licenses/GPL-3'.
 
-License: GDFL-1.2+
+License: GFDL-1.2+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2
  or any later version published by the Free Software Foundation;
diff --git a/debian/rules b/debian/rules
index 7cb27f0..cc679ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ OBJDIR    := $(CURDIR)/tmp.build
 	intltool-merge -d debian/po $< $@
 
 %:
-	dh --builddirectory=$(OBJDIR) $@
+	dh --builddirectory=$(OBJDIR) --with python2 $@
 
 CFLAGS = -Wall -g -Werror-implicit-function-declaration
 LDFLAGS = -Wl,--no-add-needed
@@ -99,9 +99,6 @@ override_dh_auto_install:
 
 override_dh_strip:
 	dh_strip --dbg-package=gnash-dbg
-	# lintian: python-debug-in-wrong-location
-	mv debian/gnash-dbg/usr/lib/debug/usr/lib/pyshared \
-		debian/gnash-dbg/usr/lib/debug/usr/lib/pymodules
 
 override_dh_gencontrol:
 	dh_gencontrol -Nswfdec-gnome


hooks/post-receive
-- 
GNU Shockwave Flash (SWF) player