r2584 - in branches/1.2: . debian

ssm at projects.linpro.no ssm at projects.linpro.no
Mon Mar 10 08:28:13 CET 2008 

Author: ssm
Date: 2008-03-10 08:28:12 +0100 (Mon, 10 Mar 2008)
New Revision: 2584

Removed:
   branches/1.2/debian/TODO
   branches/1.2/debian/lintian-override
Modified:
   branches/1.2/
   branches/1.2/debian/changelog
   branches/1.2/debian/control
   branches/1.2/debian/rules
   branches/1.2/debian/varnish.default
   branches/1.2/debian/varnish.varnishlog.init
Log:
Merged revisions 2288-2290,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321,2323,2325-2327,2329-2330,2357-2358,2361-2364,2366,2374,2376-2378,2380-2381,2384-2386,2426,2432-2434,2495-2499,2503-2505,2520-2524,2545,2563-2564,2566-2568,2570-2571,2573-2574,2578-2579,2581-2583 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2288 | ssm | 2007-12-11 06:46:43 +0100 (Tue, 11 Dec 2007) | 3 lines
  
  In the debian /etc/default/varnish, remove unused configuration variable, and
  an erroneous use of -n from the configuration examples.
........
  r2289 | ssm | 2007-12-11 07:10:47 +0100 (Tue, 11 Dec 2007) | 1 line
  
  Debian packaging: do not ignore all errors from make distclean
........
  r2290 | ssm | 2007-12-11 07:14:49 +0100 (Tue, 11 Dec 2007) | 7 lines
  
  Changes in the Debian packaging
  
  * Use native version for the debian package
  * Add headers to indicate location of varnish source
  * Add "xsltproc" to build dependencies
........
  r2318 | ssm | 2007-12-20 12:03:58 +0100 (Thu, 20 Dec 2007) | 2 lines
  
  Add another uploader for the debian package
........
  r2329 | ssm | 2008-01-02 07:25:36 +0100 (Wed, 02 Jan 2008) | 2 lines
  
  Debian packaging: Tag library and development package with correct section.
........
  r2330 | ssm | 2008-01-02 07:26:23 +0100 (Wed, 02 Jan 2008) | 2 lines
  
  Debian packaging: Remove lintian overrides
........
  r2357 | ssm | 2008-01-21 20:04:41 +0100 (Mon, 21 Jan 2008) | 1 line
  
  Debian packaging: Add a debian revision to the version number
........
  r2361 | ssm | 2008-01-22 09:36:07 +0100 (Tue, 22 Jan 2008) | 1 line
  
  Debian packaging: update changelog
........
  r2520 | ssm | 2008-02-20 13:02:07 +0100 (Wed, 20 Feb 2008) | 1 line
  
  Debian packaging: Disable running of varnishlog by default
........
  r2521 | ssm | 2008-02-20 14:39:59 +0100 (Wed, 20 Feb 2008) | 1 line
  
  Typo patrol
........
  r2582 | ssm | 2008-03-10 08:13:36 +0100 (Mon, 10 Mar 2008) | 1 line
  
  Debian packaging: removing obsolete TODO file
........
  r2583 | ssm | 2008-03-10 08:15:56 +0100 (Mon, 10 Mar 2008) | 1 line
  
  Debian packaging: Add changelog entry for 1.2-0
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321-2327,2337,2358,2362-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2522-2524,2545,2563-2565,2569,2572,2575-2577
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2358,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583

Deleted: branches/1.2/debian/TODO
===================================================================
--- branches/1.2/debian/TODO	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/TODO	2008-03-10 07:28:12 UTC (rev 2584)
@@ -1,3 +0,0 @@
-- Write helper script to create storage_file from defaults
-- possibly setup default logging
-- get the 4. (advertising) clause BSD license removed from the source, if possible

Modified: branches/1.2/debian/changelog
===================================================================
--- branches/1.2/debian/changelog	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/changelog	2008-03-10 07:28:12 UTC (rev 2584)
@@ -1,5 +1,19 @@
+varnish (1.2-0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stig Sandbeck Mathisen <ssm at linpro.no>  Mon, 10 Mar 2008 06:58:19 +0100
+
 varnish (1.1.2-1) unstable; urgency=low
 
+  * Add debian revision
+  * Check if varnishlog is running before attempting reload from
+    logrotate postscript (Closes: #462029)
+
+ -- Stig Sandbeck Mathisen <ssm at fnord.no>  Tue, 22 Jan 2008 09:35:05 +0100
+
+varnish (1.1.2) unstable; urgency=low
+
   * New upstream release
   * Renamed library and development packages to reflect sonames
 

Modified: branches/1.2/debian/control
===================================================================
--- branches/1.2/debian/control	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/control	2008-03-10 07:28:12 UTC (rev 2584)
@@ -2,9 +2,11 @@
 Section: web
 Priority: optional
 Maintainer: Stig Sandbeck Mathisen <ssm at fnord.no>
-Uploaders: Lars Bahner <bahner at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, libtool, autoconf, libncurses-dev
-Standards-Version: 3.7.2
+Uploaders: Lars Bahner <bahner at debian.org>, Fabio Tranchitella <kobold at debian.org>
+Build-Depends: debhelper (>= 5), autotools-dev, automake1.9, libtool, autoconf, libncurses-dev, xsltproc
+XS-Vcs-Browser: http://varnish.projects.linpro.no/browser/trunk/varnish-cache
+XS-Vcs-Svn: http://varnish.projects.linpro.no/svn/trunk/varnish-cache
+Standards-Version: 3.7.3
 
 Package: varnish
 Architecture: any
@@ -22,6 +24,7 @@
  operating systems. 
 
 Package: libvarnish0
+Section: libs
 Replaces: libvarnish
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -29,6 +32,7 @@
  Shared libraries for the Varnish HTTP accelerator.
 
 Package: libvarnish0-dev
+Section: libdevel
 Replaces: libvarnish-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libvarnish0

Deleted: branches/1.2/debian/lintian-override
===================================================================
--- branches/1.2/debian/lintian-override	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/lintian-override	2008-03-10 07:28:12 UTC (rev 2584)
@@ -1,3 +0,0 @@
-varnish: duplicate-updaterc.d-calls-in-postinst varnish
-varnish: duplicate-updaterc.d-calls-in-postinst varnishlog
-

Modified: branches/1.2/debian/rules
===================================================================
--- branches/1.2/debian/rules	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/rules	2008-03-10 07:28:12 UTC (rev 2584)
@@ -49,7 +49,7 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -70,7 +70,6 @@
 	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
 
 

Modified: branches/1.2/debian/varnish.default
===================================================================
--- branches/1.2/debian/varnish.default	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/varnish.default	2008-03-10 07:28:12 UTC (rev 2584)
@@ -11,6 +11,10 @@
 # the -n switch, to have more instances on a single server.
 INSTANCE=$(uname -n)
 
+# Uncomment this to enable varnishlog.  Please make sure you have
+# enough disk space for significant amounts of log data.
+# VARNISHLOG_ENABLE=1
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL
@@ -34,7 +38,6 @@
 # DAEMON_OPTS="-a :6081 \
 #              -T localhost:6082 \
 #              -f /etc/varnish/default.vcl \
-#              -n /var/lib/varnish \
 #              -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
 
 
@@ -64,9 +67,6 @@
 # # 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/$INSTANCE/varnish_storage.bin
 #

Modified: branches/1.2/debian/varnish.varnishlog.init
===================================================================
--- branches/1.2/debian/varnish.varnishlog.init	2008-03-10 07:15:56 UTC (rev 2583)
+++ branches/1.2/debian/varnish.varnishlog.init	2008-03-10 07:28:12 UTC (rev 2584)
@@ -22,6 +22,16 @@
 PIDFILE=/var/run/$NAME.pid
 LOGFILE=/var/log/varnish/varnish.log
 
+# Include varnish defaults if available
+if [ -f /etc/default/varnish ] ; then
+        . /etc/default/varnish
+fi
+
+# If unset or not 1, exit
+if [ -z "${VARNISHLOG_ENABLED}" -o "${VARNISHLOG_ENABLED}" -ne "1" ]; then
+  exit 0;
+fi
+
 test -x $DAEMON || exit 0
 
 DAEMON_OPTS="-a -w ${LOGFILE} -D -P $PIDFILE"

More information about the varnish-commit mailing list