[SCM] Packaging libSOIL -- OpenGL image loader library used by libSFML branch, master, updated. upstream/1.07.20080707-10-g37fc14a

[Christoph Egger]

The following commit has been merged in the master branch:
commit c35bdfad91868bb07681929f4497048811e152e9
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Wed Oct 1 17:53:23 2008 +0200

     * Importing changes from Gonéri

diff --git a/debian/control b/debian/control
index d8748cd..8903b50 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Simple OpenGL Image Library
-  SOIL is a tiny C library used primarily for uploading textures into OpenGL. 
+ SOIL is a tiny C library used primarily for uploading textures into OpenGL. 
  It supports loading BMP, PNG, JPG, TGA, DDS, PSD and HDR files as well as saving
  into TGA, BMP and DDS Files.
  .
@@ -34,7 +34,7 @@ Description: Simple OpenGL Image Library
 Package: libsoil1-dbg
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsoil1
 Description: Simple OpenGL Image Library - debug files
  SOIL is a tiny C library used primarily for uploading textures into OpenGL. 
  It supports loading BMP, PNG, JPG, TGA, DDS, PSD and HDR files as well as saving
diff --git a/debian/copyright b/debian/copyright
index 49c3428..a82f054 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,29 +11,30 @@ Upstream Author:
 
 Copyright:
 
-    Most of this Software is placed in public domain
+    this Software is placed in public domain
 	
-	src/image_helper.* is
-	Copyright (c) 2007-2008 Jonathan Dummer
+    src/image_helper.c, src/image_helper.h and support/FreeBasic/SOIL.bi are also
+    licensed under the MIT license 
+    Copyright © 2007-2008 Jonathan Dummer
 	
-	debian/ is
-	Copyright © 2008 Christoph Egger
-	
-	Permission is hereby granted, free of charge, to any person obtaining a copy
-	of this software and associated documentation files (the "Software"), to deal
-	in the Software without restriction, including without limitation the rights
-	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	copies of the Software, and to permit persons to whom the Software is
-	furnished to do so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
-
+    debian/ is
+    Copyright © 2008 Christoph Egger and under the MIT license
+
+The MIT license:	
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 43d7724..0f73dc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -17,6 +11,11 @@ include /usr/share/quilt/quilt.make
 # shared library versions, option 1
 version=1.07
 major=1
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 configure: configure-stamp
 configure-stamp: patch

-- 
Packaging libSOIL -- OpenGL image loader library used by libSFML