[redeclipse] 284/494: Revert "rm fix-install-target.diff", refresh window patch

Martin Werner arand-guest at moszumanska.debian.org
Sun Jun 21 20:52:43 UTC 2015


This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit bbfbe3a37c11a92cca0aba46ea518c869bb5a314
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Mon Dec 5 13:15:33 2011 +0100

    Revert "rm fix-install-target.diff", refresh window patch
    
    * Revert commit 70dd100e2ce3273183ab3c791e5476460f135358
    * Refresh debian/patches/windowed-by-default.patch
---
 patches/fix-install-target.patch  | 15 +++++++++++++++
 patches/series                    |  3 ++-
 patches/windowed-by-default.patch |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/patches/fix-install-target.patch b/patches/fix-install-target.patch
new file mode 100644
index 0000000..56aa869
--- /dev/null
+++ b/patches/fix-install-target.patch
@@ -0,0 +1,15 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -170,10 +170,10 @@
+ endif
+ 
+ install-client: client
+-	cp reclient ../bin/reclient$(PLATFORM_SUFFIX)
++	install -D reclient ../bin/reclient$(PLATFORM_SUFFIX)
+ 
+ install-server: server
+-	cp reserver ../bin/reserver$(PLATFORM_SUFFIX)
++	install -D reserver ../bin/reserver$(PLATFORM_SUFFIX)
+ 
+ shared/cube2font.o: shared/cube2font.c
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
diff --git a/patches/series b/patches/series
index 18d6156..28e19c7 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1,3 @@
-build-with-debug-symbols.patch
 windowed-by-default.patch
+build-with-debug-symbols.patch
+fix-install-target.patch
diff --git a/patches/windowed-by-default.patch b/patches/windowed-by-default.patch
index 7f8bcb7..291a1db 100644
--- a/patches/windowed-by-default.patch
+++ b/patches/windowed-by-default.patch
@@ -1,6 +1,6 @@
 --- a/src/engine/main.cpp
 +++ b/src/engine/main.cpp
-@@ -244,7 +244,7 @@
+@@ -245,7 +245,7 @@
  #endif
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git



More information about the Pkg-games-commits mailing list