Thu May 12 18:35:10 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 7138644c41b959de3acba4b9daf6e3fc7afb28a1
Merge: 53bf75e 41ba8e7
Author: Andreas Noteng <andreas at noteng.no>
Date:   Wed May 11 23:02:21 2016 +0200

     iQIcBAABCAAGBQJXM53dAAoJELRG7qgympRa5yYQAIsiosDrjjn+ituWpX3CYa2h
     Dv5rRyFtajVYqmK9bRrhpyuWrhj5l5uWQbBW/CONq6hi4YvwXV4f673tUqRAueFr
     KNMFgb1uxcceUuJh5nZrAWP8YefjmVwD+aahCOXfQVKJeFcBxPIw/LiPTAiFrsFp
     /Iou1vTUSeTj3CQ7iJshjJdYNZUnEwO6+gsAtKpvrqTHcIvhrUdKd5wspP+J9IvR
     i1C/L/i4+Wl+1O6GjL+Y7sirQt167Fg+mAHESPw2bCmWqF+YJ798CeEIuwu4KHVn
     S15XoukDUMrQYef+vkECltvswNd/XeJOiYgEhU37X9YNTF1KpdaU7wZGQFW0ek3s
     OzNKwusRUUg0Nuelov30KfbB9cMYbElKtrUXlis63fMUZHgormjRj6kh6dHDVbT/
     4iLSPQpS2awpz4ymiIJq8RycItyyz/Hyx33dOMkH8ilqeO6ZYzYC+FpDJsSg2xGM
     2S3c+FyJLOORXscGKEJ9Q2ghW7jH0ww5+pZBZAyI8ffeAu7VyPG9FvbroPKKIexU
     oIc0TP85znyJy7TrJs2yz0ksW9B429WOBIsrFn3ompE6iqjvul5DP6HsIhKU3HeW
     4JwL1zfnEp9AHeCdaAfBEEjpU388WvFCuNI5RcASvTs5Nih24m7R/NDknn1gXSy8
     GV9jHNlPl0QIkQiPd9IG
     =6FaE
     -----END PGP SIGNATURE-----
    
    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Decription-Fix-version-in-setup.py.patch  | 28 ++++++++++++++++++++++
 ...-Replace-two-spaces-with-a-tab-in-the-sph.patch | 26 ++++++++++++++++++++
 debian/patches/series                              |  2 ++
 setup.py                                           |  4 ++--
 sphinx/Makefile                                    |  2 +-
 6 files changed, 61 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 6524cbf,0000000..6088134
mode 100644,000000..100644

--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 01e4c07b90934332149c14210b136c3eb39a7d49
- 01e4c07b90934332149c14210b136c3eb39a7d49
++41ba8e7bf52b7a72a25f6b8a50c980aec2134974
++41ba8e7bf52b7a72a25f6b8a50c980aec2134974
 +01e4c07b90934332149c14210b136c3eb39a7d49
 +01e4c07b90934332149c14210b136c3eb39a7d49
 +python-easygui_0.98.0.orig.tar.gz
 +217c43738af484d453110a70ddf2d0b4e2f8570b
 +1891080
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Decription-Fix-version-in-setup.py.patch
index 0000000,0000000..dec882c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Decription-Fix-version-in-setup.py.patch
@@@ -1,0 -1,0 +1,28 @@@
++From da26d8af10712d65df956c632099f996cdf2dfc3 Mon Sep 17 00:00:00 2001
++From: Andreas Noteng <andreas at noteng.no>
++Date: Wed, 11 May 2016 22:59:50 +0200
++Subject: =?UTF-8?q?Decription:=20Fix=20version=20in=20setup.py=0AAuthor:?=
++ =?UTF-8?q?=20Andreas=20Noteng=20<andreas at noteng.no>=0AForwarded:=20not-ne?=
++ =?UTF-8?q?eded=0A---=0AThis=20patch=20header=20follows=20DEP-3:=20http://?=
++ =?UTF-8?q?dep.debian.net/deps/dep3/=0A=20Please=20enter=20the=20commit=20?=
++ =?UTF-8?q?message=20for=20your=20changes.=20Lines=20starting?=
++
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index f00c90c..77d753f 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -2,8 +2,8 @@ import distutils.core
++ ## WARNING: Although the following import appears to do nothing, it is required for bdist_wheel to be recognized
++ from setuptools import setup, find_packages
++ 
++-version = "0.98.0-UNRELEASED"
++-release = "0.98.0-UNRELEASED"
+++version = "0.98.0"
+++release = "0.98.0"
++ 
++ desc = list()
++ desc.append('EasyGUI is a module for very simple, very easy GUI programming in Python.  ')
diff --cc debian/patches/0002-Description-Replace-two-spaces-with-a-tab-in-the-sph.patch
index 0000000,0000000..f05c895
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Description-Replace-two-spaces-with-a-tab-in-the-sph.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 41ba8e7bf52b7a72a25f6b8a50c980aec2134974 Mon Sep 17 00:00:00 2001
++From: Andreas Noteng <andreas at noteng.no>
++Date: Wed, 11 May 2016 23:01:41 +0200
++Subject: =?UTF-8?q?Description:=20Replace=20two=20spaces=20with=20a=20tab?=
++ =?UTF-8?q?=20in=20the=20sphinx=20makefile=0AAuthor:=20Andreas=20Noteng=20?=
++ =?UTF-8?q?<andreas at noteng.no>=0AForwarded:=20Email=20to=20upstream=0A---?=
++ =?UTF-8?q?=0AThis=20patch=20header=20follows=20DEP-3:=20http://dep.debian?=
++ =?UTF-8?q?.net/deps/dep3/?=
++
++---
++ sphinx/Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/sphinx/Makefile b/sphinx/Makefile
++index d2fa4b0..7131464 100644
++--- a/sphinx/Makefile
+++++ b/sphinx/Makefile
++@@ -49,7 +49,7 @@ help:
++ 
++ clean:
++ 	rm -rf $(BUILDDIR)/*
++-  rm -rf $(HTMLBUILDDIR)/*
+++	rm -rf $(HTMLBUILDDIR)/*
++ 
++ html:
++ 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(HTMLBUILDDIR)/html
diff --cc debian/patches/series
index 0000000,0000000..bb6d6d4
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Decription-Fix-version-in-setup.py.patch
++0002-Description-Replace-two-spaces-with-a-tab-in-the-sph.patch

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

