r2366 - in branches/debian/1.1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-01-22 11:00:23 +0100 (Tue, 22 Jan 2008)
New Revision: 2366

Removed:
   branches/debian/1.1.2/debian/lintian-override
Modified:
   branches/debian/1.1.2/
   branches/debian/1.1.2/debian/changelog
   branches/debian/1.1.2/debian/control
   branches/debian/1.1.2/debian/rules
   branches/debian/1.1.2/debian/varnish.logrotate
Log:
Merged revisions 2329-2330,2357-2359,2361 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  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
........
  r2359 | ssm | 2008-01-22 09:28:18 +0100 (Tue, 22 Jan 2008) | 3 lines
  
  Debian packaging: Only reload varnishlog if it is running.
  (Debian bug #462029)
........
  r2361 | ssm | 2008-01-22 09:36:07 +0100 (Tue, 22 Jan 2008) | 1 line
  
  Debian packaging: update changelog
........



Property changes on: branches/debian/1.1.2
___________________________________________________________________
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,2288-2291,2295-2301,2306,2310,2313-2314,2316,2318,2320,2322,2324
   + /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,2310,2313-2314,2316,2318,2320,2322,2324,2329-2330,2357-2359,2361

Modified: branches/debian/1.1.2/debian/changelog
===================================================================
--- branches/debian/1.1.2/debian/changelog	2008-01-22 09:55:36 UTC (rev 2365)
+++ branches/debian/1.1.2/debian/changelog	2008-01-22 10:00:23 UTC (rev 2366)
@@ -1,3 +1,11 @@
+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

Modified: branches/debian/1.1.2/debian/control
===================================================================
--- branches/debian/1.1.2/debian/control	2008-01-22 09:55:36 UTC (rev 2365)
+++ branches/debian/1.1.2/debian/control	2008-01-22 10:00:23 UTC (rev 2366)
@@ -24,6 +24,7 @@
  operating systems. 
 
 Package: libvarnish0
+Section: libs
 Replaces: libvarnish
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -31,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/debian/1.1.2/debian/lintian-override
===================================================================
--- branches/debian/1.1.2/debian/lintian-override	2008-01-22 09:55:36 UTC (rev 2365)
+++ branches/debian/1.1.2/debian/lintian-override	2008-01-22 10:00:23 UTC (rev 2366)
@@ -1,3 +0,0 @@
-varnish: duplicate-updaterc.d-calls-in-postinst varnish
-varnish: duplicate-updaterc.d-calls-in-postinst varnishlog
-

Modified: branches/debian/1.1.2/debian/rules
===================================================================
--- branches/debian/1.1.2/debian/rules	2008-01-22 09:55:36 UTC (rev 2365)
+++ branches/debian/1.1.2/debian/rules	2008-01-22 10:00:23 UTC (rev 2366)
@@ -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/debian/1.1.2/debian/varnish.logrotate
===================================================================
--- branches/debian/1.1.2/debian/varnish.logrotate	2008-01-22 09:55:36 UTC (rev 2365)
+++ branches/debian/1.1.2/debian/varnish.logrotate	2008-01-22 10:00:23 UTC (rev 2366)
@@ -4,6 +4,8 @@
   compress
   delaycompress
   postrotate
-    /usr/sbin/invoke-rc.d varnishlog reload > /dev/null
+    if /usr/bin/pgrep -P 1 varnishlog >/dev/null; then
+      /usr/sbin/invoke-rc.d varnishlog reload > /dev/null
+    fi
   endscript
 }