[SCM] C Bindings for the SFML Library branch, master, updated. upstream/1.2-19-g246cf54

Christoph Egger Christoph.Egger at gmx.de
Wed Jun 25 14:39:36 UTC 2008 

The following commit has been merged in the master branch:
commit ffbfac29d1f5ae5ab537799f4da9379f350c6552
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Wed Jun 25 16:12:27 2008 +0200

     * Importing newer upstream Version
     * droping now unneeded patches
     * Add new patch to fix soname

diff --git a/CSFML/lib/libcsfml-audio.so.1 b/CSFML/lib/libcsfml-audio.so.1
deleted file mode 100755
index 9bd588d..0000000
Binary files a/CSFML/lib/libcsfml-audio.so.1 and /dev/null differ
diff --git a/CSFML/lib/libcsfml-graphics.so.1 b/CSFML/lib/libcsfml-graphics.so.1
deleted file mode 100755
index 17c5ab7..0000000
Binary files a/CSFML/lib/libcsfml-graphics.so.1 and /dev/null differ
diff --git a/CSFML/lib/libcsfml-network.so.1 b/CSFML/lib/libcsfml-network.so.1
deleted file mode 100755
index ddb2dac..0000000
Binary files a/CSFML/lib/libcsfml-network.so.1 and /dev/null differ
diff --git a/CSFML/lib/libcsfml-system.so.1 b/CSFML/lib/libcsfml-system.so.1
deleted file mode 100755
index 904410b..0000000
Binary files a/CSFML/lib/libcsfml-system.so.1 and /dev/null differ
diff --git a/CSFML/lib/libcsfml-window.so.1 b/CSFML/lib/libcsfml-window.so.1
deleted file mode 100755
index bb85278..0000000
Binary files a/CSFML/lib/libcsfml-window.so.1 and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index e8353ab..5f86253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-libcsfml (1.2-1) unstable; urgency=low
+libcsfml (1.3-1) unstable; urgency=low
+
+  * New Upstream Version
+  * 
+
+ -- Christoph Egger <Christoph.Egger at gmx.de>  Wed, 25 Jun 2008 16:10:19 +0200
+
+libcsfml (1.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #481665)
 
diff --git a/debian/control b/debian/control
index c0972cb..beaf3a6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,18 @@ Source: libcsfml
 Priority: extra
 Maintainer: Debian Games team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Christoph Egger <Christoph.Egger at gmx.de>
-Build-Depends: debhelper (>= 6), quilt, libsfml1-dev
+Build-Depends: debhelper (>= 6), quilt, libsfml1.deb3-dev
 Standards-Version: 3.8.0
 Section: libs
 Homepage: http://www.sfml-dev.org
 Vcs-Git: git://git.debian.org/pkg-games/libcsfml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/libcsfml.git
 
-Package: libcsfml1-dev
+Package: libcsfml1.deb3-dev
 Provides: libcsfml-dev
 Section: libdevel
 Architecture: any
-Depends: libcsfml-audio1 (= ${binary:Version}), libcsfml-graphics1 (= ${binary:Version}), libcsfml-network1 (= ${binary:Version}), libcsfml-system1 (= ${binary:Version}), libcsfml-window1 (= ${binary:Version})
+Depends: libcsfml-audio1.deb3 (= ${binary:Version}), libcsfml-graphics1.deb3 (= ${binary:Version}), libcsfml-network1.deb3 (= ${binary:Version}), libcsfml-system1.deb3 (= ${binary:Version}), libcsfml-window1.deb3 (= ${binary:Version})
 Description: Developmentfiles for the C binding of SFML
  SFML is an simple and fast library for providing access
  to multimedia libraries. It can be used to develop OpenGL
@@ -22,7 +22,7 @@ Description: Developmentfiles for the C binding of SFML
  .
  This Package provides the developmentfiles for the C Binding
 
-Package: libcsfml-audio1
+Package: libcsfml-audio1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsfml-audio1
@@ -32,7 +32,7 @@ Description: Libraries for the C Binding of SFML - Audio Part
  Applications with OpenAL Audio. It Supports Cross Platform
  Development
 
-Package: libcsfml-graphics1
+Package: libcsfml-graphics1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsfml-graphics1
@@ -42,7 +42,7 @@ Description: Libraries for the C Binding of SFML - Graphics Part
  Applications with OpenAL Audio. It Supports Cross Platform
  Development
 
-Package: libcsfml-system1
+Package: libcsfml-system1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsfml-system1
@@ -52,7 +52,7 @@ Description: Libraries for the C Binding of SFML - System Part
  Applications with OpenAL Audio. It Supports Cross Platform
  Development
 
-Package: libcsfml-network1
+Package: libcsfml-network1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsfml-network1
@@ -62,7 +62,7 @@ Description: Libraries for the C Binding of SFML - Network Part
  Applications with OpenAL Audio. It Supports Cross Platform
  Development
 
-Package: libcsfml-window1
+Package: libcsfml-window1.deb3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsfml-window1
diff --git a/debian/libcsfml-audio1.dirs b/debian/libcsfml-audio1.deb3.dirs
similarity index 100%
rename from debian/libcsfml-audio1.dirs
rename to debian/libcsfml-audio1.deb3.dirs
diff --git a/debian/libcsfml-audio1.install b/debian/libcsfml-audio1.deb3.install
similarity index 100%
rename from debian/libcsfml-audio1.install
rename to debian/libcsfml-audio1.deb3.install
diff --git a/debian/libcsfml-graphics1.dirs b/debian/libcsfml-graphics1.deb3.dirs
similarity index 100%
rename from debian/libcsfml-graphics1.dirs
rename to debian/libcsfml-graphics1.deb3.dirs
diff --git a/debian/libcsfml-graphics1.install b/debian/libcsfml-graphics1.deb3.install
similarity index 100%
rename from debian/libcsfml-graphics1.install
rename to debian/libcsfml-graphics1.deb3.install
diff --git a/debian/libcsfml-network1.dirs b/debian/libcsfml-network1.deb3.dirs
similarity index 100%
rename from debian/libcsfml-network1.dirs
rename to debian/libcsfml-network1.deb3.dirs
diff --git a/debian/libcsfml-network1.install b/debian/libcsfml-network1.deb3.install
similarity index 100%
rename from debian/libcsfml-network1.install
rename to debian/libcsfml-network1.deb3.install
diff --git a/debian/libcsfml-system1.install b/debian/libcsfml-system1.deb3.install
similarity index 100%
rename from debian/libcsfml-system1.install
rename to debian/libcsfml-system1.deb3.install
diff --git a/debian/libcsfml-window1.dirs b/debian/libcsfml-window1.deb3.dirs
similarity index 100%
rename from debian/libcsfml-window1.dirs
rename to debian/libcsfml-window1.deb3.dirs
diff --git a/debian/libcsfml-window1.install b/debian/libcsfml-window1.deb3.install
similarity index 100%
rename from debian/libcsfml-window1.install
rename to debian/libcsfml-window1.deb3.install
diff --git a/debian/libcsfml1-dev.docs b/debian/libcsfml1.deb3-dev.docs
similarity index 100%
rename from debian/libcsfml1-dev.docs
rename to debian/libcsfml1.deb3-dev.docs
diff --git a/debian/libcsfml1-dev.install b/debian/libcsfml1.deb3-dev.install
similarity index 100%
rename from debian/libcsfml1-dev.install
rename to debian/libcsfml1.deb3-dev.install
diff --git a/debian/patches/fix_soname.patch b/debian/patches/fix_soname.patch
new file mode 100644
index 0000000..3a3405d
--- /dev/null
+++ b/debian/patches/fix_soname.patch
@@ -0,0 +1,13 @@
+Index: libcsfml/CSFML/src/SFML/Makefile
+===================================================================
+--- libcsfml.orig/CSFML/src/SFML/Makefile	2008-06-25 16:03:25.000000000 +0200
++++ libcsfml/CSFML/src/SFML/Makefile	2008-06-25 16:03:38.000000000 +0200
+@@ -3,7 +3,7 @@
+ export CFLAGS    = -W -Wall -pedantic -fPIC -Wno-unused -I../.. -I../../../include -DNDEBUG -DCSFML_EXPORTS -O2
+ export LDFLAGS   = -shared
+ export LIBPATH   = ../../../lib
+-export VERSION   = 1
++export VERSION   = 1.deb3
+ export CP        = cp
+ export LN        = ln
+ export LNFLAGS   = -s -f
diff --git a/debian/patches/link_agains_needed_sfml_libraries.patch b/debian/patches/link_agains_needed_sfml_libraries.patch
deleted file mode 100644
index e8b851f..0000000
--- a/debian/patches/link_agains_needed_sfml_libraries.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: libcsfml/CSFML/src/SFML/Audio/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Audio/Makefile	2008-06-03 18:44:40.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Audio/Makefile	2008-06-03 18:45:03.000000000 +0200
-@@ -5,7 +5,7 @@
- all: $(LIB)
- 
- libcsfml-audio.so: $(OBJ)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -lsfml-audio -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
- 	$(CPP) -o $@ -c $< $(CFLAGS)
-Index: libcsfml/CSFML/src/SFML/Graphics/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Graphics/Makefile	2008-06-03 18:45:08.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Graphics/Makefile	2008-06-03 18:45:21.000000000 +0200
-@@ -5,7 +5,7 @@
- all: $(LIB)
- 
- libcsfml-graphics.so: $(OBJ)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -lsfml-graphics -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
- 	$(CPP) -o $@ -c $< $(CFLAGS)
-Index: libcsfml/CSFML/src/SFML/Network/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Network/Makefile	2008-06-03 18:45:27.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Network/Makefile	2008-06-03 18:45:41.000000000 +0200
-@@ -5,7 +5,7 @@
- all: $(LIB)
- 
- libcsfml-network.so: $(OBJ)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -lsfml-network -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
- 	$(CPP) -o $@ -c $< $(CFLAGS)
-Index: libcsfml/CSFML/src/SFML/System/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/System/Makefile	2008-06-03 18:45:58.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/System/Makefile	2008-06-03 18:46:12.000000000 +0200
-@@ -5,7 +5,7 @@
- all: $(LIB)
- 
- libcsfml-system.so: $(OBJ)
--	$(CC) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
-+	$(CC) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -lsfml-system -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
- 	$(CPP) -o $@ -c $< $(CFLAGS)
-Index: libcsfml/CSFML/src/SFML/Window/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Window/Makefile	2008-06-03 18:46:17.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Window/Makefile	2008-06-03 18:46:29.000000000 +0200
-@@ -5,7 +5,7 @@
- all: $(LIB)
- 
- libcsfml-window.so: $(OBJ)
--	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
-+	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -lsfml-window -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
- 	$(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/debian/patches/rename_library_to_avoid_conflict_with_c++.patch b/debian/patches/rename_library_to_avoid_conflict_with_c++.patch
deleted file mode 100644
index 2a06069..0000000
--- a/debian/patches/rename_library_to_avoid_conflict_with_c++.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: libcsfml/CSFML/src/SFML/Audio/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Audio/Makefile	2008-06-03 17:45:06.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Audio/Makefile	2008-06-03 17:45:44.000000000 +0200
-@@ -1,10 +1,10 @@
--LIB = libsfml-audio.so
-+LIB = libcsfml-audio.so
- SRC = $(wildcard *.cpp)
- OBJ = $(SRC:.cpp=.o)
- 
- all: $(LIB)
- 
--libsfml-audio.so: $(OBJ)
-+libcsfml-audio.so: $(OBJ)
- 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
-Index: libcsfml/CSFML/src/SFML/Graphics/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Graphics/Makefile	2008-06-03 17:45:52.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Graphics/Makefile	2008-06-03 17:46:01.000000000 +0200
-@@ -1,10 +1,10 @@
--LIB = libsfml-graphics.so
-+LIB = libcsfml-graphics.so
- SRC = $(wildcard *.cpp)
- OBJ = $(SRC:.cpp=.o)
- 
- all: $(LIB)
- 
--libsfml-graphics.so: $(OBJ)
-+libcsfml-graphics.so: $(OBJ)
- 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
-Index: libcsfml/CSFML/src/SFML/Network/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Network/Makefile	2008-06-03 17:46:07.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Network/Makefile	2008-06-03 17:46:15.000000000 +0200
-@@ -1,10 +1,10 @@
--LIB = libsfml-network.so
-+LIB = libcsfml-network.so
- SRC = $(wildcard *.cpp)
- OBJ = $(SRC:.cpp=.o)
- 
- all: $(LIB)
- 
--libsfml-network.so: $(OBJ)
-+libcsfml-network.so: $(OBJ)
- 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
-Index: libcsfml/CSFML/src/SFML/System/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/System/Makefile	2008-06-03 17:46:20.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/System/Makefile	2008-06-03 17:46:29.000000000 +0200
-@@ -1,10 +1,10 @@
--LIB = libsfml-system.so
-+LIB = libcsfml-system.so
- SRC = $(wildcard *.cpp)
- OBJ = $(SRC:.cpp=.o)
- 
- all: $(LIB)
- 
--libsfml-system.so: $(OBJ)
-+libcsfml-system.so: $(OBJ)
- 	$(CC) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
-Index: libcsfml/CSFML/src/SFML/Window/Makefile
-===================================================================
---- libcsfml.orig/CSFML/src/SFML/Window/Makefile	2008-06-03 17:46:34.000000000 +0200
-+++ libcsfml/CSFML/src/SFML/Window/Makefile	2008-06-03 17:46:43.000000000 +0200
-@@ -1,10 +1,10 @@
--LIB = libsfml-window.so
-+LIB = libcsfml-window.so
- SRC = $(wildcard *.cpp)
- OBJ = $(SRC:.cpp=.o)
- 
- all: $(LIB)
- 
--libsfml-window.so: $(OBJ)
-+libcsfml-window.so: $(OBJ)
- 	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ)
- 
- $(OBJ): %.o: %.cpp
diff --git a/debian/patches/series b/debian/patches/series
index e342b7f..5350910 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 add_destdir_to_makefiles.patch
-rename_library_to_avoid_conflict_with_c++.patch
-link_agains_needed_sfml_libraries.patch
 cstring_ftbfs.patch
+fix_soname.patch

-- 
C Bindings for the SFML Library

More information about the Pkg-games-commits mailing list