[SCM] toonloop/master: Tidy patches: Refresh with shortening quilt options -pab --no---no-timestamps --no-index. Shorten short description. Drop trailing dot in short description. Consistently describe what patch does (not what happened without it). Add Last-Update field.

Fri Apr 6 13:55:11 UTC 2012

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

    Tidy patches: Refresh with shortening quilt options -pab --no---no-timestamps --no-index. Shorten short description. Drop trailing dot in short description. Consistently describe what patch does (not what happened without it). Add Last-Update field.

diff --git a/debian/patches/0002-help2man.patch b/debian/patches/0002-help2man.patch
index f8e96f1..d95312a 100644
--- a/debian/patches/0002-help2man.patch
+++ b/debian/patches/0002-help2man.patch
@@ -1,22 +1,19 @@
-Description: Call help2man with --no-discard-stderr to avoid build failures.
+Description: Call help2man with --no-discard-stderr to avoid build failures
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
----
- man/Makefile.am |    2 +-
- man/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+Last-Update: 2011-05-05
 
---- toonloop.orig/man/Makefile.am
-+++ toonloop/man/Makefile.am
-@@ -9,4 +9,4 @@ common_mandeps = $(top_srcdir)/configure
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -9,4 +9,4 @@
  # 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 $@
---- toonloop.orig/man/Makefile.in
-+++ toonloop/man/Makefile.in
-@@ -488,7 +488,7 @@ uninstall-man: uninstall-man1
+--- 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
diff --git a/debian/patches/0003-rtmidi.patch b/debian/patches/0003-rtmidi.patch
index d1aecf2..397c873 100644
--- a/debian/patches/0003-rtmidi.patch
+++ b/debian/patches/0003-rtmidi.patch
@@ -1,13 +1,10 @@
-Description: Link against rtmidi to avoid FTBFS.
+Description: Link against rtmidi to avoid FTBFS
 Author: Alessio Treglia <alessio at debian.org>
----
- configure    |    4 ++--
- configure.ac |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+Last-Update: 2012-02-08
 
---- toonloop.orig/configure
-+++ toonloop/configure
-@@ -15729,7 +15729,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+--- a/configure
++++ b/configure
+@@ -15729,7 +15729,7 @@
  
  # save original flags
  SAVED_LIBS=$LIBS
@@ -16,7 +13,7 @@ Author: Alessio Treglia <alessio at debian.org>
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
   #include <stk/RtMidi.h>
-@@ -15742,7 +15742,7 @@ RtMidiIn input
+@@ -15742,7 +15742,7 @@
  }
  _ACEOF
  if ac_fn_cxx_try_link "$LINENO"; then :
@@ -25,9 +22,9 @@ Author: Alessio Treglia <alessio at debian.org>
  
  else
    as_fn_error $? "libstk is not installed: alsa" "$LINENO" 5
---- toonloop.orig/configure.ac
-+++ toonloop/configure.ac
-@@ -40,11 +40,11 @@ AC_CHECK_LIB([m],[sin],[AC_SUBST([LIBM_C
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,11 +40,11 @@
  AC_LANG_PUSH(C++)
  # save original flags
  SAVED_LIBS=$LIBS
diff --git a/debian/patches/0004-fix_arm.patch b/debian/patches/0004-fix_arm.patch
index 99dd289..3ca23d8 100644
--- a/debian/patches/0004-fix_arm.patch
+++ b/debian/patches/0004-fix_arm.patch
@@ -1,17 +1,13 @@
-Description: fix build on architectures where clutter uses opengl es
+Description: Fix build on architectures where Clutter uses OpenGL ES
 Author: Peter Green <plugwash at p10link.net>
 Bug-Debian: http://bugs.debian.org/657814
 Forwarded: no
 Reviewed-By: Alessio Treglia <alessio at debian.org>
----
- configure.ac    |   29 +++++++++++++++++++++++++++++
- src/Makefile.am |    3 ++-
- src/gui.h       |    7 ++++++-
- 3 files changed, 37 insertions(+), 2 deletions(-)
+Last-Update: 2012-02-09
 
---- toonloop.orig/configure.ac
-+++ toonloop/configure.ac
-@@ -157,6 +157,35 @@ AC_MSG_NOTICE(Storing pixmaps files in $
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,6 +157,35 @@
  AC_DEFINE_UNQUOTED([DATADIR], "${DATADIR}", "Data dir")
  AC_DEFINE_UNQUOTED([PIXMAPS_DIR], "${PIXMAPS_DIR}", "Pixmaps dir")
  
@@ -47,8 +43,8 @@ Reviewed-By: Alessio Treglia <alessio at debian.org>
  AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Werror -Wno-unused-result -Wfatal-errors") 
  AC_CONFIG_FILES([
      Makefile
---- toonloop.orig/src/gui.h
-+++ toonloop/src/gui.h
+--- a/src/gui.h
++++ b/src/gui.h
 @@ -21,7 +21,12 @@
  #ifndef __GUI_H__
  #define __GUI_H__
@@ -63,9 +59,9 @@ Reviewed-By: Alessio Treglia <alessio at debian.org>
  #include <clutter/clutter.h>
  #include <tr1/memory> // for shared_ptr
  #include <vector>
---- toonloop.orig/src/Makefile.am
-+++ toonloop/src/Makefile.am
-@@ -86,7 +86,8 @@ toonloop_CXXFLAGS = \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -86,7 +86,8 @@
  	$(RAW1394_CFLAGS) \
  	$(AVC1394_CFLAGS) \
  	$(STK_CXXFLAGS) \
diff --git a/debian/patches/0005-remove_endian_define.patch b/debian/patches/0005-remove_endian_define.patch
index 542a56f..b18e6a2 100644
--- a/debian/patches/0005-remove_endian_define.patch
+++ b/debian/patches/0005-remove_endian_define.patch
@@ -1,14 +1,11 @@
-Description: Both BIG_ENDIAN and LITTLE_ENDIAN were defined and caused FTBFS
- on sparc.
-From: http://bugs.debian.org/660151
+Description: Avoid FTBFS on SPARC by setting both BIG_ENDIAN and LITTLE_ENDIAN
+Bug-Debian: http://bugs.debian.org/660151
 Forwarded: no
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Last-Update: 2012-02-16
 
---- toonloop.orig/configure.ac
-+++ toonloop/configure.ac
-@@ -47,7 +47,7 @@ AC_LINK_IFELSE(
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@
          [AC_SUBST(STK_LIBS," -lstk -lrtmidi -lrt -lm")],
          [AC_MSG_ERROR([libstk is not installed: alsa])])
  LIBS=$SAVED_LIBS # restore them

-- 
toonloop packaging

