[Python-apps-commits] r3617 - in packages/drpython/trunk/debian (13 files)

dktrkranz at users.alioth.debian.org dktrkranz at users.alioth.debian.org
Sat Aug 29 16:38:14 UTC 2009 

    Date: Saturday, August 29, 2009 @ 16:38:13
  Author: dktrkranz
Revision: 3617

Adjust patches for new upstream release

Modified:
  packages/drpython/trunk/debian/changelog
  packages/drpython/trunk/debian/patches/FileDialog
  packages/drpython/trunk/debian/patches/debian_python
  packages/drpython/trunk/debian/patches/defaultdirectory_home
  packages/drpython/trunk/debian/patches/distutils_exclude_files
  packages/drpython/trunk/debian/patches/output_redirection
  packages/drpython/trunk/debian/patches/program_paths
  packages/drpython/trunk/debian/patches/sensible_browser
  packages/drpython/trunk/debian/patches/series
Deleted:
  packages/drpython/trunk/debian/patches/interpreter_hang
  packages/drpython/trunk/debian/patches/nonexistant_file
  packages/drpython/trunk/debian/patches/printsetup_disable_WriteText
  packages/drpython/trunk/debian/patches/remove_shebangs

Modified: packages/drpython/trunk/debian/changelog
===================================================================
--- packages/drpython/trunk/debian/changelog	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/changelog	2009-08-29 16:38:13 UTC (rev 3617)
@@ -1,6 +1,12 @@
 drpython (1:3.11.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches for new upstream release.
+  * Remove patches merged upstream:
+    - debian/patches/remove_shebangs
+    - debian/patches/interpreter_hang
+    - debian/patches/nonexistant_file
+    - debian/patches/printsetup_disable_WriteText
   * Update my e-mail address.
   * Remove DM-Upload-Allowed field.
   * Switch to debhelper 7.
@@ -9,7 +15,7 @@
   * Add ${misc:Depends} to drpython dependencies.
   * Bump Standards-Version to 3.8.3, no changes required.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Sat, 29 Aug 2009 20:01:39 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Sat, 29 Aug 2009 20:37:04 +0200
 
 drpython (1:3.11.0-3) unstable; urgency=low
 

Modified: packages/drpython/trunk/debian/patches/FileDialog
===================================================================
--- packages/drpython/trunk/debian/patches/FileDialog	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/FileDialog	2009-08-29 16:38:13 UTC (rev 3617)
@@ -5,7 +5,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/drPreferences.py	2009-04-07 00:25:53.000000000 +0200
 +++ drpython-3.11.0/drPreferences.py	2009-04-07 00:26:11.000000000 +0200
-@@ -286,7 +286,7 @@
+@@ -289,7 +289,7 @@
          self.save = 0
  
          #File Dialog

Modified: packages/drpython/trunk/debian/patches/debian_python
===================================================================
--- packages/drpython/trunk/debian/patches/debian_python	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/debian_python	2009-08-29 16:38:13 UTC (rev 3617)
@@ -5,7 +5,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/drpython.py	2009-04-07 22:32:39.000000000 +0200
 +++ drpython-3.11.0/drpython.py	2009-04-07 22:32:58.000000000 +0200
-@@ -154,7 +154,7 @@
+@@ -162,7 +162,7 @@
  
          self.stcshortcutlist = drShortcutsFile.GetSTCShortcutList()
  

Modified: packages/drpython/trunk/debian/patches/defaultdirectory_home
===================================================================
--- packages/drpython/trunk/debian/patches/defaultdirectory_home	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/defaultdirectory_home	2009-08-29 16:38:13 UTC (rev 3617)
@@ -6,13 +6,13 @@
 ===================================================================
 --- drpython-3.11.0.orig/drPreferences.py	2009-04-07 00:13:58.000000000 +0200
 +++ drpython-3.11.0/drPreferences.py	2009-04-07 00:14:27.000000000 +0200
-@@ -279,7 +279,7 @@
+@@ -281,7 +281,7 @@
          self.vieweol = 1
          self.checkeol = 1
          self.pythonargs = ""
 -        self.defaultdirectory = programdirectory
 +        self.defaultdirectory = os.path.expanduser('~')
          self.enablefeedback = 1
+         wx.GetApp().debugmodus = self.debugmodus = 1
          self.alwayspromptonexit = 0
-         self.backupfileonsave = 1
 

Modified: packages/drpython/trunk/debian/patches/distutils_exclude_files
===================================================================
--- packages/drpython/trunk/debian/patches/distutils_exclude_files	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/distutils_exclude_files	2009-08-29 16:38:13 UTC (rev 3617)
@@ -5,7 +5,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/setup.py	2009-04-07 21:25:33.000000000 +0200
 +++ drpython-3.11.0/setup.py	2009-04-07 21:30:47.000000000 +0200
-@@ -75,7 +75,6 @@
+@@ -73,7 +73,6 @@
      'bitmaps/*.ico', 'bitmaps/*.png',
      'bitmaps/16/*.png', 'bitmaps/24/*.png',
      # adding runner scripts, TODO: drpython startup should be probably redone
@@ -13,7 +13,7 @@
  ]
  
  from distutils.core import setup
-@@ -94,5 +93,4 @@
+@@ -92,5 +91,4 @@
      packages=[ MY_NAME ],
      package_dir={ MY_NAME : '.' },
      package_data={ MY_NAME : DATA },

Deleted: packages/drpython/trunk/debian/patches/interpreter_hang
===================================================================
--- packages/drpython/trunk/debian/patches/interpreter_hang	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/interpreter_hang	2009-08-29 16:38:13 UTC (rev 3617)
@@ -1,16 +0,0 @@
-Set default open and save locations into user's home.
-http://bugs.debian.org/311936
-http://sourceforge.net/support/tracker.php?aid=2010134
-
-Index: drpython-3.11.0/drPrompt.py
-===================================================================
---- drpython-3.11.0.orig/drPrompt.py	2009-04-07 00:12:29.000000000 +0200
-+++ drpython-3.11.0/drPrompt.py	2009-04-07 00:13:05.000000000 +0200
-@@ -106,6 +106,7 @@
-         in either the stdout or stderr of the current process.
-         '''
- 
-+        self.outputstream.write('\n')
-         text = ''
-         while True:
-             if text.find(targetoutput) > -1:

Deleted: packages/drpython/trunk/debian/patches/nonexistant_file
===================================================================
--- packages/drpython/trunk/debian/patches/nonexistant_file	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/nonexistant_file	2009-08-29 16:38:13 UTC (rev 3617)
@@ -1,20 +0,0 @@
-Do not crash if saved file is not available.
-https://launchpad.net/bugs/96014
-http://sourceforge.net/support/tracker.php?aid=2010127
-
-Index: drpython-3.11.0/drpython.py
-===================================================================
---- drpython-3.11.0.orig/drpython.py	2009-04-07 00:17:45.000000000 +0200
-+++ drpython-3.11.0/drpython.py	2009-04-07 00:18:20.000000000 +0200
-@@ -1366,7 +1366,10 @@
-             for Document in self.txtDocumentArray:
-                 if Document.filename:
-                     #Get Stat Info:
--                    current_mtime = int(os.stat(Document.filename).st_mtime)
-+                    try:
-+                        current_mtime = int(os.stat(Document.filename).st_mtime)
-+                    except OSError:
-+                        continue
- 
-                     #Check Stat Info:
-                     if Document.mtime > -1:

Modified: packages/drpython/trunk/debian/patches/output_redirection
===================================================================
--- packages/drpython/trunk/debian/patches/output_redirection	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/output_redirection	2009-08-29 16:38:13 UTC (rev 3617)
@@ -1,25 +1,18 @@
 DEBIAN-SPECIFIC
 Set standard output and error to valid UNIX locations.
 
-Index: drpython-3.11.0/drpython.py
+Index: drpython-3.11.1/drpython.py
 ===================================================================
---- drpython-3.11.0.orig/drpython.py	2009-04-07 00:20:57.000000000 +0200
-+++ drpython-3.11.0/drpython.py	2009-04-07 00:21:08.000000000 +0200
-@@ -4028,7 +4028,7 @@
-     def __init__(self):
-         self.first = True
-     def write(self, string):
--        f=open('c:/drpyhton.out', 'a')
-+        f=open('~/.drpython/drpython.out', 'a')
-         if self.first:
-             self.first = False
-             f.write('\n\n' + time.ctime() + ':\n')
-@@ -4043,7 +4043,7 @@
-     def __init__(self):
-         self.first = True
-     def write(self, string):
--        f=open('c:/drpyhton.err', 'a')
-+        f=open('~/.drpython/drpython.err', 'a')
-         if self.first:
-             self.first = False
-             f.write('\n\n' + time.ctime() + ':\n')
+--- drpython-3.11.1.orig/drpython.py	2009-08-29 20:07:49.068592453 +0200
++++ drpython-3.11.1/drpython.py	2009-08-29 20:14:21.648581517 +0200
+@@ -80,8 +80,8 @@
+ if not logdir.endswith('/'):
+     logdir += '/'
+ 
+-err_file = logdir + 'drpython.err'
+-out_file = logdir + 'drpython.out'
++err_file = logdir + '~/.drpython/drpython.err'
++out_file = logdir + '~/.drpython/drpython.out'
+ firsterr_file = logdir + 'drpythonfirst.err'
+ 
+ #*******************************************************************************************************

Deleted: packages/drpython/trunk/debian/patches/printsetup_disable_WriteText
===================================================================
--- packages/drpython/trunk/debian/patches/printsetup_disable_WriteText	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/printsetup_disable_WriteText	2009-08-29 16:38:13 UTC (rev 3617)
@@ -1,15 +0,0 @@
-Fix crash in PrinterSetup routine.
-http://sourceforge.net/support/tracker.php?aid=1982041
-
-Index: drpython-3.11.0/drPrinter.py
-===================================================================
---- drpython-3.11.0.orig/drPrinter.py	2009-04-07 00:19:25.000000000 +0200
-+++ drpython-3.11.0/drPrinter.py	2009-04-07 00:19:58.000000000 +0200
-@@ -91,7 +91,6 @@
- 
-         if dlg.ShowModal() == wx.ID_OK:
-             data = dlg.GetPrintDialogData()
--            self.log.WriteText('GetAllPages: %d\n' % data.GetAllPages())
- 
-         dlg.Destroy()
- 

Modified: packages/drpython/trunk/debian/patches/program_paths
===================================================================
--- packages/drpython/trunk/debian/patches/program_paths	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/program_paths	2009-08-29 16:38:13 UTC (rev 3617)
@@ -51,7 +51,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/drpython.py	2009-04-06 23:57:01.000000000 +0200
 +++ drpython-3.11.0/drpython.py	2009-04-07 00:07:42.000000000 +0200
-@@ -154,7 +154,7 @@
+@@ -162,7 +162,7 @@
  
          self.stcshortcutlist = drShortcutsFile.GetSTCShortcutList()
  
@@ -60,7 +60,7 @@
  
          #Preferences
  
-@@ -2716,8 +2716,7 @@
+@@ -2798,8 +2798,7 @@
          drAboutDialog.Show(self)
  
      def OnViewHelp(self, event):
@@ -93,7 +93,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/drPreferences.py	2009-04-06 23:57:01.000000000 +0200
 +++ drpython-3.11.0/drPreferences.py	2009-04-07 00:07:42.000000000 +0200
-@@ -522,8 +522,15 @@
+@@ -526,8 +526,15 @@
          self.documentationbrowser = "mozilla"
          if self.platform_is_windows:
              self.documentationbrowser = "<os.startfile>"
@@ -115,7 +115,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/drPrefsDialog.py	2009-04-07 00:08:49.000000000 +0200
 +++ drpython-3.11.0/drPrefsDialog.py	2009-04-07 00:09:12.000000000 +0200
-@@ -1308,7 +1308,7 @@
+@@ -1316,7 +1316,7 @@
          self.EndModal(0)
  
      def OnbtnHelp(self, event):

Deleted: packages/drpython/trunk/debian/patches/remove_shebangs
===================================================================
--- packages/drpython/trunk/debian/patches/remove_shebangs	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/remove_shebangs	2009-08-29 16:38:13 UTC (rev 3617)
@@ -1,34 +0,0 @@
-Remove unneeded shebangs.
-http://sourceforge.net/support/tracker.php?aid=2006675
-
-Index: drpython-3.11.0/drSetupPreferences.py
-===================================================================
---- drpython-3.11.0.orig/drSetupPreferences.py	2009-04-06 23:48:35.000000000 +0200
-+++ drpython-3.11.0/drSetupPreferences.py	2009-04-06 23:48:43.000000000 +0200
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- #   Programmer: Daniel Pozmanter
- #   E-mail:     drpython at bluebottle.com
- #   Note:       You must reply to the verification e-mail to get through.
-Index: drpython-3.11.0/drZip.py
-===================================================================
---- drpython-3.11.0.orig/drZip.py	2009-04-06 23:48:55.000000000 +0200
-+++ drpython-3.11.0/drZip.py	2009-04-06 23:49:01.000000000 +0200
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- #   Programmer: Daniel Pozmanter
- #   E-mail:     drpython at bluebottle.com
- #   Note:       You must reply to the verification e-mail to get through.
-Index: drpython-3.11.0/lnkDecoderRing.py
-===================================================================
---- drpython-3.11.0.orig/lnkDecoderRing.py	2009-04-06 23:48:08.000000000 +0200
-+++ drpython-3.11.0/lnkDecoderRing.py	2009-04-06 23:48:15.000000000 +0200
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- #   Programmer: Daniel Pozmanter
- #   E-mail:     drpython at bluebottle.com
- #   Note:       You must reply to the verification e-mail to get through.
-

Modified: packages/drpython/trunk/debian/patches/sensible_browser
===================================================================
--- packages/drpython/trunk/debian/patches/sensible_browser	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/sensible_browser	2009-08-29 16:38:13 UTC (rev 3617)
@@ -6,7 +6,7 @@
 ===================================================================
 --- drpython-3.11.0.orig/drPreferences.py	2009-04-06 23:50:15.000000000 +0200
 +++ drpython-3.11.0/drPreferences.py	2009-04-06 23:50:38.000000000 +0200
-@@ -519,7 +519,7 @@
+@@ -523,7 +523,7 @@
          self.printtabwidth = 4
  
          #Documentation Settings

Modified: packages/drpython/trunk/debian/patches/series
===================================================================
--- packages/drpython/trunk/debian/patches/series	2009-08-29 16:01:46 UTC (rev 3616)
+++ packages/drpython/trunk/debian/patches/series	2009-08-29 16:38:13 UTC (rev 3617)
@@ -7,9 +7,5 @@
 debian_python
 
 # UPSTREAM
-remove_shebangs
-interpreter_hang
 shift_keys
-nonexistant_file
-printsetup_disable_WriteText
 FileDialog

More information about the Python-apps-commits mailing list