Commit 6dd35159 authored by Paul Martin's avatar Paul Martin Committed by Michael Jeanson

Import Debian changes 1.16-9

popt (1.16-9) unstable; urgency=low

  * Patches:
    + 728596-secure-getenv.patch: update to change #elseif (not recognised
      by gcc) to #elif.
    + 757935-autoreconf.patch: remove AM_C_PROTOTYPES from configure.ac
  * Add dependency on dh-autoreconf, and use that in debian/rules instead
    of directly using the rules from autotools-dev. (Closes: #757935)
  * Update to standards version 3.9.5 (no changes)
parent 9b7f86ae
popt (1.16-9) unstable; urgency=low
* Patches:
+ 728596-secure-getenv.patch: update to change #elseif (not recognised
by gcc) to #elif.
+ 757935-autoreconf.patch: remove AM_C_PROTOTYPES from configure.ac
* Add dependency on dh-autoreconf, and use that in debian/rules instead
of directly using the rules from autotools-dev. (Closes: #757935)
* Update to standards version 3.9.5 (no changes)
-- Paul Martin <pm@debian.org> Mon, 25 Aug 2014 13:46:30 +0100
popt (1.16-8) unstable; urgency=low
* Remove build dependency on quilt. (Closes: #709541)
......
......@@ -2,9 +2,9 @@ Source: popt
Section: devel
Priority: optional
Maintainer: Paul Martin <pm@debian.org>
Build-Depends: debhelper (>> 9), gettext (>= 0.18.1.1-8), autotools-dev
Build-Depends: debhelper (>> 9), gettext (>= 0.18.1.1-8), dh-autoreconf
Homepage: http://rpm5.org/
Standards-Version: 3.9.3
Standards-Version: 3.9.5
Package: libpopt0
Architecture: any
......
......@@ -38,7 +38,7 @@ Index: popt-1.16/system.h
+#if !defined(__LCLINT__)
+#if defined(HAVE_SECURE_GETENV)
+#define getenv(_s) secure_getenv(_s)
+#elseif defined(HAVE___SECURE_GETENV)
+#elif defined(HAVE___SECURE_GETENV)
#define getenv(_s) __secure_getenv(_s)
#endif
+#endif
......
AM_C_PROTOTYPES was only useful for very ancient C compilers that were
not ANSI C compliant. It has been removed from automake. This commit
shows the removal and details about the macro:
http://git.savannah.gnu.org/cgit/automake.git/commit/?id=0cbcf393dbdaa2ff36b11cf2516675e78eada49f
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
@@ -46,7 +46,6 @@
AC_SYS_LARGEFILE
AC_ISC_POSIX
-AM_C_PROTOTYPES
AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
......@@ -4,3 +4,4 @@
217602.patch
356669.patch
728596-secure-getenv.patch
757935-autoreconf.patch
......@@ -43,27 +43,28 @@ endif
objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
objdir_udeb = $(objdir)-udeb
configure: configure-deb-stamp configure-udeb-stamp
configure: autoreconf-stamp configure-deb-stamp configure-udeb-stamp
autoreconf-stamp:
dh_autoreconf
touch $@
configure-deb-stamp:
dh_testdir
dh_autotools-dev_updateconfig
# make build dir
mkdir $(objdir)
# Add here commands to configure the package.
cd $(objdir) && \
../configure --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS)
dh_autotools-dev_restoreconfig
touch $@
configure-udeb-stamp:
dh_testdir
dh_autotools-dev_updateconfig
# make build dir
mkdir $(objdir_udeb)
# Add here commands to configure the package.
cd $(objdir_udeb) && \
../configure --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS)
dh_autotools-dev_restoreconfig
touch $@
build: build-arch build-indep
......@@ -88,7 +89,7 @@ clean:
rm -f build-stamp configure-stamp config.log
rm -f config.log
rm -f build-arch-deb-stamp build-arch-udeb-stamp
rm -f configure-deb-stamp configure-udeb-stamp
rm -f autoreconf-stamp configure-deb-stamp configure-udeb-stamp
rm -f po/*.gmo po/stamp-po
# Remove build trees
......@@ -105,6 +106,7 @@ clean:
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
dh_autoreconf_clean
dh_clean
rm -rf $(CURDIR)/tmp
......
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