summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgtags3
-rw-r--r--debian/changelog11
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules9
4 files changed, 22 insertions, 7 deletions
diff --git a/.hgtags b/.hgtags
index 7067fe2..655f223 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1,2 +1,3 @@
-e6988d5e93f2b0b15237d293eeb0d4edcf4f44c2 libguess_1.1-1
6823be3caa0d0bff76dbeb8bea180b30dd637407 libguess_1.0-1
+e6988d5e93f2b0b15237d293eeb0d4edcf4f44c2 libguess_1.1-1
+82c4d1bdfb5ff28126651c6d7eab0f3c7d6a51ec libguess_1.2-1
diff --git a/debian/changelog b/debian/changelog
index 50cb2eb..b09d81e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
-libguess (1.1-2) UNRELEASED; urgency=low
+libguess (1.1-3) UNRELEASED; urgency=low
* Remove myself from Uploaders.
-- Jakub Wilk <jwilk@debian.org> Mon, 23 Sep 2013 19:36:31 +0200
+libguess (1.1-2) unstable; urgency=low
+
+ * Remove autotools-dev dependency.
+ * Depend on debhelper 9.
+ * Update Standards-Version to 3.9.4 (no changes).
+ * Fix FTBFS with latest debhelper (Closes: #724184).
+
+ -- Andrew Shadura <andrewsh@debian.org> Mon, 21 Oct 2013 11:17:08 +0200
+
libguess (1.1-1) unstable; urgency=low
* New upstream release, drop patches which were applied upstream.
diff --git a/debian/control b/debian/control
index 557f4a3..e81e6a8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: libguess
Priority: optional
-Maintainer: Andrew O. Shadura <bugzilla@tut.by>
-Build-Depends: debhelper (>= 8.1.3~), autotools-dev (>= 20100122.1), dh-autoreconf, libmowgli-dev (>= 0.7.0), pkg-config, gauche
-Standards-Version: 3.9.2
+Maintainer: Andrew Shadura <andrewsh@debian.org>
+Build-Depends: debhelper (>= 9), dh-autoreconf, libmowgli-dev (>= 0.7.0), pkg-config, gauche
+Standards-Version: 3.9.4
Section: libs
Homepage: http://www.atheme.org/project/libguess
Vcs-hg: http://hg.debian.org/hg/collab-maint/libguess
diff --git a/debian/rules b/debian/rules
index 9579d46..887215c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--version-script=$(
export ACLOCAL := aclocal -I m4
%:
- dh $@ --with=autotools-dev --with=autoreconf
+ dh $@ --with=autoreconf
override_dh_auto_build:
gosh src/libguess/guess.scm src/libguess/guess_tab.c
@@ -17,7 +17,12 @@ override_dh_auto_build:
override_dh_compress:
dh_compress -Xguessconv.c
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_clean:
+ [ ! -f buildsys.mk ] || dh_auto_clean
+
override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/src/libguess make -C src/tests/testbench --no-print-directory run
endif
+
+.PHONY: override_dh_auto_build override_dh_compress override_dh_auto_clean override_dh_auto_test