[SCM] gtklick packaging branch, master, updated. debian/0.6.4-1-5-gdaf93af

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit daf93afdae5ee1eeac713bbdc48760b9dd79cf93
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue Apr 27 11:39:19 2010 +0200

    Merge the two patches in 01-gtkclick_launchper.patch.

diff --git a/debian/patches/01-gtkclick_launcher.patch b/debian/patches/01-gtkclick_launcher.patch
new file mode 100644
index 0000000..0e14f3b
--- /dev/null
+++ b/debian/patches/01-gtkclick_launcher.patch
@@ -0,0 +1,29 @@
+Author:
+ Jaromír Mikeš <mira.mikes at seznam.cz>
+ Alessio Treglia <quadrispro at ubuntu.com>
+Description:
+ Add the private python module directory /usr/share/gtklick to sys.path.
+ Fix script's shebang line.
+---
+ bin/gtklick |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- gtklick.orig/bin/gtklick
++++ gtklick/bin/gtklick
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ #
+ # gtklick
+@@ -11,8 +11,9 @@
+ # (at your option) any later version.
+ 
+ 
+-from gtklick.gtklick import GTKlick
+ import sys
++sys.path.append('/usr/share/gtklick')
++from gtklick.gtklick import GTKlick
+ import os.path
+ 
+ bin_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
diff --git a/debian/patches/01-shebang.patch b/debian/patches/01-shebang.patch
deleted file mode 100644
index bee0853..0000000
--- a/debian/patches/01-shebang.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Fix script's shebang.
----
- bin/gtklick |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gtklick.orig/bin/gtklick
-+++ gtklick/bin/gtklick
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- coding: utf-8 -*-
- #
- # gtklick
diff --git a/debian/patches/series b/debian/patches/series
index 29a2c0b..e2b6ee4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-sys_path.patch
-01-shebang.patch
+01-gtkclick_launcher.patch
diff --git a/debian/patches/sys_path.patch b/debian/patches/sys_path.patch
deleted file mode 100644
index cc35a30..0000000
--- a/debian/patches/sys_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-add the private python module directory /usr/share/gtklick to sys.path
---- gtklick-0.6.3.orig/bin/gtklick	2009-01-17 00:43:08.000000000 +0100
-+++ gtklick-0.6.3/bin/gtklick	2010-02-03 00:26:42.000000000 +0100
-@@ -11,8 +11,10 @@
- # (at your option) any later version.
- 
- 
--from gtklick.gtklick import GTKlick
- import sys
-+sys.path.append('/usr/share/gtklick')
-+
-+from gtklick.gtklick import GTKlick
- import os.path
- 
- bin_dir = os.path.abspath(os.path.dirname(sys.argv[0]))

-- 
gtklick packaging