[SCM] C Bindings for the SFML Library branch, master, updated. upstream/1.3-40-gd36ef89
Christoph Egger
Christoph.Egger at gmx.de
Mon Mar 23 19:44:55 UTC 2009
The following commit has been merged in the master branch:
commit d36ef89a97f0ae0eb1eb0f56273c77c63cd157a1
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Mon Mar 23 20:42:28 2009 +0100
Patches are auto-generated from TopGit branch
Better -dev package name
-dbg Package
diff --git a/debian/control b/debian/control
index 20af034..5a8307a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,14 @@ Source: libcsfml
Priority: extra
Maintainer: Debian Games team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Christoph Egger <debian at christoph-egger.org>
-Build-Depends: debhelper (>= 6), quilt, libsfml1.4-dev
+Build-Depends: debhelper (>= 6), quilt, libsfml-dev (>= 1.4)
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.4-dev
-Provides: libcsfml-dev
+Package: libcsfml-dev
Section: libdevel
Architecture: any
Depends: libcsfml-audio1.4 (= ${binary:Version}), libcsfml-graphics1.4 (= ${binary:Version}),
@@ -24,6 +23,20 @@ Description: Developmentfiles for the C binding of SFML
.
This Package provides the developmentfiles for the C Binding
+Package: libcsfml1.4-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcsfml-audio1.4 (= ${binary:Version})
+ | libcsfml-graphics1.4 (= ${binary:Version}) | libcsfml-network1.4 (= ${binary:Version})
+ | libcsfml-system1.4 (= ${binary:Version}) | libcsfml-window1.4 (= ${binary:Version})
+Description: Libraries for the C Binding of SFML - Debug Files
+ SFML is an simple but fast library for providing access
+ to multimedia libraries. It can be used to develop OpenGL
+ Applications with OpenAL Audio. It Supports Cross Platform
+ Development
+
+
Package: libcsfml-audio1.4
Section: libs
Architecture: any
diff --git a/debian/libcsfml1.4-dev.docs b/debian/libcsfml-dev.docs
similarity index 100%
rename from debian/libcsfml1.4-dev.docs
rename to debian/libcsfml-dev.docs
diff --git a/debian/libcsfml1.4-dev.install b/debian/libcsfml-dev.install
similarity index 100%
rename from debian/libcsfml1.4-dev.install
rename to debian/libcsfml-dev.install
diff --git a/debian/patches/debian/correct-destdir.diff b/debian/patches/debian/correct-destdir.diff
deleted file mode 100644
index 5e90fc1..0000000
--- a/debian/patches/debian/correct-destdir.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Christoph Egger <Christoph.Egger at gmx.de>
-Subject: [PATCH] debian/correct-destdir
-
- The current implementation of the $(DESTDIR) variable creates symlinks
-for the soname-free devlibs pointing to the Destdir breaking two-step
-installs.
-
- Also, as Debian's SFML is linked internally we don't need to link against
-some of the SFML libs in some of the CSFML libs
-
- This patch fixes these issues
-
-Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
-
----
- CSFML/src/SFML/Audio/Makefile | 2 +-
- CSFML/src/SFML/Graphics/Makefile | 2 +-
- CSFML/src/SFML/Network/Makefile | 2 +-
- CSFML/src/SFML/System/Makefile | 2 +-
- CSFML/src/SFML/Window/Makefile | 4 ++--
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CSFML/src/SFML/Audio/Makefile b/CSFML/src/SFML/Audio/Makefile
-index 08bfbce..5e06b6b 100644
---- a/CSFML/src/SFML/Audio/Makefile
-+++ b/CSFML/src/SFML/Audio/Makefile
-@@ -20,4 +20,4 @@ mrproper: clean
- @rm -rf $(LIBNAME)
-
- install:
-- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-+ @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-diff --git a/CSFML/src/SFML/Graphics/Makefile b/CSFML/src/SFML/Graphics/Makefile
-index d5e1c83..9e1f596 100644
---- a/CSFML/src/SFML/Graphics/Makefile
-+++ b/CSFML/src/SFML/Graphics/Makefile
-@@ -20,4 +20,4 @@ mrproper: clean
- @rm -rf $(LIBNAME)
-
- install:
-- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-+ @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-diff --git a/CSFML/src/SFML/Network/Makefile b/CSFML/src/SFML/Network/Makefile
-index 924907e..9b82f85 100644
---- a/CSFML/src/SFML/Network/Makefile
-+++ b/CSFML/src/SFML/Network/Makefile
-@@ -20,4 +20,4 @@ mrproper: clean
- @rm -rf $(LIBNAME)
-
- install:
-- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-+ @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-diff --git a/CSFML/src/SFML/System/Makefile b/CSFML/src/SFML/System/Makefile
-index bdf1e4e..0de6a15 100644
---- a/CSFML/src/SFML/System/Makefile
-+++ b/CSFML/src/SFML/System/Makefile
-@@ -20,4 +20,4 @@ mrproper: clean
- @rm -rf $(LIBNAME)
-
- install:
-- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-+ @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-diff --git a/CSFML/src/SFML/Window/Makefile b/CSFML/src/SFML/Window/Makefile
-index 3bd276a..c5918b0 100644
---- a/CSFML/src/SFML/Window/Makefile
-+++ b/CSFML/src/SFML/Window/Makefile
-@@ -6,7 +6,7 @@ LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
- all: $(LIB)
-
- libcsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-window -lsfml-system
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lsfml-window
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
-@@ -20,4 +20,4 @@ mrproper: clean
- @rm -rf $(LIBNAME)
-
- install:
-- @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
-+ @($(CP) $(LIBNAME) $(DESTLIBDIR) && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB))
---
-tg: (bdce5df..) debian/correct-destdir (depends on: sfml-ng)
diff --git a/debian/patches/debian/gcc4.3.diff b/debian/patches/debian/gcc4.3.diff
deleted file mode 100644
index 1d8be78..0000000
--- a/debian/patches/debian/gcc4.3.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Christoph Egger <Christoph.Egger at gmx.de>
-Subject: [PATCH] debian/gcc4.3
-
- Fix build problems caused by reduced dependency in gcc's include files
-
-Signed-off-by: Christoph Egger <Christoph.Egger at gmx.de>
-
----
- CSFML/src/SFML/Network/IPAddress.cpp | 2 ++
- CSFML/src/SFML/Network/SocketTCP.cpp | 2 ++
- CSFML/src/SFML/Network/SocketUDP.cpp | 2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/CSFML/src/SFML/Network/IPAddress.cpp b/CSFML/src/SFML/Network/IPAddress.cpp
-index 553218a..ae49034 100644
---- a/CSFML/src/SFML/Network/IPAddress.cpp
-+++ b/CSFML/src/SFML/Network/IPAddress.cpp
-@@ -28,6 +28,8 @@
- #include <SFML/Network/IPAddress.h>
- #include <SFML/Network/IPAddress.hpp>
-
-+#include <cstring>
-+using std::strncpy;
-
- namespace
- {
-diff --git a/CSFML/src/SFML/Network/SocketTCP.cpp b/CSFML/src/SFML/Network/SocketTCP.cpp
-index 48bd1ab..c603475 100644
---- a/CSFML/src/SFML/Network/SocketTCP.cpp
-+++ b/CSFML/src/SFML/Network/SocketTCP.cpp
-@@ -31,6 +31,8 @@
- #include <SFML/Network/Packet.hpp>
- #include <SFML/Internal.h>
-
-+#include <cstring>
-+using std::strncpy;
-
- // WARNING : this structure must always be the SAME as in Network/Packet.h
- struct sfPacket
-diff --git a/CSFML/src/SFML/Network/SocketUDP.cpp b/CSFML/src/SFML/Network/SocketUDP.cpp
-index 174db18..08eb027 100644
---- a/CSFML/src/SFML/Network/SocketUDP.cpp
-+++ b/CSFML/src/SFML/Network/SocketUDP.cpp
-@@ -31,6 +31,8 @@
- #include <SFML/Network/Packet.hpp>
- #include <SFML/Internal.h>
-
-+#include <cstring>
-+using std::strncpy;
-
- // WARNING : this structure must always be the SAME as in Network/Packet.h
- struct sfPacket
---
-tg: (bdce5df..) debian/gcc4.3 (depends on: sfml-ng)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3806f9f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/correct-destdir.diff -p1
-debian/gcc4.3.diff -p1
diff --git a/debian/rules b/debian/rules
index 553d642..39dc17b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install
dh_install --fail-missing --sourcedir=debian/tmp
dh_installman
dh_link
- dh_strip
+ dh_strip --dbg-package=libcsfml1.4-dbg
dh_compress
dh_fixperms
dh_makeshlibs
--
C Bindings for the SFML Library
More information about the Pkg-games-commits
mailing list