Mailing List Archive

Author: kobold
Date: 2008-03-24 08:32:12 +0100 (Mon, 24 Mar 2008)
New Revision: 2608

Modified:
trunk/varnish-cache/debian/changelog
trunk/varnish-cache/debian/rules
trunk/varnish-cache/debian/varnish.dirs
Log:
small fixes to the debian packaging: removed a lintian warning, merged two
changelog entries, cleaned debian/rules.


Modified: trunk/varnish-cache/debian/changelog
===================================================================
--- trunk/varnish-cache/debian/changelog 2008-03-19 12:27:43 UTC (rev 2607)
+++ trunk/varnish-cache/debian/changelog 2008-03-24 07:32:12 UTC (rev 2608)
@@ -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: trunk/varnish-cache/debian/rules
===================================================================
--- trunk/varnish-cache/debian/rules 2008-03-19 12:27:43 UTC (rev 2607)
+++ trunk/varnish-cache/debian/rules 2008-03-24 07:32:12 UTC (rev 2608)
@@ -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: trunk/varnish-cache/debian/varnish.dirs
===================================================================
--- trunk/varnish-cache/debian/varnish.dirs 2008-03-19 12:27:43 UTC (rev 2607)
+++ trunk/varnish-cache/debian/varnish.dirs 2008-03-24 07:32:12 UTC (rev 2608)
@@ -5,4 +5,3 @@
var/log
var/log/varnish
var/lib/varnish
-usr/share/lintian/overrides/