[Python-apps-commits] r3600 - in packages/pythoncad/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Saturday, August 29, 2009 @ 00:00:01
  Author: dktrkranz
Revision: 3600

Remove obsolete or merged patches

Modified:
  packages/pythoncad/trunk/debian/changelog
  packages/pythoncad/trunk/debian/patches/series
Deleted:
  packages/pythoncad/trunk/debian/patches/fails_to_exit
  packages/pythoncad/trunk/debian/patches/remove_unused_bindump

Modified: packages/pythoncad/trunk/debian/changelog
===================================================================
--- packages/pythoncad/trunk/debian/changelog	2009-08-28 23:44:02 UTC (rev 3599)
+++ packages/pythoncad/trunk/debian/changelog	2009-08-29 00:00:01 UTC (rev 3600)
@@ -10,13 +10,17 @@
   * debian/patches/as_reserved:
     - Do not use "as" as variable name (is a reserved word in Python 2.6),
       this way byte-compilation does not fail (Closes: #521388).
+  * debian/patches/fails_to_exit:
+    - Removed, fixed with new upstream version.
+  * debian/patches/remove_unused_bindump:
+    - Removed, no longer needed.
   * Remove python-dev from Build-Depends-Indep, use python instead.
   * Depend on ${misc:Depends} in pythoncad binary stanza.
   * Remove debian/dirs file, useless.
   * Bump Standards-Version to 3.8.3, no changes required.
   * Add watch file.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 29 Aug 2009 01:37:42 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 29 Aug 2009 01:58:38 +0200
 
 pythoncad (0.1.35-4) unstable; urgency=low
 

Deleted: packages/pythoncad/trunk/debian/patches/fails_to_exit
===================================================================
--- packages/pythoncad/trunk/debian/patches/fails_to_exit	2009-08-28 23:44:02 UTC (rev 3599)
+++ packages/pythoncad/trunk/debian/patches/fails_to_exit	2009-08-29 00:00:01 UTC (rev 3600)
@@ -1,17 +0,0 @@
-Description: Exit gracefully from PythonCAD
-Origin: upstream
-Bug-Debian: #422422
-
-Index: pythoncad-0.1.35/PythonCAD/Interface/Gtk/gtkimage.py
-===================================================================
---- pythoncad-0.1.35.orig/PythonCAD/Interface/Gtk/gtkimage.py	2009-06-25 08:03:40.000000000 +0000
-+++ pythoncad-0.1.35/PythonCAD/Interface/Gtk/gtkimage.py	2009-06-25 08:03:49.000000000 +0000
-@@ -286,7 +286,7 @@
-         self.close()
-         for _i in xrange(len(globals.imagelist)):
-             _gimage = globals.imagelist[_i]
--            if self is _gimage:
-+            if self.__image is _gimage:
-                 del globals.imagelist[_i]
-                 if not len(globals.imagelist):
-                     gtk.main_quit()

Deleted: packages/pythoncad/trunk/debian/patches/remove_unused_bindump
===================================================================
--- packages/pythoncad/trunk/debian/patches/remove_unused_bindump	2009-08-28 23:44:02 UTC (rev 3599)
+++ packages/pythoncad/trunk/debian/patches/remove_unused_bindump	2009-08-29 00:00:01 UTC (rev 3600)
@@ -1,86 +0,0 @@
-Index: pythoncad-0.1.35/PythonCAD/Generic/bindump.py
-===================================================================
---- pythoncad-0.1.35.orig/PythonCAD/Generic/bindump.py	2009-06-25 08:02:57.000000000 +0000
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,81 +0,0 @@
--#!/usr/bin/python
--#
--# simply binary dump
--#
--
--import sys
--import array
--
--if len(sys.argv) < 4:
--    print "bindump.py file offset count"
--    sys.exit(1)
--else:
--    try:
--        _fname = file(sys.argv[1])
--    except:
--        print "invalid file: " + sys.argv[1]
--        sys.exit(1)
--    try:
--        _offset = int(sys.argv[2])
--    except:
--        print "invalid offset: " + sys.argv[2]
--        sys.exit(1)
--    if _offset < 0:
--        print "invalid offset: %d" % _offset
--        sys.exit(1)
--    try:
--        _count = int(sys.argv[3])
--    except:
--        print "invalid byte count: " + sys.argv[3]
--        sys.exit(1)
--    if _count < 0:
--        print "invalid byte count: %d" % _count
--        sys.exit(1)
--
--print "opening file: " + _fname.name
--print "offset: %d" % _offset
--print "count: %d" % _count 
--
--try:
--    _fname.seek(_offset, 0)
--except:
--    _fname.close()
--    print "invalid offset into file: %d" % _offset
--    sys.exit(1)
--
--_data = array.array('B')
--try:
--    _data.fromfile(_fname, _count)
--except:
--    _fname.close()
--    print "invalid read of %d bytes from file: %s" % (_count, _fname.name)
--    sys.exit(1)
--
--_fname.close()
--
--_patterns = [
--    '0 0 0 0', # 0
--    '0 0 0 1', # 1
--    '0 0 1 0', # 2
--    '0 0 1 1', # 3
--    '0 1 0 0', # 4
--    '0 1 0 1', # 5
--    '0 1 1 0', # 6
--    '0 1 1 1', # 7
--    '1 0 0 0', # 8
--    '1 0 0 1', # 9
--    '1 0 1 0', # A
--    '1 0 1 1', # B
--    '1 1 0 0', # C
--    '1 1 0 1', # D
--    '1 1 1 0', # E
--    '1 1 1 1'  # F
--    ]
--
--_i = 0
--while (_i < _count):
--    _bitoffset = _i * 8
--    _nib1 = _patterns[((_data[_i] & 0xf0) >> 4)]
--    _nib2 = _patterns[(_data[_i] & 0x0f)]
--    print "%d [%d]: 0x%02x %s %s" % (_i, _bitoffset, _data[_i], _nib1, _nib2)
--    _i = _i + 1

Modified: packages/pythoncad/trunk/debian/patches/series
===================================================================
--- packages/pythoncad/trunk/debian/patches/series	2009-08-28 23:44:02 UTC (rev 3599)
+++ packages/pythoncad/trunk/debian/patches/series	2009-08-29 00:00:01 UTC (rev 3600)
@@ -1,5 +1,4 @@
 documentation
 #remove_unused_bindump
-fails_to_exit
 desktop_file
 as_reserved