r2610 - in branches/1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-25 06:47:55 +0100 (Tue, 25 Mar 2008)
New Revision: 2610

Modified:
   branches/1.2/
   branches/1.2/debian/changelog
   branches/1.2/debian/rules
   branches/1.2/debian/varnish.dirs
Log:
Merged revisions 2608 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2608 | kobold | 2008-03-24 08:32:12 +0100 (Mon, 24 Mar 2008) | 3 lines
  
  small fixes to the debian packaging: removed a lintian warning, merged two
  changelog entries, cleaned debian/rules.
........



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,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,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,2586,2588,2600
   + /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-2359,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,2586,2588,2600,2608

Modified: branches/1.2/debian/changelog
===================================================================
--- branches/1.2/debian/changelog	2008-03-24 08:45:54 UTC (rev 2609)
+++ branches/1.2/debian/changelog	2008-03-25 05:47:55 UTC (rev 2610)
@@ -1,17 +1,18 @@
 varnish (1.2-0) unstable; urgency=low
 
-  * New upstream release
+  [ Stig Sandbeck Mathisen ]
+  * New upstream release.
+  * Check if varnishlog is running before attempting reload from
+    logrotate postscript. (Closes: #462029)
 
- -- Stig Sandbeck Mathisen <ssm at linpro.no>  Mon, 10 Mar 2008 06:58:19 +0100
+  [ Fabio Tranchitella ]
+  * debian/varnish.dirs: removed unused lintian overrides dir.
+  * debian/rules: backup and restore of config.sub and config.guess to not
+    include them into the diff.gz in case of multiple builds from the same
+    working directory.
 
-varnish (1.1.2-1) unstable; urgency=low
+ -- Fabio Tranchitella <kobold at debian.org>  Mon, 24 Mar 2008 08:30:02 +0100
 
-  * 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/1.2/debian/rules
===================================================================
--- branches/1.2/debian/rules	2008-03-24 08:45:54 UTC (rev 2609)
+++ branches/1.2/debian/rules	2008-03-25 05:47:55 UTC (rev 2610)
@@ -32,32 +32,31 @@
 	# The boilerplate linker flags won't allow varnish to compile :(
 	# There are circular dependencies in the varnish libraries, but
 	# the core developers have OK'ed that we don't check.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --localstatedir=/var/lib
+	[ -r /usr/share/misc/config.sub ] && \
+	    cp -f /usr/share/misc/config.sub config.sub || true
+	[ -r /usr/share/misc/config.guess ] && \
+	    cp -f /usr/share/misc/config.guess config.guess || true
+	./configure \
+	    --host=$(DEB_HOST_GNU_TYPE) \
+	    --build=$(DEB_BUILD_GNU_TYPE) \
+	    --prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		CFLAGS="$(CFLAGS)" --localstatedir=/var/lib
 
-
 build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
-
 	$(MAKE)
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
+	[ -f config.sub.orig ] && mv config.sub.orig config.sub || true
+	[ -f config.guess.orig ] && mv config.sub.orig config.guess || true
 	dh_clean 
 
 install: build
@@ -65,14 +64,11 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
 	$(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/varnish.logrotate $(CURDIR)/debian/varnish/etc/logrotate.d/varnish
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

Modified: branches/1.2/debian/varnish.dirs
===================================================================
--- branches/1.2/debian/varnish.dirs	2008-03-24 08:45:54 UTC (rev 2609)
+++ branches/1.2/debian/varnish.dirs	2008-03-25 05:47:55 UTC (rev 2610)
@@ -5,4 +5,3 @@
 var/log
 var/log/varnish
 var/lib/varnish
-usr/share/lintian/overrides/