From 768bd1a022b06def6fe817bd5942695b7c8e2503 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Thu, 17 Feb 2011 23:12:11 +0000 Subject: [PATCH] fix mangled patch refreshes --- debian/patches/01-gnulib-directory.patch | 65 +------------------------------- debian/patches/02-shebang.patch | 4 +- 2 files changed, 4 insertions(+), 65 deletions(-) diff --git a/debian/patches/01-gnulib-directory.patch b/debian/patches/01-gnulib-directory.patch index 94c63cf24..78d8fac64 100644 --- a/debian/patches/01-gnulib-directory.patch +++ b/debian/patches/01-gnulib-directory.patch @@ -3,16 +3,8 @@ Description: Sets the gnulib directory. Index: gnulib/gnulib-tool =================================================================== ---- gnulib.orig/gnulib-tool 2011-02-16 23:57:52.000000000 +0000 -+++ gnulib/gnulib-tool 2011-02-16 23:59:14.000000000 +0000 -@@ -1,6 +1,6 @@ - #! /bin/sh - # --# Copyright (C) 2002-2010 Free Software Foundation, Inc. -+# Copyright (C) 2002-2011 Free Software Foundation, Inc. - # - # This program is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by +--- gnulib.orig/gnulib-tool 2011-02-17 23:11:27.000000000 +0000 ++++ gnulib/gnulib-tool 2011-02-17 23:11:32.000000000 +0000 @@ -446,7 +446,7 @@ * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; esac @@ -22,56 +14,3 @@ Index: gnulib/gnulib-tool } # func_tmpdir -@@ -3855,11 +3855,16 @@ - yes | 3) - sed_transform_main_lib_file=$sed_transform_main_lib_file' - s/GNU General/GNU Lesser General/g -+ s/General Public License/Lesser General Public License/g -+ s/Lesser Lesser General Public License/Lesser General Public License/g - ' - ;; - 2) - sed_transform_main_lib_file=$sed_transform_main_lib_file' - s/GNU General/GNU Lesser General/g -+ s/General Public License/Lesser General Public License/g -+ s/Lesser Lesser General Public License/Lesser General Public License/g -+ - s/version [23]\([ ,]\)/version 2.1\1/g - ' - ;; -@@ -3869,7 +3874,11 @@ - # Update license. - sed_transform_main_lib_file=$sed_transform_main_lib_file' - s/GNU Lesser General/GNU General/g -+ s/Lesser General Public License/General Public License/g -+ - s/GNU Library General/GNU General/g -+ s/Library General Public License/General Public License/g -+ - s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g - ' - fi -@@ -3881,7 +3890,11 @@ - # Update license. - sed_transform_build_aux_file=$sed_transform_build_aux_file' - s/GNU Lesser General/GNU General/g -+ s/Lesser General Public License/General Public License/g -+ - s/GNU Library General/GNU General/g -+ s/Library General Public License/General Public License/g -+ - s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g - ' - fi -@@ -3892,7 +3905,11 @@ - # Update license. - sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' - s/GNU Lesser General/GNU General/g -+ s/Lesser General Public License/General Public License/g -+ - s/GNU Library General/GNU General/g -+ s/Library General Public License/General Public License/g -+ - s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g - ' - fi diff --git a/debian/patches/02-shebang.patch b/debian/patches/02-shebang.patch index 681bb8391..fed80717b 100644 --- a/debian/patches/02-shebang.patch +++ b/debian/patches/02-shebang.patch @@ -3,8 +3,8 @@ Description: Adjusts shebang. Index: gnulib/lib/uniname/gen-uninames.lisp =================================================================== ---- gnulib.orig/lib/uniname/gen-uninames.lisp 2011-02-16 23:59:19.000000000 +0000 -+++ gnulib/lib/uniname/gen-uninames.lisp 2011-02-16 23:59:26.000000000 +0000 +--- gnulib.orig/lib/uniname/gen-uninames.lisp 2011-02-17 23:11:25.000000000 +0000 ++++ gnulib/lib/uniname/gen-uninames.lisp 2011-02-17 23:11:38.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/local/bin/clisp -C +#!/usr/bin/clisp -C -- 2.11.0