refresh patches; update changelog

[gnulib.git] / debian / patches / 01-gnulib-directory.patch

diff --git a/debian/patches/01-gnulib-directory.patch b/debian/patches/01-gnulib-directory.patch
index 3ef8476..94c63cf 100644 (file)
--- a/debian/patches/01-gnulib-directory.patch
+++ b/debian/patches/01-gnulib-directory.patch
@@ -3,8 +3,16 @@ Description: Sets the gnulib directory.
 
 Index: gnulib/gnulib-tool
 ===================================================================
---- gnulib.orig/gnulib-tool    2010-10-24 01:11:59.000000000 +0100
-+++ gnulib/gnulib-tool 2010-10-24 01:12:20.000000000 +0100
+--- 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
 @@ -446,7 +446,7 @@
        * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
      esac
@@ -14,3 +22,56 @@ 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