From b9eaa41e7e3bace5a1e3ca24567448e060ce4a4c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 30 Oct 2015 22:31:21 +0000
Subject: tools/quilt: update to 0.64

Update quilt to version 0.64.
Changelog: http://git.savannah.gnu.org/cgit/quilt.git/tree/NEWS?id=v0.64

Refresh patches. (scripts/inspect.in has been removed upstream)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47299 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/quilt/patches/000-relocatable.patch | 17 +----------------
 tools/quilt/patches/001-fix_compile.patch |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'tools/quilt/patches')

diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch
index aedb914c29..ed4f00adae 100644
--- a/tools/quilt/patches/000-relocatable.patch
+++ b/tools/quilt/patches/000-relocatable.patch
@@ -45,21 +45,6 @@
  textdomain("quilt");
  
  sub _($) {
---- a/quilt/scripts/inspect.in
-+++ b/quilt/scripts/inspect.in
-@@ -6,7 +6,11 @@
- #
- #  See the COPYING and AUTHORS files for more details.
- 
--: ${QUILT_DIR=@QUILT_DIR@}
-+if test -n "$STAGING_DIR"; then
-+	: ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"}
-+else
-+	: ${QUILT_DIR=@QUILT_DIR@}
-+fi
- 
- if ! [ -r $QUILT_DIR/scripts/patchfns ]
- then
 --- a/quilt/scripts/patchfns.in
 +++ b/quilt/scripts/patchfns.in
 @@ -8,7 +8,11 @@
@@ -116,7 +101,7 @@
  MKTEMP :=	@MKTEMP@
  MSGMERGE :=	@MSGMERGE@
  MSGFMT :=	@MSGFMT@
-@@ -49,8 +49,8 @@ USE_NLS :=	@USE_NLS@
+@@ -48,8 +48,8 @@ USE_NLS :=	@USE_NLS@
  STAT_HARDLINK := @STAT_HARDLINK@
  PATCH_WRAPPER := @PATCH_WRAPPER@
  
diff --git a/tools/quilt/patches/001-fix_compile.patch b/tools/quilt/patches/001-fix_compile.patch
index c829515f83..3ce93f0cf8 100644
--- a/tools/quilt/patches/001-fix_compile.patch
+++ b/tools/quilt/patches/001-fix_compile.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -272,13 +272,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
+@@ -271,13 +271,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
  	@$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@)
  
  configure : configure.ac aclocal.m4
-- 
cgit v1.2.3