From: ssm Date: Fri, 20 Jul 2007 12:43:54 +0000 (+0000) Subject: Split debian package into varnish, libvarnish and libvarnish-dev X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e383bf5bfa03967edc779e87aece08a9f5128cca;p=varnish Split debian package into varnish, libvarnish and libvarnish-dev git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1743 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- diff --git a/varnish-cache/debian/changelog b/varnish-cache/debian/changelog index 5ba032f9..e3b5b718 100644 --- a/varnish-cache/debian/changelog +++ b/varnish-cache/debian/changelog @@ -1,3 +1,10 @@ +varnish (1.1) unstable; urgency=low + + * New upstream release + * Split package into varnish, libvarnish and libvarnish-dev + + -- Stig Sandbeck Mathisen Fri, 20 Jul 2007 14:37:36 +0200 + varnish (1.0.4-1) unstable; urgency=low * New upstream version (Closes: #424560) diff --git a/varnish-cache/debian/control b/varnish-cache/debian/control index 82a25ac9..e5dca600 100644 --- a/varnish-cache/debian/control +++ b/varnish-cache/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: varnish Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3) +Depends: ${shlibs:Depends}, ${misc:Depends}, gcc ( >= 3.3), libvarnish Description: A state-of-the-art, high-performance HTTP accelerator varnish is the server-side alternative to Squid, written primarily with speed in mind, and with a look to implementing full ESI-support in @@ -20,3 +20,27 @@ Description: A state-of-the-art, high-performance HTTP accelerator Varnish is targeted primarily at the FreeBSD 6 and Linux 2.6 platforms, and will take full advantage of the advanced I/O features offered by these operating systems. + +Package: libvarnish +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Shared library for Varnish + Shared library for Varnish. + . + Varnish is the server-side alternative to Squid, written primarily + with speed in mind. + . + The goal of the Varnish project is to develop a state-of-the-art, + high-performance HTTP accelerator. + +Package: libvarnish-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libvarnish +Description: Shared library for Varnish + Development files for the Varnish library. + . + Varnish is the server-side alternative to Squid, written primarily + with speed in mind. + . + The goal of the Varnish project is to develop a state-of-the-art, + high-performance HTTP accelerator. diff --git a/varnish-cache/debian/dirs b/varnish-cache/debian/dirs index 1e28e136..e69de29b 100644 --- a/varnish-cache/debian/dirs +++ b/varnish-cache/debian/dirs @@ -1,9 +0,0 @@ -etc/varnish -etc/logrotate.d -usr/bin -usr/lib -usr/sbin -var/log -var/log/varnish -var/lib/varnish -usr/share/lintian/overrides/ diff --git a/varnish-cache/debian/libvarnish-dev.dirs b/varnish-cache/debian/libvarnish-dev.dirs new file mode 100644 index 00000000..68457717 --- /dev/null +++ b/varnish-cache/debian/libvarnish-dev.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/varnish-cache/debian/libvarnish-dev.install b/varnish-cache/debian/libvarnish-dev.install new file mode 100644 index 00000000..f746d9ba --- /dev/null +++ b/varnish-cache/debian/libvarnish-dev.install @@ -0,0 +1,3 @@ +usr/include +usr/lib/*.a +usr/lib/*.la diff --git a/varnish-cache/debian/libvarnish.dirs b/varnish-cache/debian/libvarnish.dirs new file mode 100644 index 00000000..68457717 --- /dev/null +++ b/varnish-cache/debian/libvarnish.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/varnish-cache/debian/libvarnish.install b/varnish-cache/debian/libvarnish.install new file mode 100644 index 00000000..d0dbfd18 --- /dev/null +++ b/varnish-cache/debian/libvarnish.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff --git a/varnish-cache/debian/rules b/varnish-cache/debian/rules index 65a4bdba..af1d05af 100755 --- a/varnish-cache/debian/rules +++ b/varnish-cache/debian/rules @@ -66,7 +66,9 @@ install: build dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/varnish + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + dh_install --sourcedir=$(CURDIR)/debian/tmp + install -m 644 $(CURDIR)/etc/default.vcl $(CURDIR)/debian/varnish/etc/varnish/ install -m 644 $(CURDIR)/debian/lintian-override $(CURDIR)/debian/varnish/usr/share/lintian/overrides/varnish install -m 644 $(CURDIR)/debian/varnish.logrotate $(CURDIR)/debian/varnish/etc/logrotate.d/varnish diff --git a/varnish-cache/debian/varnish.default b/varnish-cache/debian/varnish.default index 77f5ca3a..55f58a88 100644 --- a/varnish-cache/debian/varnish.default +++ b/varnish-cache/debian/varnish.default @@ -17,6 +17,7 @@ NFILES=131072 DAEMON_OPTS="-a :6081 \ -T localhost:6082 \ -b localhost:8080 \ + -n /var/lib/varnish \ -s file,/var/lib/varnish/varnish_storage.bin,1G" @@ -29,6 +30,7 @@ DAEMON_OPTS="-a :6081 \ # DAEMON_OPTS="-a :6081 \ # -T localhost:6082 \ # -f /etc/varnish/default.vcl \ +# -n /var/lib/varnish \ # -s file,/var/lib/varnish/varnish_storage.bin,1G" @@ -58,6 +60,9 @@ DAEMON_OPTS="-a :6081 \ # # Idle timeout for worker threads # VARNISH_THREAD_TIMEOUT=120 # +# # Home dir for this varnish instance +# VARNISH_HOMEDIR=/var/lib/varnish +# # # Cache file location # VARNISH_STORAGE_FILE=/var/lib/varnish/varnish_storage.bin # @@ -78,6 +83,7 @@ DAEMON_OPTS="-a :6081 \ # -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \ # -t ${VARNISH_TTL} \ # -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \ +# -n ${VARNISH_HOMEDIR} \ # -s ${VARNISH_STORAGE}" # diff --git a/varnish-cache/debian/varnish.dirs b/varnish-cache/debian/varnish.dirs new file mode 100644 index 00000000..9dcd6aa7 --- /dev/null +++ b/varnish-cache/debian/varnish.dirs @@ -0,0 +1,8 @@ +etc/varnish +etc/logrotate.d +usr/bin +usr/sbin +var/log +var/log/varnish +var/lib/varnish +usr/share/lintian/overrides/ diff --git a/varnish-cache/debian/varnish.install b/varnish-cache/debian/varnish.install new file mode 100644 index 00000000..ca882bbb --- /dev/null +++ b/varnish-cache/debian/varnish.install @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/varnish-cache/debian/varnish.varnishlog.init b/varnish-cache/debian/varnish.varnishlog.init index 5fd6f256..9f92afd6 100755 --- a/varnish-cache/debian/varnish.varnishlog.init +++ b/varnish-cache/debian/varnish.varnishlog.init @@ -24,7 +24,7 @@ LOGFILE=/var/log/varnish/varnish.log test -x $DAEMON || exit 0 -DAEMON_OPTS="-a -w ${LOGFILE} -D -P $PIDFILE" +DAEMON_OPTS="-a -n /var/lib/varnish -w ${LOGFILE} -D -P $PIDFILE" case "$1" in start)