r2309 - in branches/1.1: . bin/varnishd debian

ssm at projects.linpro.no ssm at projects.linpro.no
Tue Dec 18 19:38:37 CET 2007


Author: ssm
Date: 2007-12-18 19:38:37 +0100 (Tue, 18 Dec 2007)
New Revision: 2309

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/varnishd.1
   branches/1.1/debian/changelog
   branches/1.1/debian/control
   branches/1.1/debian/rules
   branches/1.1/debian/varnish.default
   branches/1.1/debian/varnish.postinst
Log:

Merged revisions 2288-2291,2295 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
........
  r2291 | ssm | 2007-12-11 08:02:24 +0100 (Tue, 11 Dec 2007) | 4 lines
  
  Debian packaging: Remove extra debhelper section in main postinst file, this
  was included by the debhelper tag as well, which resulted in a double startup
  entry, and an error on package installation.
........
  r2295 | ssm | 2007-12-18 07:58:33 +0100 (Tue, 18 Dec 2007) | 1 line
  
  Fixed a small typo in the varnishd man page
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2296-2301,2306
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2306

Modified: branches/1.1/bin/varnishd/varnishd.1
===================================================================
--- branches/1.1/bin/varnishd/varnishd.1	2007-12-18 17:20:08 UTC (rev 2308)
+++ branches/1.1/bin/varnishd/varnishd.1	2007-12-18 18:38:37 UTC (rev 2309)
@@ -276,7 +276,7 @@
 .El
 .Ss Management Interface
 If the
-.Fl -T
+.Fl T
 option was specified,
 .Nm
 will offer a command-line management interface on the specified

Modified: branches/1.1/debian/changelog
===================================================================
--- branches/1.1/debian/changelog	2007-12-18 17:20:08 UTC (rev 2308)
+++ branches/1.1/debian/changelog	2007-12-18 18:38:37 UTC (rev 2309)
@@ -1,4 +1,4 @@
-varnish (1.1.2-1) unstable; urgency=low
+varnish (1.1.2) unstable; urgency=low
 
   * New upstream release
   * Renamed library and development packages to reflect sonames

Modified: branches/1.1/debian/control
===================================================================
--- branches/1.1/debian/control	2007-12-18 17:20:08 UTC (rev 2308)
+++ branches/1.1/debian/control	2007-12-18 18:38:37 UTC (rev 2309)
@@ -3,8 +3,10 @@
 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
+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

Modified: branches/1.1/debian/rules
===================================================================
--- branches/1.1/debian/rules	2007-12-18 17:20:08 UTC (rev 2308)
+++ branches/1.1/debian/rules	2007-12-18 18:38:37 UTC (rev 2309)
@@ -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

Modified: branches/1.1/debian/varnish.default
===================================================================
--- branches/1.1/debian/varnish.default	2007-12-18 17:20:08 UTC (rev 2308)
+++ branches/1.1/debian/varnish.default	2007-12-18 18:38:37 UTC (rev 2309)
@@ -34,7 +34,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 +63,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.1/debian/varnish.postinst
===================================================================
--- branches/1.1/debian/varnish.postinst	2007-12-18 17:20:08 UTC (rev 2308)
+++ branches/1.1/debian/varnish.postinst	2007-12-18 18:38:37 UTC (rev 2309)
@@ -13,13 +13,3 @@
 varnish_create_storagedir
 
 #DEBHELPER#
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/varnish" ]; then
-	update-rc.d varnish defaults >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d varnish start || exit $?
-	else
-		/etc/init.d/varnish start || exit $?
-	fi
-fi
-# End automatically added section




More information about the varnish-commit mailing list