Adopt debian packaging scheme

Thanks to Didier Raboud <didier@raboud.com>

CMakeLists.txt

@@ -34,6 +34,11 @@ SET(PATCH_VERSION "2")
 # However, some distro don't implement FHS the same way
 # Suse, Redhat put 64bit libs in /lib64; Debian use /lib for 64bit, but specifies /lib32 for 32bit libs
 # See FHS 2.3 for Lib directories under each architecture 
+
+# Some directory shortcuts
+SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/conf)
+INCLUDE(CMakeASM-NASMCompiler)
+
 IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86")
 	SET(i386 1)
         SET(LIB_SUFFIX "" CACHE STRING "Choose the suffix of the lib folder (if any) : None 32")
@@ -48,6 +53,11 @@ ENDIF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86")
 SET(BINDIR "bin")
 SET(DATADIR "share")
 SET(LIBDIR "lib${LIB_SUFFIX}")
+SET(PRIVATELIBDIR "lib/lightspark")
+
+# The library is searched in its private library directory
+SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PRIVATELIBDIR}")
 
 # Setting variables
 SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE)
@@ -154,7 +164,7 @@ SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION
 SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
 
 IF(UNIX)
-	INSTALL(TARGETS spark LIBRARY DESTINATION ${LIBDIR})
+	INSTALL(TARGETS spark LIBRARY DESTINATION ${PRIVATELIBDIR})
 ENDIF(UNIX)
 
 # lightspark executable target

debian/browser-plugin-lightspark.install

@@ -0,0 +1 @@
+usr/lib/mozilla/plugins

debian/common.shlibs

@@ -0,0 +1 @@
+liblightspark 0.4 lightspark-common (= ${binary:Version})

debian/control

@@ -11,13 +11,13 @@ Vcs-Browser: http://github.com/alexp-sssup/lightspark
 
 Package: lightspark
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblightspark42
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Experimental high-performance SWF (Adobe Flash) player
  Lightspark is a free Flash player for Linux which aims for high-performance
  by using modern technologies such as JIT compilation and OpenGL shaders.
  .
- The project is currently in an alpha status, we provide the standalone
- player and mozilla plugin for testing purposes only.
+ The project is currently in an beta status, users are invited to test lightspark 
+ and report any issue
  .
  Nice features:
  * JIT compilation of ActionScript to native x86 bytecode
@@ -34,8 +34,8 @@ Description: Experimental high-performance SWF (Adobe Flash) player
  Lightspark is a free Flash player for Linux which aims for high-performance
  by using modern technologies such as JIT compilation and OpenGL shaders.
  .
- The project is currently in an alpha status, we provide the standalone
- player and mozilla plugin for testing purposes only.
+ The project is currently in an beta status, users are invited to test lightspark 
+ and report any issue
  .
  Nice features:
  * JIT compilation of ActionScript to native x86 bytecode
@@ -45,17 +45,22 @@ Description: Experimental high-performance SWF (Adobe Flash) player
    hardware. Designed from scratch after the official Flash documentation was
    released.
  .
- Common data for standalone and plugin version
+ Common library and data
 
-Package: liblightspark42
+Package: browser-plugin-lightspark
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, lightspark-common
+Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384
+Xb-Npp-MimeType: application/x-shockwave-flash
+Xb-Npp-Name: Lightspark SWF Player
+Xb-Npp-Description: High performance SWF Player
+Xb-Npp-File: liblightsparkplugin.so
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblightspark42
 Description: Experimental high-performance SWF (Adobe Flash) player
  Lightspark is a free Flash player for Linux which aims for high-performance
  by using modern technologies such as JIT compilation and OpenGL shaders.
  .
- The project is currently in an alpha status, we provide the standalone
- player and mozilla plugin for testing purposes only.
+ The project is currently in an beta status, users are invited to test lightspark 
+ and report any issue
  .
  Nice features:
  * JIT compilation of ActionScript to native x86 bytecode
@@ -65,36 +70,30 @@ Description: Experimental high-performance SWF (Adobe Flash) player
    hardware. Designed from scratch after the official Flash documentation was
    released.
  .
- Shared library
+ Mozilla plugin package
 
-Package: liblightspark42-dbg
-Section: debug
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblightspark42
-Description: debugging symbols for lightspark
- Debug symbols for lightspark and associated libraries
 
-Package: mozilla-plugin-lightspark
+Package: lightspark-dbg
+Section: debug
+Priority: extra
 Architecture: i386 amd64
-Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384
-Xb-Npp-MimeType: application/x-shockwave-flash
-Xb-Npp-Name: Lightspark SWF Player
-Xb-Npp-Description: High performance SWF Player
-Xb-Npp-File: liblightsparkplugin.so
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblightspark42
-Description: Experimental high-performance SWF (Adobe Flash) player
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+ lightspark (= ${binary:Version}) |
+ browser-plugin-lightspark (= ${binary:Version}) |
+ lightspark-common (= ${binary:Version})
+Description: High-performance SWF player (experimental) - Debug symbols
  Lightspark is a free Flash player for Linux which aims for high-performance
  by using modern technologies such as JIT compilation and OpenGL shaders.
  .
- The project is currently in an alpha status, we provide the standalone
- player and mozilla plugin for testing purposes only.
+ The project is currently in an beta status, users are invited to test lightspark 
+ and report any issue
  .
  Nice features:
- * JIT compilation of ActionScript to native x86 bytecode
- * Hardware accelerated rendering using OpenGL shaders (GLSL)
- * Aims to support current-generation ActionScript 3
- * A new, clean, codebase exploiting multithreading and optimized for modern
-   hardware. Designed from scratch after the official Flash documentation was
-   released.
+  * JIT compilation of ActionScript to native x86 bytecode
+  * Hardware accelerated rendering using OpenGL shaders (GLSL)
+  * Aims to support current-generation ActionScript 3
+  * A new, clean, codebase exploiting multithreading and optimized for modern
+    hardware. Designed from scratch after the official Flash documentation was
+    released.
  .
- Mozilla plugin package
+ This package contains the debug symbols.

debian/lightspark-common.install

@@ -0,0 +1,2 @@
+usr/share/lightspark/
+usr/lib/lightspark

debian/lightspark.install

@@ -1 +1,2 @@
-usr/bin/lightspark
+usr/bin
+usr/share/man

debian/rules

@@ -1,7 +1,27 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+%:
+	dh --parallel $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	    -DCOMPILE_PLUGIN=1 \
+	    -DCMAKE_BUILD_TYPE=Debian
+
+override_dh_strip:
+	dh_strip --dbg-package=lightspark-dbg
+
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_shlibdeps:
+	export LD_LIBRARY_PATH="$(CURDIR)/debian/lightspark-common/usr/lib/lightspark:$$LD_LIBRARY_PATH" ; \
+	    dh_shlibdeps -Llightspark-common \
+	    -pbrowser-plugin-lightspark -plightspark \
+	    -- -Ldebian/common.shlibs
+
+	dh_shlibdeps --remaining-packages
+
+override_dh_makeshlibs:
+	dh_makeshlibs -X/usr/lib/lightspark
 
-DEB_CMAKE_INSTALL_PREFIX = /usr
-DEB_CMAKE_EXTRA_FLAGS = -DCOMPILE_PLUGIN=1 -DCMAKE_BUILD_TYPE=Debian

docs/man/lightspark.1

@@ -19,7 +19,7 @@
 lightspark \- a free Flash player
 .SH SYNOPSIS
 .B lightspark 
-[--url|-u http://loader.url/file.swf] [--disable-interpreter|-ni] [--enable-jit|-j] [--log-level|-l 0-4] [--parameters-file|-p params-file] file.swf
+[\-\-url|\-u http://loader.url/file.swf] [\-\-disable-interpreter|\-ni] [\-\-enable\-jit|\-j] [\-\-log\-level|\-l 0-4] [\-\-parameters\-file|\-p params-file] file.swf
 .SH DESCRIPTION
 .B Lightspark
 is a free, modern Flash Player implementation, this documents the options accepted by the standalone version of the program.