Bug#724186: frei0r: fix for new automake

2013-10-15 Thread Cyril Brulebois
Control: tag -1 pending

Rebecca N. Palmer  (2013-10-11):
> The only change _required_ now is adding -i to autoreconf (in
> debian/rules)

Confirmed here, and that's what I implemented in the NMU I've just
uploaded (Jonas said on IRC he would welcome an upload), for which
you'll find the diff attached.

> but it seemed a good idea to also fix the deprecation warnings (copied
> below) before they become errors in a future version.

Certainly a good idea to pass on to the upstream maintainers if they
don't know already, but since that wasn't needed to get the package to
build again, I haven't included this change in the NMU.

Anyway: many thanks, Rebecca!

Mraw,
KiBi.
diff -u frei0r-1.1.22git20091109/debian/rules frei0r-1.1.22git20091109/debian/rules
--- frei0r-1.1.22git20091109/debian/rules
+++ frei0r-1.1.22git20091109/debian/rules
@@ -17 +17 @@
-	autoreconf -fs
+	autoreconf -fsi
diff -u frei0r-1.1.22git20091109/debian/changelog frei0r-1.1.22git20091109/debian/changelog
--- frei0r-1.1.22git20091109/debian/changelog
+++ frei0r-1.1.22git20091109/debian/changelog
@@ -1,3 +1,11 @@
+frei0r (1.1.22git20091109-1.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply patch by Rebecca N. Palmer to fix FTBFS (missing compile file)
+with automake 1.14: add "-i" to autoreconf flags. (Closes: #724186)
+
+ -- Cyril Brulebois   Tue, 15 Oct 2013 22:49:25 +0200
+
 frei0r (1.1.22git20091109-1.2) unstable; urgency=low
 
   * Non-maintainer upload.


signature.asc
Description: Digital signature


Bug#724186: frei0r: fix for new automake

2013-10-11 Thread Rebecca N. Palmer
The only change _required_ now is adding -i to autoreconf (in 
debian/rules), but it seemed a good idea to also fix the deprecation 
warnings (copied below) before they become errors in a future version.


configure.ac:8: warning: AM_INIT_AUTOMAKE: two- and three-arguments 
forms are deprecated.  For more info, see:
configure.ac:8: 
http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation

configure.ac:12: installing './compile'
src/Makefile.am:72: warning: source file 'filter/3dflippo/3dflippo.c' is 
in a subdirectory,

src/Makefile.am:72: but option 'subdir-objects' is disabled
automake: warning: possible forward-incompatibility.
automake: At least a source file is in a subdirectory, but the 
'subdir-objects'
automake: automake option hasn't been enabled.  For now, the 
corresponding output
automake: object file(s) will be placed in the top-level directory. 
However,

automake: this behaviour will change in future Automake versions: they will
automake: unconditionally cause object files to be placed in the same 
subdirectory

automake: of the corresponding sources.
automake: You are advised to start using 'subdir-objects' option 
throughout your

automake: project, to avoid future incompatibilities.


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#724186: frei0r: fix for new automake

2013-10-10 Thread Reinhard Tartler
Hi Rebecca,

Thank you for your patch. I've looked at it, but I am not sure if I
really understand it. Can you please elaborate what the problem is,
and how your patch are fixing it?

Does the build really break without the option "subdir-objects"? I'm
surprised to see such a substantial change in default behavior in
automake.

In any case, I think both changes do make sense, but I'd still like to
include a better commit message than "fixes stuff".

Thanks again,
Reinhard

On Thu, Oct 10, 2013 at 3:36 PM, Rebecca N. Palmer  wrote:
> Control: tags 724186 patch
>
> This appears to be caused by the default Automake being upgraded to 1.14,
> and should be fixed by the attached patch.
>
> ___
> pkg-multimedia-maintainers mailing list
> pkg-multimedia-maintain...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers



-- 
regards,
Reinhard


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#724186: frei0r: fix for new automake

2013-10-10 Thread Rebecca N. Palmer

Control: tags 724186 patch

This appears to be caused by the default Automake being upgraded to 
1.14, and should be fixed by the attached patch.
Fix build with automake1.14 (#724186)
$ diff -up debian/rules_orig debian/rules
--- debian/rules_orig	2013-10-10 19:04:50.764234000 +0100
+++ debian/rules	2013-10-10 20:18:21.580104091 +0100
@@ -14,4 +14,4 @@ clean::
 
 makebuilddir::
 	libtoolize -f
-	autoreconf -fs
+	autoreconf -ifs
$ diff -up configure.ac_orig configure.ac
--- configure.ac_orig	2010-01-15 14:59:03.0 +
+++ configure.ac	2013-10-10 20:01:37.636133754 +0100
@@ -5,7 +5,7 @@ AC_PREREQ(2.59c)
 AC_INIT(frei0r-plugins, [1.1.22], [richard.spind...@gmail.com])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([subdir-objects])
 
 # Checks for programs.
 AC_PROG_CXX