[SCM] Simple and fast multimedia library for C++ branch, sfml-ng, updated. 906dae824d697c597dd1a3c8eb6a89c025f06b9e
Christoph Egger
Christoph.Egger at gmx.de
Wed Dec 3 16:08:08 UTC 2008
The following commit has been merged in the sfml-ng branch:
commit 906dae824d697c597dd1a3c8eb6a89c025f06b9e
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Wed Dec 3 17:01:21 2008 +0100
Removing no longer patches from debian/patches
diff --git a/debian/patches/add_destdir_to_makefiles.patch b/debian/patches/add_destdir_to_makefiles.patch
deleted file mode 100644
index ee965a9..0000000
--- a/debian/patches/add_destdir_to_makefiles.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: libsfml/src/SFML/Makefile
-===================================================================
---- libsfml.orig/src/SFML/Makefile 2008-11-01 22:36:36.000000000 +0100
-+++ libsfml/src/SFML/Makefile 2008-11-01 22:45:17.000000000 +0100
-@@ -21,7 +21,7 @@
- export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
- export LDFLAGS = $(LINKFLAGS)
- export LIBPATH = ../../../lib
--export VERSION = 1.3
-+export VERSION = 1.4
- export CP = cp
- export LN = ln
- export LNFLAGS = -s -f
-@@ -56,4 +56,5 @@
- @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
-
- install:
-- @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ /usr/include/)
-+ @(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@ && $(CP) -r ../../../include/SFML/ $(DESTDIR)/include/)
-+
diff --git a/debian/patches/modifying_toplevel_makefile b/debian/patches/modifying_toplevel_makefile
deleted file mode 100644
index 0e33070..0000000
--- a/debian/patches/modifying_toplevel_makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: libsfml/Makefile
-===================================================================
---- libsfml.orig/Makefile 2008-11-01 18:13:02.000000000 +0100
-+++ libsfml/Makefile 2008-11-01 18:13:21.000000000 +0100
-@@ -2,12 +2,15 @@
- all: sfml
-
- sfml:
-+ -[ -d lib ] || mkdir lib
- @(cd ./src/SFML && $(MAKE))
-
- sfml-samples:
- @(cd ./samples && $(MAKE))
-
- install:
-+ mkdir -p $(DESTDIR)/lib
-+ mkdir -p $(DESTDIR)/include
- @(cd ./src/SFML && $(MAKE) $@)
-
- clean:
diff --git a/debian/patches/mrproper_target_in_toplevel_makefile.patch b/debian/patches/mrproper_target_in_toplevel_makefile.patch
deleted file mode 100644
index 7c2902e..0000000
--- a/debian/patches/mrproper_target_in_toplevel_makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0bc27c6..0450eaa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,3 +13,7 @@ install:
- clean:
- @(cd ./src/SFML && $(MAKE) $@)
- @(cd ./samples && $(MAKE) $@)
-+
-+mrproper:
-+ @(cd ./src/SFML && $(MAKE) $@)
-+ @(cd ./samples && $(MAKE) $@)
--
Simple and fast multimedia library for C++
More information about the Pkg-games-commits
mailing list