From a80e6a3430d7c052fb3a9c912e04fff689be755e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 6 Aug 2015 15:52:14 -0400 Subject: [PATCH] avoid git submodules --- .../patches/0001-remove-git-submodules.patch | 46 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 debian/patches/0001-remove-git-submodules.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-remove-git-submodules.patch b/debian/patches/0001-remove-git-submodules.patch new file mode 100644 index 0000000..ec96055 --- /dev/null +++ b/debian/patches/0001-remove-git-submodules.patch @@ -0,0 +1,46 @@ +From: Daniel Kahn Gillmor +Date: Thu, 6 Aug 2015 15:51:16 -0400 +Subject: remove git submodules + +we use package dependencies instead when building in debian +--- + .gitmodules | 3 --- + autogen.sh | 8 -------- + 2 files changed, 11 deletions(-) + delete mode 100644 .gitmodules + +diff --git a/.gitmodules b/.gitmodules +deleted file mode 100644 +index d74114d..0000000 +--- a/.gitmodules ++++ /dev/null +@@ -1,3 +0,0 @@ +-[submodule "list"] +- path = list +- url = https://github.com/publicsuffix/list +diff --git a/autogen.sh b/autogen.sh +index 9de26f5..2c6dc20 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` +-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 + +@@ -27,8 +21,6 @@ else + $GTKDOCIZE || exit $? + fi + +-$GIT submodule init +-$GIT submodule update + $AUTORECONF --install --force --symlink || exit $? + + echo diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1dbcd19 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-remove-git-submodules.patch