summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>2011-09-11 22:56:04 +0100
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>2011-09-11 22:57:14 +0100
commite9fa76b47d45aa5a10aca4cc882556b0c525461b (patch)
treee5b8bcc4305fce46366746d4e0c800b9ce70cf90
parent77317ef6450e2d0367698c0fdccfa0930d01e59b (diff)
downloadhg-fast-export-e9fa76b47d45aa5a10aca4cc882556b0c525461b.tar.gz
gbp-pq refresh and rebase debian/patches
-rw-r--r--debian/patches/0001-fix-installation-path.patch.patch (renamed from debian/patches/fix-installation-path.patch)21
-rw-r--r--debian/patches/series2
2 files changed, 14 insertions, 9 deletions
diff --git a/debian/patches/fix-installation-path.patch b/debian/patches/0001-fix-installation-path.patch.patch
index 69e929a..380625a 100644
--- a/debian/patches/fix-installation-path.patch
+++ b/debian/patches/0001-fix-installation-path.patch.patch
@@ -1,31 +1,36 @@
-Description: Use scripts installed to /usr/share instead of /usr/bin
-Author: Andrey Rahmatullin <wrar@wrar.name>
-Forwarded: not-needed
-Last-Update: 2011-02-23
+From: Andrey Rahmatullin <wrar@wrar.name>
+Date: Sun, 11 Sep 2011 22:52:19 +0100
+Subject: fix-installation-path.patch
+
+---
+ hg-fast-export.sh | 2 +-
+ hg-reset.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hg-fast-export.sh b/hg-fast-export.sh
-index a2ef9ea..5211ffe 100755
+index 8a071a7..d686e3c 100755
--- a/hg-fast-export.sh
+++ b/hg-fast-export.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2007, 2008 Rocco Rutte <pdmef@gmx.net> and others.
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
--ROOT="`dirname $0`"
+-ROOT="$(dirname $0)"
+ROOT="/usr/share/hg-fast-export"
REPO=""
PFX="hg2git"
SFX_MAPPING="mapping"
diff --git a/hg-reset.sh b/hg-reset.sh
-index c77c291..868d06f 100755
+index 3b2294c..ef9679d 100755
--- a/hg-reset.sh
+++ b/hg-reset.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2007, 2008 Rocco Rutte <pdmef@gmx.net> and others.
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
--ROOT="`dirname $0`"
+-ROOT="$(dirname $0)"
+ROOT="/usr/share/hg-fast-export"
REPO=""
PFX="hg2git"
SFX_MARKS="marks"
+--
diff --git a/debian/patches/series b/debian/patches/series
index 55f8223..da192b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-installation-path.patch
+0001-fix-installation-path.patch.patch