From 4a90ae971320c0d9343389271538521904d9cf2e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 5 Jul 2016 11:15:52 -0400 Subject: [PATCH] refresh patch --- debian/patches/0001-remove-git-submodules.patch | 14 +++++++------- debian/patches/series | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/patches/0001-remove-git-submodules.patch b/debian/patches/0001-remove-git-submodules.patch index ec96055..4ae2939 100644 --- a/debian/patches/0001-remove-git-submodules.patch +++ b/debian/patches/0001-remove-git-submodules.patch @@ -1,5 +1,5 @@ From: Daniel Kahn Gillmor -Date: Thu, 6 Aug 2015 15:51:16 -0400 +Date: Tue, 5 Jul 2016 11:14:58 -0400 Subject: remove git submodules we use package dependencies instead when building in debian @@ -19,28 +19,28 @@ index d74114d..0000000 - path = list - url = https://github.com/publicsuffix/list diff --git a/autogen.sh b/autogen.sh -index 9de26f5..2c6dc20 100755 +index aee0a7c..d58a432 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,12 +6,6 @@ if test $? -ne 0; then exit 1 fi --GIT=`which git 2>/dev/null` +-GIT=$(which git 2>/dev/null) -if test $? -ne 0; then - echo "No 'git' found. You must install the git package." - exit 1 -fi - - # create m4 before gtkdocize - mkdir m4 2>/dev/null + # create m4 before gtkdocize + mkdir -p m4 2>/dev/null @@ -27,8 +21,6 @@ else - $GTKDOCIZE || exit $? + $GTKDOCIZE fi -$GIT submodule init -$GIT submodule update - $AUTORECONF --install --force --symlink || exit $? + $AUTORECONF --install --force --symlink echo diff --git a/debian/patches/series b/debian/patches/series index 1f1870d..1dbcd19 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-remove-git-submodules.patch -