[SCM] lives packaging branch, master, updated. debian/1.3.2-1-3-ge83880c

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Fri Apr 9 00:44:03 UTC 2010


The following commit has been merged in the master branch:
commit e83880c5e2dda4295c0251c0d0deda88b847785f
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Fri Apr 9 02:43:58 2010 +0200

    Add patch tags as per DEP-3.

diff --git a/debian/patches/makefile_am.diff b/debian/patches/makefile_am.diff
index 3ee43fa..74dd547 100644
--- a/debian/patches/makefile_am.diff
+++ b/debian/patches/makefile_am.diff
@@ -1,8 +1,13 @@
-Index: lives/lives-plugins/weed-plugins/Makefile.am
-===================================================================
---- lives.orig/lives-plugins/weed-plugins/Makefile.am	2010-04-07 19:18:21.089776986 +0100
-+++ lives/lives-plugins/weed-plugins/Makefile.am	2010-04-07 19:18:55.469775344 +0100
-@@ -16,7 +16,7 @@
+Origin: http://lives.svn.sourceforge.net/viewvc/lives?view=rev&revision=498
+Description: Prevent build failure on mipsel architecture.
+---
+ lives-plugins/weed-plugins/Makefile.am     |    2 +-
+ lives-plugins/weed-plugins/gdk/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- lives.orig/lives-plugins/weed-plugins/Makefile.am
++++ lives/lives-plugins/weed-plugins/Makefile.am
+@@ -16,7 +16,7 @@ shared_ldflags = -shared -fPIC -DPIC -Wl
  shared_cflags = -fPIC -DPIC
  endif
  
@@ -11,11 +16,9 @@ Index: lives/lives-plugins/weed-plugins/Makefile.am
  AM_CFLAGS = $(shared_cflags) -O3 -ffast-math
  AM_CPPFLAGS = $(shared_cflags) -O3 -ffast-math
  
-Index: lives/lives-plugins/weed-plugins/gdk/Makefile.am
-===================================================================
---- lives.orig/lives-plugins/weed-plugins/gdk/Makefile.am	2010-04-07 19:19:04.749776431 +0100
-+++ lives/lives-plugins/weed-plugins/gdk/Makefile.am	2010-04-07 19:19:19.333775305 +0100
-@@ -12,7 +12,7 @@
+--- lives.orig/lives-plugins/weed-plugins/gdk/Makefile.am
++++ lives/lives-plugins/weed-plugins/gdk/Makefile.am
+@@ -12,7 +12,7 @@ shared_ldflags = -shared -fPIC -DPIC -Wl
  shared_cflags = -fPIC -DPIC
  endif
  

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list