Commit b49467c1 authored by Axel Beckert's avatar Axel Beckert

Refresh patches 653362-fix-ftbfs-on-hurd and use-system-pcre

... and update the changelog entry.
parent aad88b20
mp4h (1.3.1-9) UNRELEASED; urgency=low
* Remove dependency on automake1.9, it's redundant since using
dh-autoreconf. (Closes: #724418)
[ Eric Dorland ]
* Add patch to fix compatibility with newer automake versions
[ Axel Beckert ]
* Remove dependency on automake1.9, together with Eric's patch and
dh-autoreconf it's no more necessary. (Closes: #724418)
* Refresh patches 653362-fix-ftbfs-on-hurd and use-system-pcre
-- Axel Beckert <abe@debian.org> Tue, 24 Sep 2013 00:54:20 +0200
......
......@@ -2,10 +2,11 @@ Description: Fixes FTBFS on GNU Hurd
Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653362#5
Author: Svante Signell <svante.signell@telia.com>
diff -ur mp4h-1.3.1/configure.ac mp4h-1.3.1.modified/configure.ac
--- mp4h-1.3.1/configure.ac 2011-12-27 12:09:55.000000000 +0100
+++ mp4h-1.3.1.modified/configure.ac 2011-12-27 12:41:20.000000000 +0100
@@ -38,7 +38,7 @@
Index: mp4h/configure.ac
===================================================================
--- mp4h.orig/configure.ac 2013-09-25 01:36:09.294634979 +0200
+++ mp4h/configure.ac 2013-09-25 01:36:29.122961324 +0200
@@ -37,7 +37,7 @@
AC_CHECK_HEADERS([limits.h locale.h memory.h stdarg.h string.h unistd.h time.h])
AC_CHECK_HEADERS([pwd.h grp.h dirent.h sys/param.h sys/stat.h sys/types.h sys/times.h])
......@@ -14,9 +15,10 @@ diff -ur mp4h-1.3.1/configure.ac mp4h-1.3.1.modified/configure.ac
AC_FUNC_ALLOCA
AC_FUNC_VPRINTF
AC_REPLACE_FUNCS(strtol obstack xmalloc xstrdup)
diff -ur mp4h-1.3.1/src/builtin.c mp4h-1.3.1.modified/src/builtin.c
--- mp4h-1.3.1/src/builtin.c 2011-12-27 12:09:56.000000000 +0100
+++ mp4h-1.3.1.modified/src/builtin.c 2011-12-27 12:41:23.000000000 +0100
Index: mp4h/src/builtin.c
===================================================================
--- mp4h.orig/src/builtin.c 2013-09-25 01:36:27.842940261 +0200
+++ mp4h/src/builtin.c 2013-09-25 01:36:29.126961385 +0200
@@ -1468,7 +1468,11 @@
mp4h_bp_real_path (MP4H_BUILTIN_ARGS)
{
......
1.3.1-4.diff
559822-nmu.diff
573599-regression.diff
mp4h-auto.diff
lintian-cleanup-tg.diff
653362-fix-ftbfs-on-hurd.diff
fix-ftbfs-with-hardening-flags.diff
......
......@@ -3,8 +3,8 @@ Author: Axel Beckert <abe@debian.org>
Index: mp4h/Makefile.am
===================================================================
--- mp4h.orig/Makefile.am 2013-04-24 02:26:26.000000000 +0200
+++ mp4h/Makefile.am 2013-04-24 02:26:26.000000000 +0200
--- mp4h.orig/Makefile.am 2013-09-25 01:46:25.960808371 +0200
+++ mp4h/Makefile.am 2013-09-25 01:46:26.008809186 +0200
@@ -2,12 +2,12 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
......@@ -20,11 +20,11 @@ Index: mp4h/Makefile.am
+SUBDIRS = lib src po doc tests
endif
EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool
EXTRA_DIST = config.rpath m4/ChangeLog CREDITS README README.pcre bootstrap.sh shtool
Index: mp4h/src/Makefile.am
===================================================================
--- mp4h.orig/src/Makefile.am 2013-04-24 02:26:26.000000000 +0200
+++ mp4h/src/Makefile.am 2013-04-24 02:31:37.591153699 +0200
--- mp4h.orig/src/Makefile.am 2013-09-25 01:46:25.960808371 +0200
+++ mp4h/src/Makefile.am 2013-09-25 01:46:26.008809186 +0200
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL)
......@@ -36,16 +36,16 @@ Index: mp4h/src/Makefile.am
if LOADABLE_MODULES
mp4h_LDFLAGS = -export-dynamic
endif
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LTLIBINTL@ $(MODULE_LDADD)
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a @DEB_BUILD_MULTIARCH@/libpcre.a @LTLIBINTL@ $(MODULE_LDADD)
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LIBINTL@ $(MODULE_LDADD)
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a @DEB_BUILD_MULTIARCH@/libpcre.a @LIBINTL@ $(MODULE_LDADD)
include_HEADERS = mp4h.h
noinst_HEADERS = builtin.h
Index: mp4h/configure.ac
===================================================================
--- mp4h.orig/configure.ac 2013-04-24 02:26:26.000000000 +0200
+++ mp4h/configure.ac 2013-04-24 02:33:02.944457265 +0200
@@ -141,10 +141,10 @@
--- mp4h.orig/configure.ac 2013-09-25 01:46:25.984808776 +0200
+++ mp4h/configure.ac 2013-09-25 01:46:26.008809186 +0200
@@ -140,10 +140,10 @@
dnl This line is needed for Debian builds
AC_SUBST(CFLAGS)
AC_SUBST([INTLINCL], [])
......
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