Author: miriam
Date: 2008-10-15 17:22:39 +0000 (Wed, 15 Oct 2008)
New Revision: 8272
Added:
packages/trunk/love/debian/patches/cstrings.patch
Removed:
packages/trunk/love/debian/patches/headers.patch
packages/trunk/love/debian/patches/makefile.patch
Modified:
packages/trunk/love/debian/changelog
packages/trunk/love/debian/control
packages/trunk/love/debian/liblove-dev.install
packages/trunk/love/debian/love.install
packages/trunk/love/debian/patches/series
packages/trunk/love/debian/rules
Log:
New Upstream Release
Uses autotools now
Modified: packages/trunk/love/debian/changelog
===================================================================
--- packages/trunk/love/debian/changelog 2008-10-14 21:57:47 UTC (rev
8271)
+++ packages/trunk/love/debian/changelog 2008-10-15 17:22:39 UTC (rev
8272)
@@ -1,9 +1,11 @@
-love (0.4.0-2) UNRELEASED; urgency=low
+love (0.5.0-1) UNRELEASED; urgency=low
- [ Miriam RUiz ]
+ [ Miriam Ruiz ]
+ * New Upstream Release
* Fixed packages short descriptions
+ * Uses autotools for building now. Added autotools-dev to Build-Depends
- -- Miriam Ruiz <[EMAIL PROTECTED]> Sat, 30 Aug 2008 20:24:37 +0200
+ -- Miriam Ruiz <[EMAIL PROTECTED]> Wed, 15 Oct 2008 16:39:08 +0200
love (0.4.0-1) unstable; urgency=low
Modified: packages/trunk/love/debian/control
===================================================================
--- packages/trunk/love/debian/control 2008-10-14 21:57:47 UTC (rev 8271)
+++ packages/trunk/love/debian/control 2008-10-15 17:22:39 UTC (rev 8272)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 7), quilt, dh-buildinfo, sng,
+Build-Depends: debhelper (>= 7), autotools-dev, quilt, dh-buildinfo, sng,
libboost-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, liblua5.1-0-dev,
libphysfs-dev, libdevil-dev, libfreetype6-dev
Build-Depends-Indep: lua5.1, liblua5.1-expat0
Modified: packages/trunk/love/debian/liblove-dev.install
===================================================================
--- packages/trunk/love/debian/liblove-dev.install 2008-10-14 21:57:47 UTC
(rev 8271)
+++ packages/trunk/love/debian/liblove-dev.install 2008-10-15 17:22:39 UTC
(rev 8272)
@@ -1,2 +1,2 @@
-bin/liblove.a usr/lib/
-src/liblove/include/ usr/include/love/
+#bin/liblove.a usr/lib/
+src/liblove/include/ usr/include/love/
Modified: packages/trunk/love/debian/love.install
===================================================================
--- packages/trunk/love/debian/love.install 2008-10-14 21:57:47 UTC (rev
8271)
+++ packages/trunk/love/debian/love.install 2008-10-15 17:22:39 UTC (rev
8272)
@@ -1,5 +1,5 @@
-bin/love usr/games/
-demos/* usr/share/doc/love/demos/
+#bin/love usr/games/
+#demos/* usr/share/doc/love/demos/
debian/pixmaps/*.xpm usr/share/pixmaps/
debian/pixmaps/*.png usr/share/pixmaps/
debian/*.desktop usr/share/applications/
Added: packages/trunk/love/debian/patches/cstrings.patch
===================================================================
--- packages/trunk/love/debian/patches/cstrings.patch
(rev 0)
+++ packages/trunk/love/debian/patches/cstrings.patch 2008-10-15 17:22:39 UTC
(rev 8272)
@@ -0,0 +1,13 @@
+# Copyright (C) 2008 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: love-0.5-0/src/physfs/File.cpp
+===================================================================
+--- love-0.5-0.orig/src/physfs/File.cpp 2008-10-15 18:59:09.000000000
+0200
++++ love-0.5-0/src/physfs/File.cpp 2008-10-15 18:59:25.000000000 +0200
+@@ -1,4 +1,5 @@
+ #include "File.h"
++#include <string.h>
+
+ namespace love_physfs
+ {
Deleted: packages/trunk/love/debian/patches/headers.patch
===================================================================
--- packages/trunk/love/debian/patches/headers.patch 2008-10-14 21:57:47 UTC
(rev 8271)
+++ packages/trunk/love/debian/patches/headers.patch 2008-10-15 17:22:39 UTC
(rev 8272)
@@ -1,63 +0,0 @@
-# Copyright (C) 2008 Miriam Ruiz <[EMAIL PROTECTED]>
-# Distributed under the same license as the game. See debian/copyright.
-
-Index: love/src/box2d/Source/Collision/b2BroadPhase.cpp
-===================================================================
---- love.orig/src/box2d/Source/Collision/b2BroadPhase.cpp 2008-08-30
03:09:48.000000000 +0200
-+++ love/src/box2d/Source/Collision/b2BroadPhase.cpp 2008-08-30
03:09:49.000000000 +0200
-@@ -18,6 +18,7 @@
-
- #include "b2BroadPhase.h"
- #include <algorithm>
-+#include <string.h>
-
- // Notes:
- // - we use bound arrays instead of linked lists for cache coherence.
-Index: love/src/box2d/Source/Common/b2BlockAllocator.cpp
-===================================================================
---- love.orig/src/box2d/Source/Common/b2BlockAllocator.cpp 2008-08-30
03:09:48.000000000 +0200
-+++ love/src/box2d/Source/Common/b2BlockAllocator.cpp 2008-08-30
03:09:49.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <cstdlib>
- #include <memory>
- #include <climits>
-+#include <string.h>
-
- int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] =
- {
-Index: love/src/box2d/Source/Dynamics/Contacts/b2CircleContact.cpp
-===================================================================
---- love.orig/src/box2d/Source/Dynamics/Contacts/b2CircleContact.cpp
2008-08-30 03:09:48.000000000 +0200
-+++ love/src/box2d/Source/Dynamics/Contacts/b2CircleContact.cpp
2008-08-30 03:09:49.000000000 +0200
-@@ -22,6 +22,7 @@
- #include "../../Common/b2BlockAllocator.h"
-
- #include <new>
-+#include <string.h>
-
- b2Contact* b2CircleContact::Create(b2Shape* shape1, b2Shape* shape2,
b2BlockAllocator* allocator)
- {
-Index: love/src/box2d/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
-===================================================================
---- love.orig/src/box2d/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
2008-08-30 03:09:48.000000000 +0200
-+++ love/src/box2d/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp
2008-08-30 03:09:49.000000000 +0200
-@@ -22,6 +22,7 @@
- #include "../../Common/b2BlockAllocator.h"
-
- #include <new>
-+#include <string.h>
-
- b2Contact* b2PolyAndCircleContact::Create(b2Shape* shape1, b2Shape* shape2,
b2BlockAllocator* allocator)
- {
-Index: love/src/box2d/Source/Dynamics/Contacts/b2PolyContact.cpp
-===================================================================
---- love.orig/src/box2d/Source/Dynamics/Contacts/b2PolyContact.cpp
2008-08-30 03:10:40.000000000 +0200
-+++ love/src/box2d/Source/Dynamics/Contacts/b2PolyContact.cpp 2008-08-30
03:10:52.000000000 +0200
-@@ -23,6 +23,7 @@
-
- #include <memory>
- #include <new>
-+#include <string.h>
-
- b2Contact* b2PolygonContact::Create(b2Shape* shape1, b2Shape* shape2,
b2BlockAllocator* allocator)
- {
Deleted: packages/trunk/love/debian/patches/makefile.patch
===================================================================
--- packages/trunk/love/debian/patches/makefile.patch 2008-10-14 21:57:47 UTC
(rev 8271)
+++ packages/trunk/love/debian/patches/makefile.patch 2008-10-15 17:22:39 UTC
(rev 8272)
@@ -1,24 +0,0 @@
-# Copyright (C) 2008 Miriam Ruiz <[EMAIL PROTECTED]>
-# Distributed under the same license as the game. See debian/copyright.
-
-Index: love/Makefile
-===================================================================
---- love.orig/Makefile 2008-08-29 01:42:40.000000000 +0200
-+++ love/Makefile 2008-08-30 02:55:05.000000000 +0200
-@@ -6,6 +6,7 @@
- CC = g++
- CFLAGS = -g0 -O3 -Wall
- CFLAGS_MOD = -g0 -O3
-+LDFLAGS =
- BINDIR = bin
-
- # Inclusion paths.
-@@ -249,7 +250,7 @@
- $(LOVE_TARGET): $(LOVE_OBJ) $(LIBLOVE_OBJ) $(SDLTIMER_OBJ) $(PHYSFS_OBJ) \
- $(OPENGL_OBJ) $(SDLKEYBOARD_OBJ) $(SDLMOUSE_OBJ) \
- $(SDLMIXER_OBJ) $(SYSTEM_OBJ) $(BOX2D_OBJ)
-- $(CC) $(LOVE_LDFLAGS) -o $(BINDIR)/$@ $^
-+ $(CC) $(LDFLAGS) -o $(BINDIR)/$@ $^ $(LOVE_LDFLAGS)
-
- $(LOVE_OBJDIR)/%.o: $(LOVE_SRCDIR)/%.cpp
- $(CC) $(CFLAGS) $(LOVE_INCLUDES) -c $< -o $@
Modified: packages/trunk/love/debian/patches/series
===================================================================
--- packages/trunk/love/debian/patches/series 2008-10-14 21:57:47 UTC (rev
8271)
+++ packages/trunk/love/debian/patches/series 2008-10-15 17:22:39 UTC (rev
8272)
@@ -1,2 +1 @@
-makefile.patch
-headers.patch
+cstrings.patch
Modified: packages/trunk/love/debian/rules
===================================================================
--- packages/trunk/love/debian/rules 2008-10-14 21:57:47 UTC (rev 8271)
+++ packages/trunk/love/debian/rules 2008-10-15 17:22:39 UTC (rev 8272)
@@ -3,24 +3,31 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-LDFLAGS=-Wl,-z,defs -Wl,-as-needed
-
patch:
$(MAKE) -f /usr/share/quilt/quilt.make patch
configure: configure-stamp
configure-stamp: patch
dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure $(CROSS) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ CFLAGS="$(CFLAGS)" \
+ LDFLAGS="-Wl,-z,defs -Wl,-as-needed"
touch $@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
dh_testdir
cd debian/pixmaps && for i in *.sng; do sng "$$i"; done
- $(MAKE) \
- CFLAGS="$(CFLAGS)" \
- CFLAGS_MOD="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)"
+ $(MAKE)
touch $@
build-indep: build-indep-stamp
@@ -34,6 +41,8 @@
clean: patch
dh_testdir
dh_testroot
+ [ ! -f Makefile ] || $(MAKE) distclean
+ rm -f config.sub config.guess config.log config.cache
rm -f *-stamp
rm -f bin/*
rm -rf obj/*
@@ -48,7 +57,7 @@
dh_testroot
dh_prep -a
dh_installdirs -a
- #$(MAKE) DESTDIR=$(CURDIR)/debian/love install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/love install
install-indep: build-indep-stamp
dh_testdir
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
