* Patches to rename libcurl to libgnurl by Christian

* Updated for latest curl using git cherry-pick by Jeff, Florian, ng0
* Patches to fix the testsuite (deleted tests/data/test1139, renamed
  reference from libcurl.* to libgnurl.*) by ng0

1 files changed, 7 insertions, 7 deletions

diff --git a/maketgz b/maketgz
index aede6d0fb..2573e2be9 100755
--- a/maketgz
+++ b/maketgz
@@ -69,12 +69,12 @@ for ver in vc7 vc8 vc9 vc10 vc11 vc12 vc14; do
 done
 
 # Replace version number in plist file:
-PLIST=lib/libcurl.plist
+PLIST=lib/libgnurl.plist
 sed "s/7\.12\.3/$libversion/g" $PLIST > $PLIST.dist
 
 echo "curl version $curlversion"
-echo "libcurl version $libversion"
-echo "libcurl numerical $numeric"
+echo "libgnurl version $libversion"
+echo "libgnurl numerical $numeric"
 echo "datestamp $datestamp"
 
 findprog()
@@ -137,7 +137,7 @@ git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./script
 #
 
 echo "make dist"
-targz="curl-$version.tar.gz"
+targz="gnurl-$version.tar.gz"
 make -sj dist VERSION=$version
 
 ############################################################################
@@ -145,7 +145,7 @@ make -sj dist VERSION=$version
 # Now make a bz2 archive from the tar.gz original
 #
 
-bzip2="curl-$version.tar.bz2"
+bzip2="gnurl-$version.tar.bz2"
 echo "Generating $bzip2"
 gzip -dc $targz | bzip2 --best > $bzip2
 
@@ -154,7 +154,7 @@ gzip -dc $targz | bzip2 --best > $bzip2
 # Now make an lzma archive from the tar.gz original
 #
 
-lzma="curl-$version.tar.lzma"
+lzma="gnurl-$version.tar.lzma"
 echo "Generating $lzma"
 gzip -dc $targz | lzma --best - > $lzma
 
@@ -174,7 +174,7 @@ makezip ()
   rm -rf $tempdir
 }
 
-zip="curl-$version.zip"
+zip="gnurl-$version.zip"
 echo "Generating $zip"
 tempdir=".builddir"
 makezip