[Python-modules-commits] r24679 - in packages/fabulous/trunk/debian (9 files)

laarmen-guest at users.alioth.debian.org laarmen-guest at users.alioth.debian.org
Thu Jun 6 12:11:37 UTC 2013 

    Date: Thursday, June 6, 2013 @ 12:11:25
  Author: laarmen-guest
Revision: 24679

Remove the fonts from the tarball
Add a patch to specify exception types
Fix the lib path in the build_xterm256 patch
Deactivate the ez_setup code in setup.py

Added:
  packages/fabulous/trunk/debian/README.source
  packages/fabulous/trunk/debian/patches/fix_except
  packages/fabulous/trunk/debian/patches/remove_ez_setup
Modified:
  packages/fabulous/trunk/debian/changelog
  packages/fabulous/trunk/debian/copyright
  packages/fabulous/trunk/debian/patches/build_xterm256_ext
  packages/fabulous/trunk/debian/patches/series
  packages/fabulous/trunk/debian/rules
  packages/fabulous/trunk/debian/watch

Added: packages/fabulous/trunk/debian/README.source
===================================================================
--- packages/fabulous/trunk/debian/README.source	                        (rev 0)
+++ packages/fabulous/trunk/debian/README.source	2013-06-06 12:11:25 UTC (rev 24679)
@@ -0,0 +1,7 @@
+The fabulous/fonts directory has been removed as the license of these files
+isn't specified.
+
+To produce the tarball from the original tarball obtained via means like uscan,
+just do
+
+$ gzip -dc fabulous_$UVERSION.orig.tar.gz | tar --delete "fabulous-$UVERSION/fabulous/fonts" | gzip > fabulous_$UVERSION+dfsg1.orig.tar.gz

Modified: packages/fabulous/trunk/debian/changelog
===================================================================
--- packages/fabulous/trunk/debian/changelog	2013-06-06 10:27:36 UTC (rev 24678)
+++ packages/fabulous/trunk/debian/changelog	2013-06-06 12:11:25 UTC (rev 24679)
@@ -1,5 +1,8 @@
-fabulous (0.1.5-1) UNRELEASED; urgency=low
+fabulous (0.1.5+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #705947)
+  * The licensing of the fonts file is unclear, hence removal from the source
+    package.
+  * Patch the except: statements to always specify a type.
 
  -- Simon Chopin <chopin.simon at gmail.com>  Tue, 23 Apr 2013 19:57:04 +0200

Modified: packages/fabulous/trunk/debian/copyright
===================================================================
--- packages/fabulous/trunk/debian/copyright	2013-06-06 10:27:36 UTC (rev 24678)
+++ packages/fabulous/trunk/debian/copyright	2013-06-06 12:11:25 UTC (rev 24679)
@@ -6,83 +6,6 @@
 Copyright: 2010-2012 Justine A.R Tunney <jtunney at gmail.com>
 License: Expat
 
-Files: fabulous/fonts/IndUni-H-Bold.otf
-Copyright: (C) 2009-2011, John Smith <jds10 at cam.ac.uk>
-License: GPL-2.0+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in "/usr/share/common-licenses/GPL-2".
-
-Files: fabulous/fonts/DejaVuSansMono.ttf
-Copyright: 2003 Bitstream, Inc.
-License: BVFC
- 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.
- .
- Except as contained in this notice, the names of Gnome, the Gnome
- Foundation, and Bitstream Inc., shall not be used in advertising or
- otherwise to promote the sale, use or other dealings in this Font Software
- without prior written authorization from the Gnome Foundation or Bitstream
- Inc., respectively. For further information, contact: fonts at gnome dot
- org. 
-
-Files: fabulous/fonts/cmr10.ttf
-Copyright: 0000 Blue Sky Research
-License:
- The PostScript Type 1 implementation of the Computer Modern fonts produced by
- and previously distributed by Blue Sky Research and Y&Y, Inc. are now freely
- available for general use. This has been accomplished through the cooperation
- of a consortium of scientific publishers with Blue Sky Research and Y&Y.
- Members of this consortium include:
- .
-        Elsevier Science
-        IBM Corporation
-        Society for Industrial and Applied Mathematics (SIAM)
-        Springer-Verlag
-
 Files: debian/*
 Copyright: 2013 Simon Chopin <chopin.simon at gmail.com>
 License: Expat

Modified: packages/fabulous/trunk/debian/patches/build_xterm256_ext
===================================================================
--- packages/fabulous/trunk/debian/patches/build_xterm256_ext	2013-06-06 10:27:36 UTC (rev 24678)
+++ packages/fabulous/trunk/debian/patches/build_xterm256_ext	2013-06-06 12:11:25 UTC (rev 24679)
@@ -4,17 +4,6 @@
 Last-Update: 2013-04-24
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/setup.py
-+++ b/setup.py
-@@ -27,7 +27,7 @@
-     long_description     = read('README'),
-     license              = 'MIT',
-     install_requires     = ['grapefruit'],
--    packages             = find_packages(),
-+    packages             = find_packages(exclude="fabulous.fonts"),
-     zip_safe             = False,
-     include_package_data = True,
-     classifiers = [
 --- a/fabulous/xterm256.py
 +++ b/fabulous/xterm256.py
 @@ -80,14 +80,13 @@
@@ -29,7 +18,7 @@
      from os.path import join, dirname, getmtime, exists, expanduser
      # library = join(dirname(__file__), '_xterm256.so')
 -    library = expanduser('~/.xterm256.so')
-+    library = '/usr/share/lib/xtermspeedup.so'
++    library = '/usr/lib/fabulous/xtermspeedup.so'
      sauce = join(dirname(__file__), '_xterm256.c')
      if not exists(library) or getmtime(sauce) > getmtime(library):
          build = "gcc -fPIC -shared -o %s %s" % (library, sauce)

Added: packages/fabulous/trunk/debian/patches/fix_except
===================================================================
--- packages/fabulous/trunk/debian/patches/fix_except	                        (rev 0)
+++ packages/fabulous/trunk/debian/patches/fix_except	2013-06-06 12:11:25 UTC (rev 24679)
@@ -0,0 +1,32 @@
+From: Simon Chopin <chopin.simon at gmail.com>
+Date: Thu, 6 Jun 2013 12:10:24 +0200
+Subject: Always specify the exception type in except: blocks
+Forwarded: https://github.com/jart/fabulous/pull/1
+
+diff --git a/fabulous/utils.py b/fabulous/utils.py
+index 8ca3da4..9f99002 100644
+--- a/fabulous/utils.py
++++ b/fabulous/utils.py
+@@ -92,7 +92,7 @@ class TerminalInfo(object):
+         """
+         try:
+             call = fcntl.ioctl(self.termfd, termios.TIOCGWINSZ, "\000" * 8)
+-        except:
++        except IOError:
+             return (79, 40)
+         else:
+             height, width = struct.unpack("hhhh", call)[:2]
+diff --git a/fabulous/xterm256.py b/fabulous/xterm256.py
+index 65ed75f..16e8cf8 100644
+--- a/fabulous/xterm256.py
++++ b/fabulous/xterm256.py
+@@ -102,5 +102,5 @@ def compile_speedup():
+ 
+ try:
+     (rgb_to_xterm, xterm_to_rgb) = compile_speedup()
+-except:
++except OSError, AssertionError:
+     logging.debug("fabulous failed to compile xterm256 speedup code")
+-- 
+1.7.10.4
+

Added: packages/fabulous/trunk/debian/patches/remove_ez_setup
===================================================================
--- packages/fabulous/trunk/debian/patches/remove_ez_setup	                        (rev 0)
+++ packages/fabulous/trunk/debian/patches/remove_ez_setup	2013-06-06 12:11:25 UTC (rev 24679)
@@ -0,0 +1,29 @@
+Description: Remove ez_setup import in setup.py
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- fabulous-0.1.5+dfsg1.orig/setup.py
++++ fabulous-0.1.5+dfsg1/setup.py
+@@ -4,9 +4,6 @@
+ # http://wiki.python.org/moin/CheeseShopTutorial
+ # http://pypi.python.org/pypi?:action=list_classifiers
+ 
+-from ez_setup import use_setuptools
+-use_setuptools(version='0.6c11')
+-
+ import os
+ from setuptools import setup, find_packages
+ 

Modified: packages/fabulous/trunk/debian/patches/series
===================================================================
--- packages/fabulous/trunk/debian/patches/series	2013-06-06 10:27:36 UTC (rev 24678)
+++ packages/fabulous/trunk/debian/patches/series	2013-06-06 12:11:25 UTC (rev 24679)
@@ -1 +1,3 @@
 build_xterm256_ext
+remove_ez_setup
+fix_except

Modified: packages/fabulous/trunk/debian/rules
===================================================================
--- packages/fabulous/trunk/debian/rules	2013-06-06 10:27:36 UTC (rev 24678)
+++ packages/fabulous/trunk/debian/rules	2013-06-06 12:11:25 UTC (rev 24679)
@@ -15,6 +15,7 @@
 
 override_dh_auto_install:
 	dh_auto_install
+	rm -f debian/tmp/usr/lib/python2*/dist-packages/fabulous*.egg-info/SOURCES.txt
 	mv xtermspeedup.so debian/tmp
 
 override_dh_auto_clean:

Modified: packages/fabulous/trunk/debian/watch
===================================================================
--- packages/fabulous/trunk/debian/watch	2013-06-06 10:27:36 UTC (rev 24678)
+++ packages/fabulous/trunk/debian/watch	2013-06-06 12:11:25 UTC (rev 24679)
@@ -1,2 +1,4 @@
 version=3
+
+opts=dversionmangle=s/\+dfsg\d+// \
 http://lobstertech.com/fabulous.html /media/file/fabulous/fabulous-(.*)\.tar\.gz

More information about the Python-modules-commits mailing list