small fixes to the debian packaging: removed a lintian warning, merged two

changelog entries, cleaned debian/rules.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2608 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/debian/changelog b/varnish-cache/debian/changelog
index b6ba7bac770d7553e7e8d5bc1ff00f55759f70a5..efbe0c2a3507b4446cc45bbb6bf2f6f1d20a73a5 100644 (file)
--- a/varnish-cache/debian/changelog
+++ b/varnish-cache/debian/changelog
@@ -1,16 +1,17 @@
 varnish (1.2-0) unstable; urgency=low
 
-  * New upstream release
-
- -- Stig Sandbeck Mathisen <ssm@linpro.no>  Mon, 10 Mar 2008 06:58:19 +0100
-
-varnish (1.1.2-1) unstable; urgency=low
-
-  * Add debian revision
+  [ Stig Sandbeck Mathisen ]
+  * New upstream release.
   * Check if varnishlog is running before attempting reload from
-    logrotate postscript (Closes: #462029)
+    logrotate postscript. (Closes: #462029)
+
+  [ 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.
 
- -- Stig Sandbeck Mathisen <ssm@fnord.no>  Tue, 22 Jan 2008 09:35:05 +0100
+ -- Fabio Tranchitella <kobold@debian.org>  Mon, 24 Mar 2008 08:30:02 +0100
 
 varnish (1.1.2) unstable; urgency=low
 

diff --git a/varnish-cache/debian/rules b/varnish-cache/debian/rules
index 816548931f1a3bce9b1e69b4e208deb9f9b4249c..32d14d407050b92bb10cbd9671156ed12ac4f97b 100755 (executable)
--- a/varnish-cache/debian/rules
+++ b/varnish-cache/debian/rules
@@ -32,32 +32,31 @@ config.status: configure
        # 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 @@ install: build
        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.

diff --git a/varnish-cache/debian/varnish.dirs b/varnish-cache/debian/varnish.dirs
index 9dcd6aa76a5a8c2ca53f583d9e9476fc524eb411..0cc7fb08fcef6f35e62e4efe8be128c03a181702 100644 (file)
--- a/varnish-cache/debian/varnish.dirs
+++ b/varnish-cache/debian/varnish.dirs
@@ -5,4 +5,3 @@ usr/sbin
 var/log
 var/log/varnish
 var/lib/varnish
-usr/share/lintian/overrides/