[lugaru] 04/07: Remove old patches, no longer applicable

Martin Werner arand-guest at moszumanska.debian.org
Sat May 20 22:53:01 UTC 2017


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

arand-guest pushed a commit to branch master
in repository lugaru.

commit 4219c98e39cab688ea3008e50ac4d08609f97dec
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat May 20 16:01:07 2017 +0200

    Remove old patches, no longer applicable
    
    * Config dir rename is not needed when using the lugaru name.
    
    * Data skipping is not needed since no packages plitting is done
      anymore.
    
    * Bad resolution patch is applied upstream.
---
 .../change-homedir-to-use-openlugaru-name.patch    | 25 ----------------------
 debian/patches/dont-install-data.patch             | 22 -------------------
 debian/patches/fixed-bad-resolution-on-first-run   | 20 -----------------
 debian/patches/series                              |  3 ---
 4 files changed, 70 deletions(-)

diff --git a/debian/patches/change-homedir-to-use-openlugaru-name.patch b/debian/patches/change-homedir-to-use-openlugaru-name.patch
deleted file mode 100644
index a2ee473..0000000
--- a/debian/patches/change-homedir-to-use-openlugaru-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9f2bc5b0cf347c98508909e1b6a0f49cd1341341 Mon Sep 17 00:00:00 2001
-From: Martin Erik Werner <martinerikwerner at gmail.com>
-Date: Wed, 31 Jul 2013 19:47:31 +0200
-Subject: [PATCH] change homedir to use openlugaru name
-
----
- Source/MacCompatibility.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp
-index e82b1b7..6242265 100644
---- a/Source/MacCompatibility.cpp
-+++ b/Source/MacCompatibility.cpp
-@@ -216,7 +216,7 @@ static inline const char *getPrefPath(void)
- #if (defined(__APPLE__) && defined(__MACH__))
-         const char *PREFPATHNAME = "Library/Application Support/Lugaru";
- #else
--        const char *PREFPATHNAME = ".lugaru";
-+        const char *PREFPATHNAME = ".openlugaru";
- #endif
-         size_t len = strlen(homedir) + strlen(PREFPATHNAME) + 2;
-         prefpath = new char[len];
--- 
-1.8.3.2
-
diff --git a/debian/patches/dont-install-data.patch b/debian/patches/dont-install-data.patch
deleted file mode 100644
index 3f955d6..0000000
--- a/debian/patches/dont-install-data.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Don't install Data
- Since Data is shipped in the lugaru-data package instead, we disable
- installing it in the cmake build.
-Forwarded: not-needed
-Author: Martin Erik Werner <martinerikwerner at gmail.com>
-Last-Update: 2012-02-26
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -548,9 +548,9 @@
- 	endif(APPLE AND LUGARU_HAS_INTERNAL_SDL)
- endif(WIN32)
- 
--if(NOT APPLE)
--install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
--endif(NOT APPLE)
-+#if(NOT APPLE)
-+#install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${CMAKE_INSTALL_PREFIX})
-+#endif(NOT APPLE)
- 
- if(APPLE)
- install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data DESTINATION ${APPS_ROOT})
diff --git a/debian/patches/fixed-bad-resolution-on-first-run b/debian/patches/fixed-bad-resolution-on-first-run
deleted file mode 100644
index 023c116..0000000
--- a/debian/patches/fixed-bad-resolution-on-first-run
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User sf17k
-# Date 1306774830 14400
-# Node ID c699faa41aafd8e609288addbbed9988f06d0054
-# Parent  dbb547a1d11841243499e003a5e7d6ba2ebd54f8
-fixed bad resolution being saved to config on first run
-
---- a/Source/Settings.cpp
-+++ b/Source/Settings.cpp
-@@ -6,8 +6,8 @@
- 	detail=1;
- 	ismotionblur=0;
- 	usermousesensitivity=1;
--	kContextWidth=640;
--	kContextHeight=480;
-+	game.newscreenwidth=kContextWidth=640;
-+	game.newscreenheight=kContextHeight=480;
- 	kBitsPerPixel = 32;
- 	floatjump=0;
- 	autoslomo=1;
diff --git a/debian/patches/series b/debian/patches/series
index 8ade8b3..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-dont-install-data.patch
-fixed-bad-resolution-on-first-run
-change-homedir-to-use-openlugaru-name.patch

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



More information about the Pkg-games-commits mailing list