[SCM] ffdiaporama/master: Drop patch fix_ftbs_gcc4.7 has it has been adopted upstream

fabricesp-guest at users.alioth.debian.org fabricesp-guest at users.alioth.debian.org
Thu May 31 04:30:00 UTC 2012


The following commit has been merged in the master branch:
commit 4153933070bfdddeed9a0b6240c9eb394c0fa5e7
Author: Fabrice Coutadeur coutadeurf at gmail.com <Fabrice Coutadeur coutadeurf at gmail.com>
Date:   Wed May 30 06:45:02 2012 +0200

    Drop patch fix_ftbs_gcc4.7 has it has been adopted upstream

diff --git a/debian/patches/fix_ftbs_gcc4.7.patch b/debian/patches/fix_ftbs_gcc4.7.patch
deleted file mode 100644
index b954081..0000000
--- a/debian/patches/fix_ftbs_gcc4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Fix compilation error with gcc 4.7 because of missing include
-Author: Fabrice Coutadeur <coutadeurf at gmail.com>
---- a/src/sharedfiles/cBaseApplicationConfig.cpp
-+++ b/src/sharedfiles/cBaseApplicationConfig.cpp
-@@ -27,6 +27,7 @@
- #include <QFileInfo>
- #include <QTextStream>
- #include <QTranslator>
-+#include <unistd.h>
- 
- //*****************************************************************************************************************************************
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9de9722..d02f406 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-desktop-files.patch
-fix_ftbs_gcc4.7.patch

-- 
ffdiaporama packaging



More information about the pkg-multimedia-commits mailing list