[trigger-rally] 13/14: Switch to libtinyxml2-dev.

Markus Koschany apo at moszumanska.debian.org
Mon Dec 19 14:25:41 UTC 2016


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

apo pushed a commit to branch master
in repository trigger-rally.

commit 736049ccac368438909348a0d010ba6dff2a9383
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 19 14:38:26 2016 +0100

    Switch to libtinyxml2-dev.
---
 debian/changelog                       | 2 +-
 debian/control                         | 2 +-
 debian/patches/20_system_tinyxml.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e7bf4b..5939b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ trigger-rally (0.6.5+dfsg-1) unstable; urgency=medium
   * Drop fix_build_gcc5.patch, 811-flags.patch and 813-config-path.patch.
     Fixed upstream.
   * Refresh 20_system_tinyxml.patch.
-  * Switch to libsdl2-image-dev.
+  * Switch to libsdl2-image-dev and libtinyxml2-dev.
 
  -- Markus Koschany <apo at debian.org>  Mon, 19 Dec 2016 14:19:05 +0100
 
diff --git a/debian/control b/debian/control
index 4822337..a3e1fc2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10),
  libsdl2-image-dev,
  docbook-to-man,
  libglew-dev,
- libtinyxml-dev
+ libtinyxml2-dev
 Standards-Version: 3.9.8
 Uploaders: Stefan Potyra <sistpoty at ubuntu.com>,
  Barry deFreese <bdefreese at debian.org>,
diff --git a/debian/patches/20_system_tinyxml.patch b/debian/patches/20_system_tinyxml.patch
index 092dd22..94ae181 100644
--- a/debian/patches/20_system_tinyxml.patch
+++ b/debian/patches/20_system_tinyxml.patch
@@ -24,7 +24,7 @@ index 9471f58..1b6ad2c 100644
  CXXFLAGS        += -std=c++11 $(WARNINGS) $(OPTIMS)
  CPPFLAGS        += $(DMACROS) $(INCDIRS)
 -EXTRA_LIBS      := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread
-+EXTRA_LIBS      := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml
++EXTRA_LIBS      := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2
  LDFLAGS         += $(EXTRA_LIBS)
  INSTALL_PROGRAM := install --mode=0755
  INSTALL_DATA    := install --mode=0644

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



More information about the Pkg-games-commits mailing list