r1743 - trunk/varnish-cache/debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2007-07-20 14:43:54 +0200 (Fri, 20 Jul 2007)
New Revision: 1743

Added:
   trunk/varnish-cache/debian/libvarnish-dev.dirs
   trunk/varnish-cache/debian/libvarnish-dev.install
   trunk/varnish-cache/debian/libvarnish.dirs
   trunk/varnish-cache/debian/libvarnish.install
   trunk/varnish-cache/debian/varnish.dirs
   trunk/varnish-cache/debian/varnish.install
Modified:
   trunk/varnish-cache/debian/changelog
   trunk/varnish-cache/debian/control
   trunk/varnish-cache/debian/dirs
   trunk/varnish-cache/debian/rules
   trunk/varnish-cache/debian/varnish.default
   trunk/varnish-cache/debian/varnish.varnishlog.init
Log:
Split debian package into varnish, libvarnish and libvarnish-dev

Modified: trunk/varnish-cache/debian/changelog
===================================================================
--- trunk/varnish-cache/debian/changelog	2007-07-20 11:32:27 UTC (rev 1742)
+++ trunk/varnish-cache/debian/changelog	2007-07-20 12:43:54 UTC (rev 1743)
@@ -1,3 +1,10 @@
+varnish (1.1) unstable; urgency=low
+
+  * New upstream release
+  * Split package into varnish, libvarnish and libvarnish-dev
+
+ -- Stig Sandbeck Mathisen <ssm at linpro.no>  Fri, 20 Jul 2007 14:37:36 +0200
+
 varnish (1.0.4-1) unstable; urgency=low
 
   * New upstream version (Closes: #424560)

Modified: trunk/varnish-cache/debian/control
===================================================================
--- trunk/varnish-cache/debian/control	2007-07-20 11:32:27 UTC (rev 1742)
+++ trunk/varnish-cache/debian/control	2007-07-20 12:43:54 UTC (rev 1743)
@@ -8,7 +8,7 @@
 
 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 @@
  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.

Modified: trunk/varnish-cache/debian/dirs
===================================================================
--- trunk/varnish-cache/debian/dirs	2007-07-20 11:32:27 UTC (rev 1742)
+++ trunk/varnish-cache/debian/dirs	2007-07-20 12:43:54 UTC (rev 1743)
@@ -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/

Added: trunk/varnish-cache/debian/libvarnish-dev.dirs
===================================================================
--- trunk/varnish-cache/debian/libvarnish-dev.dirs	                        (rev 0)
+++ trunk/varnish-cache/debian/libvarnish-dev.dirs	2007-07-20 12:43:54 UTC (rev 1743)
@@ -0,0 +1 @@
+usr/lib

Added: trunk/varnish-cache/debian/libvarnish-dev.install
===================================================================
--- trunk/varnish-cache/debian/libvarnish-dev.install	                        (rev 0)
+++ trunk/varnish-cache/debian/libvarnish-dev.install	2007-07-20 12:43:54 UTC (rev 1743)
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*.a
+usr/lib/*.la

Added: trunk/varnish-cache/debian/libvarnish.dirs
===================================================================
--- trunk/varnish-cache/debian/libvarnish.dirs	                        (rev 0)
+++ trunk/varnish-cache/debian/libvarnish.dirs	2007-07-20 12:43:54 UTC (rev 1743)
@@ -0,0 +1 @@
+usr/lib

Added: trunk/varnish-cache/debian/libvarnish.install
===================================================================
--- trunk/varnish-cache/debian/libvarnish.install	                        (rev 0)
+++ trunk/varnish-cache/debian/libvarnish.install	2007-07-20 12:43:54 UTC (rev 1743)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

Modified: trunk/varnish-cache/debian/rules
===================================================================
--- trunk/varnish-cache/debian/rules	2007-07-20 11:32:27 UTC (rev 1742)
+++ trunk/varnish-cache/debian/rules	2007-07-20 12:43:54 UTC (rev 1743)
@@ -66,7 +66,9 @@
 	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


Property changes on: trunk/varnish-cache/debian/rules
___________________________________________________________________
Name: svn
   + executable

Modified: trunk/varnish-cache/debian/varnish.default
===================================================================
--- trunk/varnish-cache/debian/varnish.default	2007-07-20 11:32:27 UTC (rev 1742)
+++ trunk/varnish-cache/debian/varnish.default	2007-07-20 12:43:54 UTC (rev 1743)
@@ -17,6 +17,7 @@
 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 \
 #              -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 @@
 # # 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 @@
 #              -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}"
 #
 

Added: trunk/varnish-cache/debian/varnish.dirs
===================================================================
--- trunk/varnish-cache/debian/varnish.dirs	                        (rev 0)
+++ trunk/varnish-cache/debian/varnish.dirs	2007-07-20 12:43:54 UTC (rev 1743)
@@ -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/

Added: trunk/varnish-cache/debian/varnish.install
===================================================================
--- trunk/varnish-cache/debian/varnish.install	                        (rev 0)
+++ trunk/varnish-cache/debian/varnish.install	2007-07-20 12:43:54 UTC (rev 1743)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

Modified: trunk/varnish-cache/debian/varnish.varnishlog.init
===================================================================
--- trunk/varnish-cache/debian/varnish.varnishlog.init	2007-07-20 11:32:27 UTC (rev 1742)
+++ trunk/varnish-cache/debian/varnish.varnishlog.init	2007-07-20 12:43:54 UTC (rev 1743)
@@ -24,7 +24,7 @@
 
 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)