Clean out last parts of submodule use.

README.rst

@@ -4,11 +4,20 @@ Packaging files for Varnish Cache
 This repository contains the necessary scripts to package up
 Varnish Cache.
 
-git submodules are used for debian/ and redhat/. This may or may not be a good
-idea, time will tell.
+How to build
+------------
 
-To get a complete checkout, run::
+The flow is roughly:
 
-    git submodule init
-    git submodule update
+1) Set up the build environment. On Redhat that is mock, on Debian/Ubuntu you
+   need sbuild.
+2) Put the Varnish Cache .tar.gz archive into source/.
+3) Run ./package-deb or ./package-rpm.
+
+
+Contact
+-------
+
+You can reach the developers and packagers using the normal
+email list: <varnish-dev@varnish-cache.org>
 

debian/libvarnishapi1.symbols

-libvarnishapi.so.1 libvarnishapi1 #MINVER#
- LIBVARNISHAPI_1.0@LIBVARNISHAPI_1.0 3.0.0
- VCLI_AuthResponse@LIBVARNISHAPI_1.0 3.0.0
- VCLI_ReadResult@LIBVARNISHAPI_1.0 3.0.0
- VCLI_WriteResult@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VRE_compile@Base 2.1.4
-#MISSING: 3.0.0# VRE_exec@Base 2.1.4
-#MISSING: 3.0.0# VRE_free@Base 2.1.4
- VSC_Arg@LIBVARNISHAPI_1.0 3.0.0
- VSC_Iter@LIBVARNISHAPI_1.0 3.0.0
- VSC_Main@LIBVARNISHAPI_1.0 3.0.0
- VSC_Open@LIBVARNISHAPI_1.0 3.0.0
- VSC_Setup@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_Arg@Base 2.0~rc1
- VSL_Arg@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_Close@Base 2.1.0
-#MISSING: 3.0.0# VSL_Dispatch@Base 2.0~rc1
- VSL_Dispatch@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_H_Print@Base 2.0~rc1
- VSL_H_Print@LIBVARNISHAPI_1.0 3.0.0
- VSL_Matched@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_Name@Base 2.0~rc1
-#MISSING: 3.0.0# VSL_New@Base 2.0~rc1
-#MISSING: 3.0.0# VSL_NextLog@Base 2.0~rc1
- VSL_NextLog@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_NonBlocking@Base 2.0~rc1
- VSL_NonBlocking@LIBVARNISHAPI_1.0 3.0.0
- VSL_Open@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_OpenLog@Base 2.0~rc1
-#MISSING: 3.0.0# VSL_OpenStats@Base 2.0~rc1
-#MISSING: 3.0.0# VSL_Select@Base 2.0~rc1
- VSL_Select@LIBVARNISHAPI_1.0 3.0.0
- VSL_Setup@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# VSL_tags@Base 2.0~rc1
- VSL_tags@LIBVARNISHAPI_1.0 3.0.0
- VSM_Close@LIBVARNISHAPI_1.0 3.0.0
- VSM_Delete@LIBVARNISHAPI_1.0 3.0.0
- VSM_Diag@LIBVARNISHAPI_1.0 3.0.0
- VSM_Find_Chunk@LIBVARNISHAPI_1.0 3.0.0
- VSM_Head@LIBVARNISHAPI_1.0 3.0.0
- VSM_Name@LIBVARNISHAPI_1.0 3.0.0
- VSM_New@LIBVARNISHAPI_1.0 3.0.0
- VSM_Open@LIBVARNISHAPI_1.0 3.0.0
- VSM_ReOpen@LIBVARNISHAPI_1.0 3.0.0
- VSM_Seq@LIBVARNISHAPI_1.0 3.0.0
- VSM_iter0@LIBVARNISHAPI_1.0 3.0.0
- VSM_n_Arg@LIBVARNISHAPI_1.0 3.0.0
-#MISSING: 3.0.0# base64_decode@Base 2.0~rc1
-#MISSING: 3.0.0# base64_init@Base 2.0~rc1
-#MISSING: 3.0.0# lbv_assert@Base 2.1.4
-#MISSING: 3.0.0# varnish_instance@Base 2.0~rc1

debian/source/format

-3.0 (quilt)

debian/varnish.manpages

-bin/varnishtest/varnishtest.1
-bin/varnishncsa/varnishncsa.1
-bin/varnishhist/varnishhist.1
-bin/varnishstat/varnishstat.1
-bin/varnishreplay/varnishreplay.1
-bin/varnishadm/varnishadm.1
-bin/varnishlog/varnishlog.1
-bin/varnishtop/varnishtop.1
-bin/varnishd/varnishd.1
-man/vcl.7
-bin/varnishsizes/varnishsizes.1

package-deb

@@ -29,33 +29,20 @@ tar xf ${SOURCE} -C build
 
 cd build/varnish-*
 
-# Get a packaging file set suitable for this release.
-if [ -z "$UPSTREAMVERSION" ]; then
-	V=$(grep PACKAGE_VERSION= configure | sed "s/.*=//;s/'//g")
-else
-	V="$UPSTREAMVERSION"
-fi
-
+V=$(grep PACKAGE_VERSION= configure | sed "s/.*=//;s/'//g")
 if [ "$V" = "trunk" ]; then
-	V="4.1"
+	V="5.0"
 	MINOR="0"
 else
 	MINOR="${V##*.}"
 	V="${V%.*}"
 fi
 
-
 cp -r ../../debian .
-#GIT_DIR=../../debian/.git git archive --prefix=debian/ HEAD | tar xf -
-
-rm -f debian/libvarnish*.symbols
-rm -f debian/*.manpages
-# enforce 1.0 native
-rm -f debian/source/format
-
+rm -f debian/*.sw?    # Delete any vim temporary files.
 ln ../../$SOURCE ../varnish_$V.$MINOR.orig.tar.gz
 
-# Take version override set on jenkins builds into account.
+# Take version override set on Jenkins builds into account.
 if [ -n "$DEBVERSION" ]; then
 	FULL_VERSION="$V.$MINOR-$DEBVERSION"
 	dch -v "$FULL_VERSION" "Release build #$BUILD_NUMBER ID: $BUILD_ID"