Commit a0b35bfd authored by Paul Martin's avatar Paul Martin Committed by Michael Jeanson

Import Debian changes 1.16-10

popt (1.16-10) unstable; urgency=low

  * debian/rules: move dependency on target autoreconf-stamp from 
    configure (which isn't called) to configure-deb-stamp and 
    configure-udeb-stamp.
  * Patches: 757935-autoreconf.patch: add change to Makefile.am of 
    testit.sh path.
  * That'll teach me to try to be too clever! (Closes: #757935)
parent 6dd35159
popt (1.16-10) unstable; urgency=low
* debian/rules: move dependency on target autoreconf-stamp from
configure (which isn't called) to configure-deb-stamp and
configure-udeb-stamp.
* Patches: 757935-autoreconf.patch: add change to Makefile.am of
testit.sh path.
* That'll teach me to try to be too clever! (Closes: #757935)
-- Paul Martin <pm@debian.org> Mon, 25 Aug 2014 16:15:25 +0100
popt (1.16-9) unstable; urgency=low
* Patches:
......
......@@ -7,8 +7,8 @@ http://git.savannah.gnu.org/cgit/automake.git/commit/?id=0cbcf393dbdaa2ff36b11cf
Index: popt-1.16/configure.ac
===================================================================
--- popt-1.16.orig/configure.ac 2014-08-24 14:36:59.142006790 +0100
+++ popt-1.16/configure.ac 2014-08-24 14:38:40.015988208 +0100
--- popt-1.16.orig/configure.ac 2014-08-25 16:14:40.000000000 +0100
+++ popt-1.16/configure.ac 2014-08-25 16:14:40.000000000 +0100
@@ -46,7 +46,6 @@
AC_SYS_LARGEFILE
......@@ -17,3 +17,16 @@ Index: popt-1.16/configure.ac
AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
Index: popt-1.16/Makefile.am
===================================================================
--- popt-1.16.orig/Makefile.am 2010-05-04 21:55:54.000000000 +0100
+++ popt-1.16/Makefile.am 2014-08-25 16:15:14.089719577 +0100
@@ -37,7 +37,7 @@
TESTS_ENVIRONMENT = \
test1="$(top_builddir)/test1"
-TESTS = $(top_srcdir)/testit.sh
+TESTS = testit.sh
include_HEADERS = popt.h
......@@ -43,13 +43,13 @@ endif
objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
objdir_udeb = $(objdir)-udeb
configure: autoreconf-stamp configure-deb-stamp configure-udeb-stamp
configure: configure-deb-stamp configure-udeb-stamp
autoreconf-stamp:
dh_autoreconf
touch $@
configure-deb-stamp:
configure-deb-stamp: autoreconf-stamp
dh_testdir
# make build dir
mkdir $(objdir)
......@@ -58,7 +58,7 @@ configure-deb-stamp:
../configure --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS)
touch $@
configure-udeb-stamp:
configure-udeb-stamp: autoreconf-stamp
dh_testdir
# make build dir
mkdir $(objdir_udeb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment