[SCM] toonloop/master: Tidy patches: Stop patching autogenerated files.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Apr 6 13:55:12 UTC 2012


The following commit has been merged in the master branch:
commit cc129bb5e0c9f1b4fec784bbc3785c26439263db
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 15:53:36 2012 +0200

    Tidy patches: Stop patching autogenerated files.

diff --git a/debian/patches/0002-help2man.patch b/debian/patches/0002-help2man.patch
index d95312a..49411a6 100644
--- a/debian/patches/0002-help2man.patch
+++ b/debian/patches/0002-help2man.patch
@@ -11,14 +11,3 @@ Last-Update: 2011-05-05
  toonloop.1: $(top_srcdir)/src/application.cpp $(common_mandeps) $(top_srcdir)/man/man-toonloop.txt
 -	$(HELP2MAN) --include=man-toonloop.txt --name="The Toonloop Live Animation Performance Tool" --no-info $(top_builddir)/src/toonloop -o $@
 +	$(HELP2MAN) --include=man-toonloop.txt --name="The Toonloop Live Animation Performance Tool" --no-info --no-discard-stderr $(top_builddir)/src/toonloop -o $@
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -488,7 +488,7 @@
- # binary when any source file changes, only the main one.
- # Use -o so that the `missing' program can infer the output file.
- toonloop.1: $(top_srcdir)/src/application.cpp $(common_mandeps) $(top_srcdir)/man/man-toonloop.txt
--	$(HELP2MAN) --include=man-toonloop.txt --name="The Toonloop Live Animation Performance Tool" --no-info $(top_builddir)/src/toonloop -o $@
-+	$(HELP2MAN) --include=man-toonloop.txt --name="The Toonloop Live Animation Performance Tool" --no-info --no-discard-stderr $(top_builddir)/src/toonloop -o $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/patches/0003-rtmidi.patch b/debian/patches/0003-rtmidi.patch
index 397c873..64c0dba 100644
--- a/debian/patches/0003-rtmidi.patch
+++ b/debian/patches/0003-rtmidi.patch
@@ -2,26 +2,6 @@ Description: Link against rtmidi to avoid FTBFS
 Author: Alessio Treglia <alessio at debian.org>
 Last-Update: 2012-02-08
 
---- a/configure
-+++ b/configure
-@@ -15729,7 +15729,7 @@
- 
- # save original flags
- SAVED_LIBS=$LIBS
--LIBS="$LIBS -lstk"
-+LIBS="$LIBS -lstk -lrtmidi"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-  #include <stk/RtMidi.h>
-@@ -15742,7 +15742,7 @@
- }
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
--  STK_LIBS=" -lstk -lrt -lm"
-+  STK_LIBS=" -lstk -lrtmidi -lrt -lm"
- 
- else
-   as_fn_error $? "libstk is not installed: alsa" "$LINENO" 5
 --- a/configure.ac
 +++ b/configure.ac
 @@ -40,11 +40,11 @@

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list