Bug#690877: unblock: love/0.8.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package love
The new package fixes several RC and RG bugs. Compared to the previous unblock
request, this one also fixes the build depends (which is another RC bug).
debdiff is attached.
unblock love/0.8.0-3
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=nl_NL.UTF-8, LC_CTYPE=nl_NL.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru love-0.8.0/debian/changelog love-0.8.0/debian/changelog
--- love-0.8.0/debian/changelog 2012-06-03 10:52:12.000000000 +0200
+++ love-0.8.0/debian/changelog 2012-10-18 20:36:35.000000000 +0200
@@ -1,3 +1,20 @@
+love (0.8.0-3) unstable; urgency=low
+
+ * Team upload.
+ * Add glee-dev to Build-Depends. Closes: #690871
+
+ -- Bas Wijnen <wijnen@debian.org> Thu, 18 Oct 2012 20:35:56 +0200
+
+love (0.8.0-2) unstable; urgency=low
+
+ * Team upload.
+ * Convert copyright file to machine readable format.
+ * Add copyright information for utf8-cpp. Closes: #690394
+ * Add hardening flags to build rules. Closes: #690494
+ * Replace included GLee with system version. Closes: #690492
+
+ -- Bas Wijnen <wijnen@debian.org> Sun, 14 Oct 2012 15:01:02 +0200
+
love (0.8.0-1) unstable; urgency=low
* New Upstream Release. Closes: #664821
diff -Nru love-0.8.0/debian/control love-0.8.0/debian/control
--- love-0.8.0/debian/control 2012-06-03 15:50:21.000000000 +0200
+++ love-0.8.0/debian/control 2012-10-18 20:35:33.000000000 +0200
@@ -6,8 +6,9 @@
Build-Depends: debhelper (>= 7), autotools-dev, automake, autoconf, libtool,
dh-buildinfo, pkg-config, libboost-dev, libsdl1.2-dev, libsdl-mixer1.2-dev,
libopenal-dev, liblua5.1-0-dev, libphysfs-dev, libdevil-dev, libfreetype6-dev,
- libmng-dev, libmodplug-dev, libmpg123-dev, libflac++-dev, libxpm-dev, libxcursor-dev,
- libxxf86vm-dev, libtiff4-dev, libpng12-dev, lua5.1, liblua5.1-expat0, libvorbis-dev
+ libmng-dev, libmodplug-dev, libmpg123-dev, libflac++-dev, libxpm-dev,
+ libxcursor-dev, libxxf86vm-dev, libtiff4-dev, libpng12-dev, lua5.1,
+ liblua5.1-expat0, libvorbis-dev, glee-dev
Standards-Version: 3.9.3
Homepage: http://love2d.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/love/
diff -Nru love-0.8.0/debian/copyright love-0.8.0/debian/copyright
--- love-0.8.0/debian/copyright 2012-10-14 14:30:47.000000000 +0200
+++ love-0.8.0/debian/copyright 2012-10-14 14:59:58.000000000 +0200
@@ -11,7 +11,7 @@
Tommy Nguyen <tn0502@hotmail.com>
License: Zlib
-Files: src/box2d/Source/*, src/box2d/Include/*
+Files: src/box2d/Source/* src/box2d/Include/*
Copyright:
Copyright (c) 2006-2008 Erin Catto
Copyright (c) 2006 Henry Strickland & Ryan Seto
@@ -46,7 +46,7 @@
Copyright: Copyright (C) 2008-2012, Miriam Ruiz <little_miry@yahoo.es>
License: Zlib
-Files: debian/logos/*, debian/pixmaps/*
+Files: debian/logos/* debian/pixmaps/*
Copyright: Copyright (C) 2006-2008 Anders Ruud
License: love-artwork
Comment: Downloaded from http://love2d.org/logos/, which is now a broken link.
diff -Nru love-0.8.0/debian/patches/glee_from_system.patch love-0.8.0/debian/patches/glee_from_system.patch
--- love-0.8.0/debian/patches/glee_from_system.patch 2012-06-03 10:41:21.000000000 +0200
+++ love-0.8.0/debian/patches/glee_from_system.patch 2012-10-15 08:51:30.000000000 +0200
@@ -1,3 +1,12 @@
+Description: Replace included GLee with system version
+ Disable use of included GLee, using the system version instead.
+Author: Bas Wijnen <wijnen@debian.org>
+Bug-Debian: http://bugs.debian.org/690492
+Forwarded: no
+Last-Update: 2012-10-14
+
+Index: love-0.8.0/configure.in
+===================================================================
--- love-0.8.0.orig/src/Makefile.am
+++ love-0.8.0/src/Makefile.am
@@ -198,8 +198,6 @@
@@ -130,3 +139,13 @@
#include <graphics/DrawQable.h>
#include <image/ImageData.h>
#include <font/Rasterizer.h>
+--- love-0.8.0.orig/configure.in 2012-10-14 22:16:31.000000000 +0200
++++ love-0.8.0/configure.in 2012-10-14 22:31:15.232423281 +0200
+@@ -13,6 +13,7 @@
+ AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL]))
+ #AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library]))
+ AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL]))
++AC_SEARCH_LIBS([GLeeInit], [glee], [], AC_MSG_ERROR([Can't LÖVE without GLee]))
+ lua=lua
+ AC_ARG_WITH([luajit],
+ [AS_HELP_STRING([--with-luajit], [Use LuaJIT instead of lua and llvm-lua])],
diff -Nru love-0.8.0/debian/patches/packaged-glee love-0.8.0/debian/patches/packaged-glee
--- love-0.8.0/debian/patches/packaged-glee 1970-01-01 01:00:00.000000000 +0100
+++ love-0.8.0/debian/patches/packaged-glee 2012-10-15 08:46:20.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Replace included GLee with packaged version
+ Disable use of included GLee, using the packaged version instead.
+Author: Bas Wijnen <wijnen@debian.org>
+Bug-Debian: http://bugs.debian.org/690492
+Forwarded: no
+Last-Update: 2012-10-14
+
+Index: love-0.8.0/configure.in
+===================================================================
+--- love-0.8.0.orig/configure.in 2012-10-14 22:16:31.000000000 +0200
++++ love-0.8.0/configure.in 2012-10-14 22:31:15.232423281 +0200
+@@ -13,6 +13,7 @@
+ AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL]))
+ #AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library]))
+ AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL]))
++AC_SEARCH_LIBS([GLeeInit], [glee], [], AC_MSG_ERROR([Can't LÖVE without GLee]))
+ lua=lua
+ AC_ARG_WITH([luajit],
+ [AS_HELP_STRING([--with-luajit], [Use LuaJIT instead of lua and llvm-lua])],
diff -Nru love-0.8.0/debian/patches/series love-0.8.0/debian/patches/series
--- love-0.8.0/debian/patches/series 2012-06-03 10:46:39.000000000 +0200
+++ love-0.8.0/debian/patches/series 2012-10-15 08:51:39.000000000 +0200
@@ -1,3 +1,3 @@
scripts_source.patch
scripts_refresh.patch
-#glee_from_system.patch
+glee_from_system.patch
diff -Nru love-0.8.0/debian/rules love-0.8.0/debian/rules
--- love-0.8.0/debian/rules 2012-06-03 10:47:15.000000000 +0200
+++ love-0.8.0/debian/rules 2012-10-14 15:34:48.000000000 +0200
@@ -5,6 +5,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -23,7 +27,7 @@
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- CFLAGS="$(CFLAGS) `pkg-config openal flac++ --cflags --libs`" \
+ CFLAGS="$(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) `pkg-config openal flac++ --cflags --libs`" \
LDFLAGS="$(LDFLAGS) -Wl,-z,defs -Wl,-as-needed `pkg-config openal flac++ --libs`"
touch $@
Reply to: