This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository jstest-gtk.
commit 6feba6f1c7031fc09b3f586f8787f3b861b890e0 Author: Stephen Kitt <[email protected]> Date: Mon Nov 9 22:52:34 2015 +0100 Fix flags-from-env.patch so the package builds again. --- debian/changelog | 6 ++++++ debian/patches/flags-from-env.patch | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 729c230..3323368 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jstest-gtk (0.1.1~git20140501-2) UNRELEASED; urgency=medium + + * Fix flags-from-env.patch so the package builds again. + + -- Stephen Kitt <[email protected]> Mon, 09 Nov 2015 22:51:45 +0100 + jstest-gtk (0.1.1~git20140501-1) unstable; urgency=low * New upstream snapshot. diff --git a/debian/patches/flags-from-env.patch b/debian/patches/flags-from-env.patch index ba780c0..3ce5421 100644 --- a/debian/patches/flags-from-env.patch +++ b/debian/patches/flags-from-env.patch @@ -2,20 +2,19 @@ Description: Pass build flags from the environment Author: Stephen Kitt <[email protected]> Forwarded: no ---- jstest-gtk-0.1.1~git20090722.orig/SConstruct -+++ jstest-gtk-0.1.1~git20090722/SConstruct -@@ -15,8 +15,13 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -15,7 +15,12 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -env = Environment(CXXFLAGS=["-g", "-Wall", "-Werror"]) +import os +env = Environment() ++env.MergeFlags(os.environ['CPPFLAGS']) ++env.MergeFlags(os.environ['CFLAGS']) ++env.MergeFlags(os.environ['CXXFLAGS']) ++env.MergeFlags(os.environ['LINKFLAGS']) env.ParseConfig('pkg-config --cflags --libs gtkmm-2.4 sigc++-2.0 expat x11') -+env.Append(CPPFLAGS = os.environ['CPPFLAGS'], -+ CFLAGS = os.environ['CFLAGS'], -+ CXXFLAGS = os.environ['CXXFLAGS'], -+ LINKFLAGS = os.environ['LINKFLAGS']) env.Program('jstest-gtk', [ 'src/axis_widget.cpp', - 'src/button_widget.cpp', -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/jstest-gtk.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
