From 62659e5731ee352360d553568873ddea1c82f5b0 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Thu, 17 Feb 2011 00:04:40 +0000 Subject: [PATCH] refresh patches; update changelog --- debian/changelog | 8 ++++ debian/patches/01-gnulib-directory.patch | 65 +++++++++++++++++++++++++++++++- debian/patches/02-shebang.patch | 7 ++-- 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cbe438af..4460888f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnulib (20110216+stable-1) unstable; urgency=low + + * New upstream stable snapshot. + * Resume uploading to unstable. + * Refreshed patches. + + -- Ian Beckwith Thu, 17 Feb 2011 00:04:04 +0000 + gnulib (20101221+stable-1) experimental; urgency=low * New upstream stable snapshot, identical to the diff --git a/debian/patches/01-gnulib-directory.patch b/debian/patches/01-gnulib-directory.patch index 3ef847690..94c63cf24 100644 --- 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 diff --git a/debian/patches/02-shebang.patch b/debian/patches/02-shebang.patch index b5740026b..681bb8391 100644 --- a/debian/patches/02-shebang.patch +++ b/debian/patches/02-shebang.patch @@ -1,9 +1,10 @@ Author: Daniel Baumann Description: Adjusts shebang. -diff -Naurp gnulib.orig/lib/uniname/gen-uninames.lisp gnulib/lib/uniname/gen-uninames.lisp ---- gnulib.orig/lib/uniname/gen-uninames.lisp 2009-04-06 01:40:05.000000000 +0000 -+++ gnulib/lib/uniname/gen-uninames.lisp 2009-04-06 01:51:07.000000000 +0000 +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 @@ -1,4 +1,4 @@ -#!/usr/local/bin/clisp -C +#!/usr/bin/clisp -C -- 2.11.0