[Pkg-electronics-commits] [SCM] Packaging for gEDA branch, master, updated. debian/1.6.1-4-8-g40f6c66

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 1b1915acfb93a816b8098b7aa411283d98d7ee4e
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Sat Jan 15 14:23:51 2011 +0200

    Removed fix_string_exceptions.diff patch, as it got applied upstream.

diff --git a/debian/patches/fix_string_exceptions.diff b/debian/patches/fix_string_exceptions.diff
deleted file mode 100644
index a4cc4ae..0000000
--- a/debian/patches/fix_string_exceptions.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: String exceptions have been deprecated since Python 2.5
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585213
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3014181&group_id=161080&atid=818428
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/utils/scripts/garchive.py
-+++ b/utils/scripts/garchive.py
-@@ -275,15 +275,15 @@
- 
-             if Option == '-a':
-                 if self.ProgramMode == "extract":          # sanity check
--                    raise "Incompatible command line args"
-+                    raise SyntaxError("Incompatible command line args")
- 
-             if Option == '-e':
-                 if self.ProgramMode == "archive":          # sanity check
--                    raise "Incompatible command line args"
-+                    raise SyntaxError("Incompatible command line args")
- 
-             if Option == '-f':
-                 if self.ProgramMode == "extract":          # sanity check
--                    raise "Incompatible command line args"
-+                    raise SyntaxError("Incompatible command line args")
-                 try:
-                     os.stat(Value)
-                 except OSError:
-@@ -294,7 +294,7 @@
- 
-             if Option == '-o':
-                 if self.ProgramMode == "extract":          # sanity check
--                    raise "incompatible command line args"
-+                    raise SyntaxError("Incompatible command line args")
-                 if CheckFilename(Value):
-                     self.OutputFileName = Value            #strcopy?
-                 else:
-@@ -904,7 +904,7 @@
-     Extract(Args)
-     sys.exit(0)
- else:
--    raise "Unknown program mode found."
-+    raise RuntimeError("Unknown program mode found.")
- 
- #  That's it -- very simple!!
- 
diff --git a/debian/patches/series b/debian/patches/series
index a371367..b174557 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 desktop.diff
 manpage_typos.diff
-fix_string_exceptions.diff

-- 
Packaging for gEDA