[Python-modules-commits] r29326 - in packages/python-pycaptcha/tags (14 files)

osallou-guest at users.alioth.debian.org osallou-guest at users.alioth.debian.org
Fri Jun 13 11:14:34 UTC 2014


    Date: Friday, June 13, 2014 @ 11:14:33
  Author: osallou-guest
Revision: 29326

[svn-buildpackage] Tagging pycaptcha 0.4-2

Added:
  packages/python-pycaptcha/tags/0.4-2/
  packages/python-pycaptcha/tags/0.4-2/debian/changelog
    (from rev 29324, packages/python-pycaptcha/trunk/debian/changelog)
  packages/python-pycaptcha/tags/0.4-2/debian/control
    (from rev 29323, packages/python-pycaptcha/trunk/debian/control)
  packages/python-pycaptcha/tags/0.4-2/debian/copyright
    (from rev 29322, packages/python-pycaptcha/trunk/debian/copyright)
  packages/python-pycaptcha/tags/0.4-2/debian/patches/series
    (from rev 29324, packages/python-pycaptcha/trunk/debian/patches/series)
  packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs
    (from rev 29322, packages/python-pycaptcha/trunk/debian/patches/up_examples_shebangs)
  packages/python-pycaptcha/tags/0.4-2/debian/patches/use_debian_share
    (from rev 29324, packages/python-pycaptcha/trunk/debian/patches/use_debian_share)
  packages/python-pycaptcha/tags/0.4-2/debian/rules
    (from rev 29325, packages/python-pycaptcha/trunk/debian/rules)
Deleted:
  packages/python-pycaptcha/tags/0.4-2/debian/changelog
  packages/python-pycaptcha/tags/0.4-2/debian/control
  packages/python-pycaptcha/tags/0.4-2/debian/copyright
  packages/python-pycaptcha/tags/0.4-2/debian/patches/series
  packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs
  packages/python-pycaptcha/tags/0.4-2/debian/rules

Deleted: packages/python-pycaptcha/tags/0.4-2/debian/changelog
===================================================================
--- packages/python-pycaptcha/trunk/debian/changelog	2014-06-13 09:30:59 UTC (rev 29321)
+++ packages/python-pycaptcha/tags/0.4-2/debian/changelog	2014-06-13 11:14:33 UTC (rev 29326)
@@ -1,17 +0,0 @@
-pycaptcha (0.4-2.1) unstable; urgency=low
-
-  [ Jakub Wilk ]
-  * Use canonical URIs for Vcs-* fields.
-
-  [ Hugo Lefeuvre ]
-  * Use the last version of Debian Policy:
-    - Using 3.9.5 instead of 3.9.2
-
- -- Hugo Lefeuvre <hugo6390 at orange.fr>  Fri, 13 Jun 2014 09:47:55 +0200
-
-pycaptcha (0.4-1) unstable; urgency=low
-
-  * Initial release (Closes: #637109)
-  * Upload is sponsored by Yaroslav Halchenko
-
- -- Olivier Sallou <olivier.sallou at irisa.fr>  Mon, 08 Aug 2011 14:55:59 +0200

Copied: packages/python-pycaptcha/tags/0.4-2/debian/changelog (from rev 29324, packages/python-pycaptcha/trunk/debian/changelog)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/changelog	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/changelog	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,20 @@
+pycaptcha (0.4-2) unstable; urgency=low
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Hugo Lefeuvre ]
+  * Use the last version of Debian Policy:
+    - Using 3.9.5 instead of 3.9.2
+
+  [ Olivier Sallou ]
+  * d/patches: add headers to patch and use /usr/share for images
+  * d/copyright: use versioned copyright
+
+ -- Olivier Sallou <osallou at debian.org>  Fri, 13 Jun 2014 12:14:23 +0200
+
+pycaptcha (0.4-1) unstable; urgency=low
+
+  * Initial release (Closes: #637109)
+  * Upload is sponsored by Yaroslav Halchenko
+
+ -- Olivier Sallou <olivier.sallou at irisa.fr>  Mon, 08 Aug 2011 14:55:59 +0200

Deleted: packages/python-pycaptcha/tags/0.4-2/debian/control
===================================================================
--- packages/python-pycaptcha/trunk/debian/control	2014-06-13 09:30:59 UTC (rev 29321)
+++ packages/python-pycaptcha/tags/0.4-2/debian/control	2014-06-13 11:14:33 UTC (rev 29326)
@@ -1,20 +0,0 @@
-Source: pycaptcha
-Section: python
-Priority: optional
-Uploaders: Olivier Sallou <olivier.sallou at irisa.fr>
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends:  debhelper (>= 8), 
-                python-imaging (>= 1.1.5),
-                python (>= 2.6)
-Standards-Version: 3.9.5
-Homepage: http://pypi.python.org/pypi/PyCAPTCHA/0.4
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pycaptcha/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-pycaptcha/trunk/
-
-Package: python-captcha
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-imaging (>= 1.1.5), ttf-bitstream-vera
-Description: collection of Python modules implementing CAPTCHAs
- This package contains Python modules to add some captcha
- in an application to recognize a human versus a robot.
- The package generates an image based on a dictionary.

Copied: packages/python-pycaptcha/tags/0.4-2/debian/control (from rev 29323, packages/python-pycaptcha/trunk/debian/control)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/control	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/control	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,20 @@
+Source: pycaptcha
+Section: python
+Priority: optional
+Uploaders: Olivier Sallou <osallou at debian.org>
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 8), 
+               python-imaging (>= 1.1.5),
+               python (>= 2.6)
+Standards-Version: 3.9.5
+Homepage: http://pypi.python.org/pypi/PyCAPTCHA/0.4
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pycaptcha/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-pycaptcha/trunk/
+
+Package: python-captcha
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-imaging (>= 1.1.5), ttf-bitstream-vera
+Description: collection of Python modules implementing CAPTCHAs
+ This package contains Python modules to add some captcha
+ in an application to recognize a human versus a robot.
+ The package generates an image based on a dictionary.

Deleted: packages/python-pycaptcha/tags/0.4-2/debian/copyright
===================================================================
--- packages/python-pycaptcha/trunk/debian/copyright	2014-06-13 09:30:59 UTC (rev 29321)
+++ packages/python-pycaptcha/tags/0.4-2/debian/copyright	2014-06-13 11:14:33 UTC (rev 29326)
@@ -1,76 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: pycaptcha
-Source: http://pypi.python.org/pypi/PyCAPTCHA/0.4
-
-Files: *
-Copyright: 2004 Micah Dowty
-License: MIT
-
-Files: setup/my_install_data.py
-Copyright: 2000 Rene Liebscher
-License: MIT
-
-Files: Captcha/data/fonts/vera/*
-Copyright: 2003 Bitstream, Inc
-Comment: only pertinent to source package, binary packages use
-         system-wide installed copy
-License:
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute
- the Font Software, including without limitation the rights to use,
- copy, merge, publish, distribute, and/or sell copies of the Font
- Software, and to permit persons to whom the Font Software is furnished
- to do so, subject to the following conditions:
-  .
- The above copyright and trademark notices and this permission notice
- shall be included in all copies of one or more of the Font Software
- typefaces.
- .
- The Font Software may be modified, altered, or added to, and in
- particular the designs of glyphs or characters in the Fonts may be
- modified and additional glyphs or characters may be added to the
- Fonts, only if the fonts are renamed to names not containing either
- the words "Bitstream" or the word "Vera".
- .
- This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
- .
- The Font Software may be sold as part of a larger software package but
- no copy of one or more of the Font Software typefaces may be sold by
- itself.
- .
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
- BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
- OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
- SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Files: debian/*
-Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
-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 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.

Copied: packages/python-pycaptcha/tags/0.4-2/debian/copyright (from rev 29322, packages/python-pycaptcha/trunk/debian/copyright)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/copyright	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/copyright	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,76 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pycaptcha
+Source: http://pypi.python.org/pypi/PyCAPTCHA/0.4
+
+Files: *
+Copyright: 2004 Micah Dowty
+License: MIT
+
+Files: setup/my_install_data.py
+Copyright: 2000 Rene Liebscher
+License: MIT
+
+Files: Captcha/data/fonts/vera/*
+Copyright: 2003 Bitstream, Inc
+Comment: only pertinent to source package, binary packages use
+         system-wide installed copy
+License:
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute
+ the Font Software, including without limitation the rights to use,
+ copy, merge, publish, distribute, and/or sell copies of the Font
+ Software, and to permit persons to whom the Font Software is furnished
+ to do so, subject to the following conditions:
+  .
+ The above copyright and trademark notices and this permission notice
+ shall be included in all copies of one or more of the Font Software
+ typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may be
+ modified and additional glyphs or characters may be added to the
+ Fonts, only if the fonts are renamed to names not containing either
+ the words "Bitstream" or the word "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts
+ or Font Software that has been modified and is distributed under the
+ "Bitstream Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but
+ no copy of one or more of the Font Software typefaces may be sold by
+ itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+ OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+ SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Files: debian/*
+Copyright: 2011 Olivier Sallou <olivier.sallou at irisa.fr>
+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 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.

Deleted: packages/python-pycaptcha/tags/0.4-2/debian/patches/series
===================================================================
--- packages/python-pycaptcha/trunk/debian/patches/series	2014-06-13 09:30:59 UTC (rev 29321)
+++ packages/python-pycaptcha/tags/0.4-2/debian/patches/series	2014-06-13 11:14:33 UTC (rev 29326)
@@ -1,2 +0,0 @@
-up_examples_shebangs
-change_font_path

Copied: packages/python-pycaptcha/tags/0.4-2/debian/patches/series (from rev 29324, packages/python-pycaptcha/trunk/debian/patches/series)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/patches/series	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/patches/series	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,3 @@
+up_examples_shebangs
+change_font_path
+use_debian_share

Deleted: packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs
===================================================================
--- packages/python-pycaptcha/trunk/debian/patches/up_examples_shebangs	2014-06-13 09:30:59 UTC (rev 29321)
+++ packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs	2014-06-13 11:14:33 UTC (rev 29326)
@@ -1,7 +0,0 @@
---- a/modpython_example.py
-+++ b/modpython_example.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- #
- # An example that presents CAPTCHA tests in a web environment
- # and gives the user a chance to solve them.

Copied: packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs (from rev 29322, packages/python-pycaptcha/trunk/debian/patches/up_examples_shebangs)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/patches/up_examples_shebangs	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,12 @@
+Subject: set python shebang
+Descrition: missing shebang in script
+Last-Updated: 2011-09-19
+Author: yoh
+Forwarded: no
+--- a/modpython_example.py
++++ b/modpython_example.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ #
+ # An example that presents CAPTCHA tests in a web environment
+ # and gives the user a chance to solve them.

Copied: packages/python-pycaptcha/tags/0.4-2/debian/patches/use_debian_share (from rev 29324, packages/python-pycaptcha/trunk/debian/patches/use_debian_share)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/patches/use_debian_share	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/patches/use_debian_share	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,31 @@
+Subject: place images in /usr/share
+Description: upstream source includes some images
+ to generate captcha. Place images in /usr/share instead of python 
+ for arch independant location.
+ lib path.
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2014-06-13
+Forwarded: no
+--- a/Captcha/File.py
++++ b/Captcha/File.py
+@@ -10,7 +10,8 @@
+ import os, random
+ 
+ # Determine the data directory. This can be overridden after import-time if needed.
+-dataDir = os.path.join(os.path.split(os.path.abspath(__file__))[0], "data")
++#dataDir = os.path.join(os.path.split(os.path.abspath(__file__))[0], "data")
++dataDir = '/usr/share/python-captcha'
+ 
+ 
+ class RandomFileFactory(object):
+--- a/Captcha/Words.py
++++ b/Captcha/Words.py
+@@ -25,7 +25,7 @@
+ 
+     def read(self):
+         """Read words from disk"""
+-        f = open(os.path.join(File.dataDir, "words", self.fileName))
++        f = open(os.path.join('/usr/share/python-captcha', "words", self.fileName))
+ 
+         self.words = []
+         for line in f.xreadlines():

Deleted: packages/python-pycaptcha/tags/0.4-2/debian/rules
===================================================================
--- packages/python-pycaptcha/trunk/debian/rules	2014-06-13 09:30:59 UTC (rev 29321)
+++ packages/python-pycaptcha/tags/0.4-2/debian/rules	2014-06-13 11:14:33 UTC (rev 29326)
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@   --with python2 
-
-override_dh_auto_install:
-	dh_auto_install
-	rm -rf debian/python-captcha/usr/lib/python2.*/dist-packages/Captcha/data/fonts
-	rm -rf debian/python-captcha/Captcha/data/fonts/vera
-
-get-orig-source:
-	bash debian/get-orig-source

Copied: packages/python-pycaptcha/tags/0.4-2/debian/rules (from rev 29325, packages/python-pycaptcha/trunk/debian/rules)
===================================================================
--- packages/python-pycaptcha/tags/0.4-2/debian/rules	                        (rev 0)
+++ packages/python-pycaptcha/tags/0.4-2/debian/rules	2014-06-13 11:14:33 UTC (rev 29326)
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@   --with python2 
+
+override_dh_auto_install:
+	dh_auto_install
+	rm -rf debian/python-captcha/usr/lib/python2.*/dist-packages/Captcha/data/fonts
+	rm -rf debian/python-captcha/Captcha/data/fonts/vera
+	mkdir -p debian/python-captcha/usr/share/python-captcha
+	mv debian/python-captcha/usr/lib/python2.*/dist-packages/Captcha/data/words debian/python-captcha/usr/share/python-captcha
+	mv debian/python-captcha/usr/lib/python2.*/dist-packages/Captcha/data/pictures debian/python-captcha/usr/share/python-captcha
+	rm -rf debian/python-captcha/usr/lib/python2.*/dist-packages/Captcha/data
+
+get-orig-source:
+	bash debian/get-orig-source




More information about the Python-modules-commits mailing list