[SCM] Packaging for rapid-spring a content download tool for spring branch, master, updated. upstream/0.3.2-16-g6eb012a

[Jan Dittberner]

The following commit has been merged in the master branch:
commit e41894d2ca236918adf95c0b6de75ad4b313c19f
Author: Jan Dittberner <jan at dittberner.info>
Date:   Sat Oct 16 17:50:40 2010 +0200

    remove patches, they have been applied upstream

diff --git a/debian/changelog b/debian/changelog
index 88394eb..534b13d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rapid-spring (0.4.3-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * remove patches, they have been applied upstream
 
  -- Jan Dittberner <jandd at debian.org>  Sat, 16 Oct 2010 17:42:22 +0200
 
diff --git a/debian/patches/0001-fix-rapid-gui-not-launching-was-missing-call-to-rapi.patch b/debian/patches/0001-fix-rapid-gui-not-launching-was-missing-call-to-rapi.patch
deleted file mode 100644
index f474541..0000000
--- a/debian/patches/0001-fix-rapid-gui-not-launching-was-missing-call-to-rapi.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 58cd98943cbd606a160bbdc2ae7899349ac1b470 Mon Sep 17 00:00:00 2001
-From: Rene Milk <koshi at springlobby.info>
-Date: Wed, 18 Aug 2010 09:43:35 +0200
-Subject: [PATCH 1/2] fix rapid-gui not launching, was missing call to rapid.main.init
-
----
- bin/rapid-gui |   29 +++++++++++++++++++++++++++++
- 1 files changed, 29 insertions(+), 0 deletions(-)
-
-diff --git a/bin/rapid-gui b/bin/rapid-gui
-index d9c8178..69b0787 100755
---- a/bin/rapid-gui
-+++ b/bin/rapid-gui
-@@ -2,6 +2,8 @@
- # -*- coding: utf-8 -*-
- 
- from rapid.gui import RapidGUI
-+from optparse import OptionParser
-+from rapid.main import init
- try:
- 	from PyQt4 import QtGui
- except:
-@@ -11,6 +13,33 @@ except:
- 	sys.exit(1)
- 
- if __name__ == '__main__':
-+	#we could probably share this parser between cli and gui ...
-+	parser = OptionParser()
-+
-+	parser.add_option('--datadir',
-+		action='store', dest='datadir',
-+		help='Override the default data directory. '
-+			'(~/.spring on Linux or the one reported by unitsync on Windows)')
-+	parser.add_option('--unitsync',
-+		action='store_true', dest='unitsync',
-+		help='Use unitsync to locate the data directory Spring uses.',
-+		default = (os.name == 'nt'))
-+	parser.add_option('--no-unitsync',
-+		action='store_false', dest='unitsync',
-+		help='Do not use unitsync.')
-+		
-+	(options, args) = parser.parse_args()
-+	
-+	if options.datadir:
-+		init(options.datadir)
-+	elif options.unitsync:
-+		init(get_writable_data_directory())
-+	elif os.name == 'posix':
-+		init(os.path.expanduser('~/.spring'))
-+	else:
-+		print 'No data directory specified. Specify one using either --datadir or --unitsync.'
-+		print
-+		
- 	app = QtGui.QApplication(['RapidGUI'])
- 	window = RapidGUI()
- 	window.show()
--- 
-1.7.1
-
diff --git a/debian/patches/0002-import-os-earlier-to-make-rapid-gui-run.patch b/debian/patches/0002-import-os-earlier-to-make-rapid-gui-run.patch
deleted file mode 100644
index cbc5ef8..0000000
--- a/debian/patches/0002-import-os-earlier-to-make-rapid-gui-run.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d2c470bf7aef63f54719e0e24872339cce2d35e7 Mon Sep 17 00:00:00 2001
-From: Jan Dittberner <jan at dittberner.info>
-Date: Wed, 18 Aug 2010 12:56:58 +0200
-Subject: [PATCH 2/2] import os earlier to make rapid-gui run
-
----
- bin/rapid-gui |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/bin/rapid-gui b/bin/rapid-gui
-index 69b0787..e74c440 100755
---- a/bin/rapid-gui
-+++ b/bin/rapid-gui
-@@ -4,10 +4,11 @@
- from rapid.gui import RapidGUI
- from optparse import OptionParser
- from rapid.main import init
-+import os
- try:
- 	from PyQt4 import QtGui
- except:
--	import os, sys
-+	import sys
- 	os.system("xmessage 'This application requires PyQt4 to be installed.\n" +
- 		"Please use your package manager to install PyQt4 and then run rapid-gui again.'")
- 	sys.exit(1)
--- 
-1.7.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 46646b5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-fix-rapid-gui-not-launching-was-missing-call-to-rapi.patch
-0002-import-os-earlier-to-make-rapid-gui-run.patch

-- 
Packaging for rapid-spring a content download tool for spring