[maemo-commits] [maemo-commits] r13408 - projects/haf/trunk/libsdl1.2/debian

[From: subversion at stage.maemo.org]

Author: kusalone
Date: 2007-08-24 17:39:41 +0300 (Fri, 24 Aug 2007)
New Revision: 13408

Added:
   projects/haf/trunk/libsdl1.2/debian/sdl.defs
Modified:
   projects/haf/trunk/libsdl1.2/debian/changelog
   projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.files
   projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.install
   projects/haf/trunk/libsdl1.2/debian/libsdl1.2.files
   projects/haf/trunk/libsdl1.2/debian/libsdl1.2.install
   projects/haf/trunk/libsdl1.2/debian/rules
Log:
debian/: sdl.defs provided and vfp enabled

Releasing 1.2.8-20.


Modified: projects/haf/trunk/libsdl1.2/debian/changelog
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/changelog	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/changelog	2007-08-24 14:39:41 UTC (rev 13408)
@@ -1,10 +1,13 @@
 libsdl1.2 (1.2.8-20) unstable; urgency=low
 
-  * UNRELEASED
   * debian/: -dbg package provided.
+  * debian/: /etc/osso-af-init/sdl.defs will be installed for setting certain
+    environment variables. Fixes NB#64964
   * debian/control: dev package depends on libxext-dev. Fixes: NB#58884
+  * debian/rules: vfp enabled if available. Fixes: NB#64482
+  * debian/libsdl1.2-dev.files & .install: Removed .la files from dev package.
 
- -- Kuisma Salonen <kuisma.salonen at nokia.com>  Thu, 24 May 2007 19:49:19 +0300
+ -- Kuisma Salonen <kuisma.salonen at nokia.com>  Fri, 24 Aug 2007 16:52:32 +0300
 
 libsdl1.2 (1.2.8-19) unstable; urgency=low
 

Modified: projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.files
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.files	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.files	2007-08-24 14:39:41 UTC (rev 13408)
@@ -2,4 +2,3 @@
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
-/usr/lib/*.la

Modified: projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.install
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.install	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/libsdl1.2-dev.install	2007-08-24 14:39:41 UTC (rev 13408)
@@ -2,5 +2,4 @@
 usr/include/SDL/*.h
 usr/lib/*.so
 usr/lib/*.a
-usr/lib/*.la
 usr/share/aclocal/*.m4

Modified: projects/haf/trunk/libsdl1.2/debian/libsdl1.2.files
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/libsdl1.2.files	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/libsdl1.2.files	2007-08-24 14:39:41 UTC (rev 13408)
@@ -1 +1,2 @@
 usr/lib/lib*.so.*
+etc/osso-af-init/sdl.defs

Modified: projects/haf/trunk/libsdl1.2/debian/libsdl1.2.install
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/libsdl1.2.install	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/libsdl1.2.install	2007-08-24 14:39:41 UTC (rev 13408)
@@ -1 +1,2 @@
 usr/lib/*.so.*
+etc/osso-af-init/sdl.defs

Modified: projects/haf/trunk/libsdl1.2/debian/rules
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/rules	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/rules	2007-08-24 14:39:41 UTC (rev 13408)
@@ -20,6 +20,11 @@
 else
 	CFLAGS += -O2
 endif
+
+ifneq (,$(findstring vfp,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -mfpu=vfp -mfloat-abi=softfp
+endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -75,6 +80,9 @@
 
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	install -d $(CURDIR)/debian/tmp/etc/osso-af-init
+	install -m755 $(CURDIR)/debian/sdl.defs \
+	$(CURDIR)/debian/tmp/etc/osso-af-init
 
 
 # Build architecture-independent files here.

Added: projects/haf/trunk/libsdl1.2/debian/sdl.defs
===================================================================
--- projects/haf/trunk/libsdl1.2/debian/sdl.defs	2007-08-24 14:29:53 UTC (rev 13407)
+++ projects/haf/trunk/libsdl1.2/debian/sdl.defs	2007-08-24 14:39:41 UTC (rev 13408)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# SDL system wide environment variables
+
+export SDL_AUDIODRIVER="esd"


Property changes on: projects/haf/trunk/libsdl1.2/debian/sdl.defs
___________________________________________________________________
Name: svn:executable
   + *