walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

refresh patch

This commit is contained in:
Daniel Kahn Gillmor 2016-07-05 11:15:52 -04:00
parent 23dca93dd0
commit 4a90ae9713
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/0001-remove-git-submodules.patch vendored
View File

@ -1,5 +1,5 @@
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 6 Aug 2015 15:51:16 -0400 Date: Tue, 5 Jul 2016 11:14:58 -0400
Subject: remove git submodules Subject: remove git submodules
we use package dependencies instead when building in debian we use package dependencies instead when building in debian
@ -19,28 +19,28 @@ index d74114d..0000000
- path = list - path = list
- url = https://github.com/publicsuffix/list - url = https://github.com/publicsuffix/list
diff --git a/autogen.sh b/autogen.sh diff --git a/autogen.sh b/autogen.sh
index 9de26f5..2c6dc20 100755 index aee0a7c..d58a432 100755
--- a/autogen.sh --- a/autogen.sh
+++ b/autogen.sh +++ b/autogen.sh
@@ -6,12 +6,6 @@ if test $? -ne 0; then @@ -6,12 +6,6 @@ if test $? -ne 0; then
exit 1 exit 1
fi fi
-GIT=`which git 2>/dev/null` -GIT=$(which git 2>/dev/null)
-if test $? -ne 0; then -if test $? -ne 0; then
- echo "No 'git' found. You must install the git package." - echo "No 'git' found. You must install the git package."
- exit 1 - exit 1
-fi -fi
- -
# create m4 before gtkdocize # create m4 before gtkdocize
mkdir m4 2>/dev/null mkdir -p m4 2>/dev/null
@@ -27,8 +21,6 @@ else @@ -27,8 +21,6 @@ else
$GTKDOCIZE || exit $? $GTKDOCIZE
fi fi
-$GIT submodule init -$GIT submodule init
-$GIT submodule update -$GIT submodule update
$AUTORECONF --install --force --symlink || exit $? $AUTORECONF --install --force --symlink
echo echo

1
debian/patches/series vendored
View File

@ -1,2 +1 @@
0001-remove-git-submodules.patch 0001-remove-git-submodules.patch