[SCM] toonloop/master: Unfuzz patch 0004, and drop unrelated and evidently bogus comment.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Apr 6 21:03:23 UTC 2012


The following commit has been merged in the master branch:
commit 4cad9993192d0e5160412a5850d3448b49fb1765
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 19:39:19 2012 +0200

    Unfuzz patch 0004, and drop unrelated and evidently bogus comment.

diff --git a/debian/patches/0004-fix_arm.patch b/debian/patches/0004-fix_arm.patch
index 3ca23d8..61813e7 100644
--- a/debian/patches/0004-fix_arm.patch
+++ b/debian/patches/0004-fix_arm.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-02-09
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -157,6 +157,35 @@
+@@ -157,6 +157,34 @@
  AC_DEFINE_UNQUOTED([DATADIR], "${DATADIR}", "Data dir")
  AC_DEFINE_UNQUOTED([PIXMAPS_DIR], "${PIXMAPS_DIR}", "Pixmaps dir")
  
@@ -39,8 +39,7 @@ Last-Update: 2012-02-09
 +  ]
 +)
 +
-+#this doesn't appear to actually get used....
- AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Werror -Wno-unused-result -Wfatal-errors") 
+ AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Wno-unused-result -Wfatal-errors")
  AC_CONFIG_FILES([
      Makefile
 --- a/src/gui.h

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list