[caveexpress] 05/05: Add cavepacker support. Update to new build system.

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository caveexpress.

commit 2bcc6ceb0042b664ed9a1b9d4a7ce4f63f68ba89
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 17:58:58 2015 +0100

    Add cavepacker support. Update to new build system.
---
 debian/caveexpress-data.install |  4 ++--
 debian/caveexpress.install      |  6 +++---
 debian/caveexpress.manpages     |  2 +-
 debian/cavepacker-data.install  |  2 ++
 debian/cavepacker.install       |  4 ++++
 debian/cavepacker.manpages      |  1 +
 debian/changelog                |  4 ++--
 debian/control                  | 25 +++++++++++++++++++++++++
 debian/rules                    | 27 ++++++++++++---------------
 9 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/debian/caveexpress-data.install b/debian/caveexpress-data.install
index 629ceaf..f4465fc 100644
--- a/debian/caveexpress-data.install
+++ b/debian/caveexpress-data.install
@@ -1,2 +1,2 @@
-base/caveexpress                usr/share/games
-contrib/caveexpress-icon.png    usr/share/icons/hicolor/128x128/apps
+base/caveexpress/*                              usr/share/games/caveexpress/base/caveexpress
+contrib/caveexpress-icon.png                    usr/share/icons/hicolor/128x128/apps
diff --git a/debian/caveexpress.install b/debian/caveexpress.install
index 6a4c4ce..0e0acb5 100644
--- a/debian/caveexpress.install
+++ b/debian/caveexpress.install
@@ -1,3 +1,3 @@
-caveexpress                             usr/games
-contrib/caveexpress.appdata.xml         usr/share/appdata
-contrib/caveexpress.desktop             usr/share/applications
+usr/games/caveexpress
+usr/share/applications/caveexpress.desktop
+usr/share/applications/caveexpress.appdata.xml
diff --git a/debian/caveexpress.manpages b/debian/caveexpress.manpages
index 92e8dfc..f63d92a 100644
--- a/debian/caveexpress.manpages
+++ b/debian/caveexpress.manpages
@@ -1 +1 @@
-contrib/caveexpress.6
+contrib/installer/linux/caveexpress.6
diff --git a/debian/cavepacker-data.install b/debian/cavepacker-data.install
new file mode 100644
index 0000000..8af41d5
--- /dev/null
+++ b/debian/cavepacker-data.install
@@ -0,0 +1,2 @@
+base/cavepacker/*                               usr/share/games/cavepacker/base/cavepacker
+contrib/cavepacker-icon.png                     usr/share/icons/hicolor/128x128/apps
diff --git a/debian/cavepacker.install b/debian/cavepacker.install
new file mode 100644
index 0000000..c21b6ba
--- /dev/null
+++ b/debian/cavepacker.install
@@ -0,0 +1,4 @@
+usr/games/cavepacker
+usr/share/applications/cavepacker.desktop
+usr/share/applications/cavepacker.appdata.xml
+
diff --git a/debian/cavepacker.manpages b/debian/cavepacker.manpages
new file mode 100644
index 0000000..8d5272f
--- /dev/null
+++ b/debian/cavepacker.manpages
@@ -0,0 +1 @@
+contrib/installer/linux/cavepacker.6
diff --git a/debian/changelog b/debian/changelog
index aee8152..7d0959e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-caveexpress (2.3-1) UNRELEASED; urgency=low
+caveexpress (2.4.3-1) unstable; urgency=low
 
   * Initial release (Closes: #775743)
 
- -- Markus Koschany <apo at gambaru.de>  Mon, 19 Jan 2015 11:11:29 +0100
+ -- Markus Koschany <apo at debian.org>  Thu, 05 Nov 2015 14:32:16 +0100
diff --git a/debian/control b/debian/control
index b2ffed1..4f6c857 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,11 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders:
  Markus Koschany <apo at debian.org>
 Build-Depends:
+ cmake,
  debhelper (>= 9),
  libbox2d-dev,
  libglm-dev,
+ libgtest-dev,
  liblua5.2-dev,
  libncurses5-dev,
  libsdl2-dev,
@@ -51,3 +53,26 @@ Description: 2D platformer with physics-based gameplay --data
  at the collection point.
  .
  This package contains the data files needed to play CaveExpress.
+
+Package: cavepacker
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: sokoban game with network based multiplayer gaming
+ CavePacker is a sokoban game. It is a puzzle game where you have to move the
+ packages onto their targets without getting stuck. The lesser steps you made
+ for solving a level, the better. You may only push but not pull packages.
+
+Package: cavepacker-data
+Architecture: all
+Depends:
+ ${misc:Depends}
+Suggests:
+ cavepacker
+Description: sokoban game with network based multiplayer gaming --data
+ CavePacker is a sokoban game. It is a puzzle game where you have to move the
+ packages onto their targets without getting stuck. The lesser steps you made
+ for solving a level, the better. You may only push but not pull packages.
+ .
+ This package contains the data files needed to play CaveExpress.
diff --git a/debian/rules b/debian/rules
index 65864de..418c68c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,19 @@
 #!/usr/bin/make -f
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-PKG := caveexpress
+export CCACHE_DIR=$(CURDIR)/ccache
 
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	./configure \
-		--datadir=/usr/share/games/$(PKG) \
-		--enable-release \
-		--enable-network \
-		--with-ncurses \
-		--app=$(PKG)
-
-override_dh_auto_build:
-	$(MAKE) data $(PKG) -j4 Q=
-
-override_dh_auto_install:
-
-get-orig-source:
-	uscan --verbose --download-current-version --force-download
+	dh_auto_configure -- \
+		-DPKGDATADIR=/usr/share/games \
+		-DNETWORKING=ON \
+		-DUNITTESTS=OFF \
+		-DTOOLS=OFF \
+		-DVERBOSE=ON \
+		-DCOVERAGE=OFF \
+		-DUSE_CCACHE=ON \
+		-DCAVEEXPRESS=ON \
+		-DCAVEPACKER=ON \
+		-DMINIRACER=OFF

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