[Pkg-cli-apps-commits] [SCM] sparkleshare branch, master, updated. debian/0.2.5-2-5-gd6970b8

Carlos Martín Nieto carlos at cmartin.tk
Mon Nov 14 12:14:13 UTC 2011


The following commit has been merged in the master branch:
commit d6970b83de7f4227f7206cd488c44de99d2d94d2
Author: Carlos Martín Nieto <carlos at cmartin.tk>
Date:   Mon Nov 14 13:03:37 2011 +0100

    Add shebang to the nautilus3 extension

diff --git a/debian/patches/0001-Add-missing-shebang-to-nautilus-extension.patch b/debian/patches/0001-Add-missing-shebang-to-nautilus-extension.patch
index 4bb489e..4f4daa0 100644
--- a/debian/patches/0001-Add-missing-shebang-to-nautilus-extension.patch
+++ b/debian/patches/0001-Add-missing-shebang-to-nautilus-extension.patch
@@ -1,27 +1,41 @@
-From: Iain Lane <laney at debian.org>
-Date: Wed, 15 Jun 2011 22:27:02 +0100
+From: Carlos Martín Nieto <carlos at cmartin.tk>
+Date: Mon, 14 Nov 2011 13:01:05 +0100
 Subject: Add missing shebang to nautilus extension
 
 ---
  .../Nautilus/sparkleshare-nautilus-extension.py.in |    1 +
- po/POTFILES.skip                                   |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ .../sparkleshare-nautilus3-extension.py.in         |    1 +
+ po/POTFILES.skip                                   |    2 ++
+ 3 files changed, 4 insertions(+), 0 deletions(-)
 
-Index: sparkleshare/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
-===================================================================
---- sparkleshare.orig/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in	2011-07-28 11:10:53.004178154 +0100
-+++ sparkleshare/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in	2011-07-28 11:10:58.727955360 +0100
+diff --git a/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in b/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
+index a43d761..717761b 100755
+--- a/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
++++ b/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
 @@ -1,3 +1,4 @@
 +#!/usr/bin/python
  #   SparkleShare, an instant update workflow to Git.
  #   Copyright (C) 2010  Hylke Bons <hylkebons at gmail.com>
  #
-Index: sparkleshare/po/POTFILES.skip
-===================================================================
---- sparkleshare.orig/po/POTFILES.skip	2011-07-28 11:10:52.988178777 +0100
-+++ sparkleshare/po/POTFILES.skip	2011-07-28 11:11:48.162031163 +0100
+diff --git a/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in b/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
+index 4d2164f..e4de79c 100755
+--- a/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
++++ b/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
 @@ -1,3 +1,4 @@
++#!/usr/bin/python
+ #   SparkleShare, an instant update workflow to Git.
+ #   Copyright (C) 2010  Hylke Bons <hylkebons at gmail.com>
+ #
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index e340ffb..3288f0c 100755
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,3 +1,5 @@
  MacCore/src/Options.cs
  SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
  SparkleLib/SparkleOptions.cs
 +.pc/0001-Add-missing-shebang-to-nautilus-extension.patch/SparkleShare/Nautilus/sparkleshare-nautilus-extension.py.in
++.pc/0001-Add-missing-shebang-to-nautilus-extension.patch/SparkleShare/Nautilus/sparkleshare-nautilus3-extension.py.in
+-- 
+1.7.7
+

-- 
sparkleshare



More information about the Pkg-cli-apps-commits mailing list