diff options
| author | Christoph Egger <Christoph.Egger@gmx.de> | 2008-12-03 16:52:53 +0100 |
|---|---|---|
| committer | Christoph Egger <Christoph.Egger@gmx.de> | 2008-12-03 16:52:53 +0100 |
| commit | 28006695dd986413294f728d92e81316fb1d42c3 (patch) | |
| tree | c89c24759529276a1cbc75d1a1235c911bd94cc9 /debian | |
| parent | 2fe2b87569c693596cd6f8a68a18f14315618943 (diff) | |
* Changes to buld against new snapshot
* Drop more patches applied upstream
* Refresh patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/linking_against_all_needed_libs.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
4 files changed, 17 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 4a8f3bc..b3e2a4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libsfml (1.4~svn944+repack1) unstable; urgency=low + + * Importing another upstream snapshot + + -- Christoph Egger <Christoph.Egger@gmx.de> Wed, 03 Dec 2008 16:43:21 +0100 + libsfml (1.4~svn915-1) unstable; urgency=low * New Upstream Version diff --git a/debian/patches/linking_against_all_needed_libs.patch b/debian/patches/linking_against_all_needed_libs.patch index 810b925..baa14cb 100644 --- a/debian/patches/linking_against_all_needed_libs.patch +++ b/debian/patches/linking_against_all_needed_libs.patch @@ -1,7 +1,7 @@ Index: libsfml/src/SFML/Graphics/Makefile =================================================================== ---- libsfml.orig/src/SFML/Graphics/Makefile 2008-11-01 23:09:41.000000000 +0100 -+++ libsfml/src/SFML/Graphics/Makefile 2008-11-01 23:12:36.000000000 +0100 +--- libsfml.orig/src/SFML/Graphics/Makefile 2008-12-03 16:46:21.000000000 +0100 ++++ libsfml/src/SFML/Graphics/Makefile 2008-12-03 16:46:21.000000000 +0100 @@ -14,21 +14,19 @@ all: $(LIB)
@@ -29,8 +29,8 @@ Index: libsfml/src/SFML/Graphics/Makefile @rm -rf $(LIBNAME)
Index: libsfml/src/SFML/Audio/Makefile =================================================================== ---- libsfml.orig/src/SFML/Audio/Makefile 2008-11-01 22:36:36.000000000 +0100 -+++ libsfml/src/SFML/Audio/Makefile 2008-11-01 23:09:51.000000000 +0100 +--- libsfml.orig/src/SFML/Audio/Makefile 2008-12-03 16:30:57.000000000 +0100 ++++ libsfml/src/SFML/Audio/Makefile 2008-12-03 16:46:21.000000000 +0100 @@ -16,10 +16,10 @@ all: $(LIB)
@@ -46,9 +46,9 @@ Index: libsfml/src/SFML/Audio/Makefile $(CPP) -o $@ -c $< $(CFLAGS)
Index: libsfml/src/SFML/Makefile =================================================================== ---- libsfml.orig/src/SFML/Makefile 2008-11-01 23:09:40.000000000 +0100 -+++ libsfml/src/SFML/Makefile 2008-11-01 23:09:51.000000000 +0100 -@@ -35,16 +35,16 @@ +--- libsfml.orig/src/SFML/Makefile 2008-12-03 16:31:05.000000000 +0100 ++++ libsfml/src/SFML/Makefile 2008-12-03 16:46:21.000000000 +0100 +@@ -36,16 +36,16 @@ sfml-system:
@(cd ./System && $(MAKE))
@@ -70,8 +70,8 @@ Index: libsfml/src/SFML/Makefile .PHONY: clean mrproper
Index: libsfml/src/SFML/Window/Makefile =================================================================== ---- libsfml.orig/src/SFML/Window/Makefile 2008-11-01 23:09:41.000000000 +0100 -+++ libsfml/src/SFML/Window/Makefile 2008-11-01 23:09:51.000000000 +0100 +--- libsfml.orig/src/SFML/Window/Makefile 2008-12-03 16:46:21.000000000 +0100 ++++ libsfml/src/SFML/Window/Makefile 2008-12-03 16:46:21.000000000 +0100 @@ -14,10 +14,10 @@ all: $(LIB)
diff --git a/debian/patches/series b/debian/patches/series index 80cb19c..14f04fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -modifying_toplevel_makefile -add_destdir_to_makefiles.patch add_script_header_to_example_makefiles.patch removing_removed_sources_from_makefiles.patch patching_files_as_needed_by_repackaging.patch diff --git a/debian/rules b/debian/rules index 706c141..a65fde0 100755 --- a/debian/rules +++ b/debian/rules @@ -37,12 +37,12 @@ build-stamp: configure-stamp touch $@ clean: unpatch - find lib -name "*so*" -exec rm {} \; + #find lib -name "*so*" -exec rm {} \; dh_testdir dh_testroot # Add here commands to clean up after the build process. - $(MAKE) clean + $(MAKE) mrproper rm -Rf .pc |