[deng] 06/06: release 1.15.3-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Sep 5 23:29:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit 077e8932a1e4e9cfc6e490941ee6ebf820bb4f6b
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Sep 5 19:28:42 2015 -0400
release 1.15.3-1
---
debian/changelog | 6 ++++++
debian/patches/packs.patch | 4 ++--
debian/patches/paths.patch | 9 +++++----
debian/patches/rpath.patch | 4 ++--
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 035b0e6..c5676cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+doomsday (1.15.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 05 Sep 2015 18:14:05 +0000
+
doomsday (1.15.2-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/packs.patch b/debian/patches/packs.patch
index 081920d..c7bf310 100644
--- a/debian/patches/packs.patch
+++ b/debian/patches/packs.patch
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert at debian.org>
deng_sdk {
--- a/doomsday/client/client.pro
+++ b/doomsday/client/client.pro
-@@ -813,7 +813,7 @@ OTHER_FILES += \
+@@ -815,7 +815,7 @@ OTHER_FILES += \
# Resources ------------------------------------------------------------------
@@ -23,7 +23,7 @@ author: Michael Gilbert <mgilbert at debian.org>
data.files = $$OUT_PWD/../doomsday.pk3
-@@ -891,7 +891,7 @@ macx {
+@@ -893,7 +893,7 @@ macx {
DENG_PACKAGES += net.dengine.client.pack
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index 959d4db..1fac200 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert at debian.org>
--- a/doomsday/config_unix.pri
+++ b/doomsday/config_unix.pri
-@@ -28,22 +28,19 @@ isEmpty(PREFIX) {
+@@ -28,23 +28,20 @@ isEmpty(PREFIX) {
}
# Binary location.
@@ -25,8 +25,9 @@ author: Michael Gilbert <mgilbert at debian.org>
# the linker where to find them.
QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
--DENG_BASE_DIR = $$PREFIX/share/doomsday
-+DENG_BASE_DIR = $$PREFIX/share/games/doomsday
+ isEmpty(DENG_BASE_DIR) {
+- DENG_BASE_DIR = $$PREFIX/share/doomsday
++ DENG_BASE_DIR = $$PREFIX/share/games/doomsday
+ }
DENG_DATA_DIR = $$DENG_BASE_DIR/data
- DEFINES += DENG_BASE_DIR=\"\\\"$${DENG_BASE_DIR}/\\\"\"
diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch
index 73fd6b0..8ab165a 100644
--- a/debian/patches/rpath.patch
+++ b/debian/patches/rpath.patch
@@ -10,5 +10,5 @@ author: Michael Gilbert <mgilbert at debian.org>
-!contains(DENG_LIB_DIR, ^/usr/.*): QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
+QMAKE_LFLAGS += -Wl,-rpath,$$DENG_LIB_DIR
- DENG_BASE_DIR = $$PREFIX/share/doomsday
- DENG_DATA_DIR = $$DENG_BASE_DIR/data
+ isEmpty(DENG_BASE_DIR) {
+ DENG_BASE_DIR = $$PREFIX/share/doomsday
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list