[Python-modules-commits] [python-easygui] 01/01: Forgot about -a in the last commit, thus missing a lot of changes.

Andreas Noteng anoteng-guest at moszumanska.debian.org
Thu May 12 18:38:16 UTC 2016


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

anoteng-guest pushed a commit to branch master
in repository python-easygui.

commit 711f6699ed95069cf90de2ba9dd4e28725b36d6e
Author: Andreas Noteng <andreas at noteng.no>
Date:   Thu May 12 20:37:36 2016 +0200

    Forgot about -a in the last commit, thus missing a lot of changes.
---
 debian/changelog                | 13 +++++++++++--
 debian/control                  | 11 ++++++++---
 debian/copyright                | 13 +++++--------
 debian/python-easygui.doc-base  | 10 ----------
 debian/python-easygui.docs      |  2 --
 debian/python3-easygui.doc-base | 10 ----------
 debian/python3-easygui.docs     |  2 --
 debian/rules                    | 12 +-----------
 debian/watch                    |  3 ++-
 9 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1b4a2b..261d15a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-easygui (0.96-4) UNRELEASED; urgency=low
+python-easygui (0.98-1) UNRELEASED; urgency=low
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
@@ -6,7 +6,16 @@ python-easygui (0.96-4) UNRELEASED; urgency=low
   [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:31 +0200
+  [ Andreas Noteng ]
+  * New upstream release
+  * Updated watch file to match upstream's move to github
+  * Bump Standards-Version to 3.9.8 (no change)
+  * Updated copyright file with new upstream author
+  * Add recommends: python3-pil.imagetk to allow for JPEGs in python3
+  * Update Homepage: in debian/control and Source: in debian/copyright
+ 
+
+ -- Andreas Noteng <andreas at noteng.no>  Thu, 12 May 2016 20:16:39 +0200
 
 python-easygui (0.96-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f340303..a9498bf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,15 @@ Maintainer: Andreas Noteng <andreas at noteng.no>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.6.6-3),
-               python3-all (>= 3.1.2-6~)
-Standards-Version: 3.9.3
+               python3-all (>= 3.1.2-6~),
+               python-setuptools,
+               python-sphinx,
+               python-tk,
+               python3-setuptools
+Standards-Version: 3.9.8
 X-Python-Version: >= 2.5
 X-Python3-Version: >= 3.0
-Homepage: http://easygui.sourceforge.net/
+Homepage: https://github.com/robertlugg/easygui
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-easygui.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-easygui.git
 
@@ -27,6 +31,7 @@ Description: module for very simple, very easy GUI programming in Python
 Package: python3-easygui
 Architecture: all
 Depends: python3-tk, ${misc:Depends}, ${python3:Depends}
+Recommends: python3-pil.imagetk
 Description: module for very simple, very easy GUI programming in Python3
  This package provides the Python3 modules EasyGUI. Experienced Pythonistas
  need support for quick and dirty GUI features. New Python programmers need
diff --git a/debian/copyright b/debian/copyright
index e9d0df2..312fbde 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: EasyGUI
-Upstream-Contact: Steve Ferg
-Source: http://easygui.sourceforge.net/
-Comment: The license in the tarball is not updated, upstream changed the
- license after the release of the v0.96 source tarball. Please see the
- upstream download page for confirmation:
- http://easygui.sourceforge.net/download/version0.96/
+Upstream-Contact: Robert Lugg
+Source: https://github.com/robertlugg/easygui
 
 Files: *
-Copyright: 2008 Steve Ferg
+Copyright: 2008-2014, Stephen Raymond Ferg <easygui at ferg.org>
+           2014-2016, Robert Lugg <robert.lugg at gmail.com>
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2010-2012, Andreas Noteng <andreas at noteng.no>
+Copyright: 2010-2016, Andreas Noteng <andreas at noteng.no>
            2011, Charlie Smotherman <cjsmo at cableone.net>
 License: BSD-3-clause
 
diff --git a/debian/python-easygui.doc-base b/debian/python-easygui.doc-base
deleted file mode 100644
index 0796c27..0000000
--- a/debian/python-easygui.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: python-easygui
-Title: EasyGUI Manual
-Author: Steve Ferg
-Abstract: This manual describes what EasyGUI is, and how to use it to create
- simple GUIs for your Python scripts.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-easygui/easygui_pydoc.html
-Files: /usr/share/doc/python-easygui/*.html
diff --git a/debian/python-easygui.docs b/debian/python-easygui.docs
deleted file mode 100644
index 7a43d62..0000000
--- a/debian/python-easygui.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-easygui_pydoc.html
-easygui_version_info.html
diff --git a/debian/python3-easygui.doc-base b/debian/python3-easygui.doc-base
deleted file mode 100644
index 2fb5f52..0000000
--- a/debian/python3-easygui.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: python3-easygui
-Title: EasyGUI Manual
-Author: Steve Ferg
-Abstract: This manual describes what EasyGUI is, and how to use it to create
- simple GUIs for your Python scripts.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python3-easygui/easygui_py3doc.html
-Files: /usr/share/doc/python3-easygui/*.html
diff --git a/debian/python3-easygui.docs b/debian/python3-easygui.docs
deleted file mode 100644
index 214894e..0000000
--- a/debian/python3-easygui.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-easygui_py3doc.html
-py3_easygui_version_info.html
diff --git a/debian/rules b/debian/rules
index cd5e156..658c000 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ override_dh_auto_build:
 	for py in $(PYVERS) $(PY3VERS); do \
 		$$py setup.py build; \
 	done
+	make -C sphinx man
 
 override_dh_auto_install:
 	set -ex; \
@@ -23,14 +24,3 @@ override_dh_auto_install:
 		$$py setup.py install --skip-build --root debian/python3-easygui \
 			--install-layout deb; \
 	done
-
-override_dh_installdocs:
-	cp easygui_pydoc.html easygui_py3doc.html
-	cp easygui_version_info.html py3_easygui_version_info.html
-	dh_installdocs
-
-override_dh_auto_clean:
-	rm -rf build *.egg.info
-	rm -rf easygui_py3doc.html
-	rm -rf py3_easygui_version_info.html
-	dh_auto_clean
diff --git a/debian/watch b/debian/watch
index 9eeedc7..0a1a2c9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/easygui/easygui-([0-9.]+)\.tar\.gz
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/$1\.tar\.gz/ \
+  https://github.com/robertlugg/easygui/tags .*/v?(\d\S*)\.tar\.gz

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



More information about the Python-modules-commits mailing list