[SCM] Worms style game branch, master, updated. debian/0.9.13-1-5-gcad0875
Dmitry E. Oboukhov
unera at debian.org
Sun Nov 14 20:49:40 UTC 2010
The following commit has been merged in the master branch:
commit cfa9fa4306499ee44a68a25e972388d867e43a70
Author: Dmitry E. Oboukhov <unera at debian.org>
Date: Sun Nov 14 23:35:26 2010 +0300
cdbs using
diff --git a/debian/changelog b/debian/changelog
index e9d558f..fd90b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,7 @@ hedgewars (0.9.14.1-1) unstable; urgency=low
leading to frozen timer
* Various bug fixes
* Switched to 3.0 source format.
+ * Switched to cdbs build system.
-- Dmitry E. Oboukhov <unera at debian.org> Sun, 14 Nov 2010 22:45:48 +0300
diff --git a/debian/control b/debian/control
index 665056f..0c86ea1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: extra
Maintainer: Dmitry E. Oboukhov <unera at debian.org>
Uploaders: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), cmake,
+Build-Depends: debhelper (>= 7), cmake, cdbs,
libqt4-dev (>= 4.2), fp-compiler, libsdl1.2-dev, libsdl-ttf2.0-dev,
libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, bzip2,
fp-units-gfx,
@@ -17,7 +17,9 @@ VCS-Git: git://git.debian.org/collab-maint/hedgewars.git
Package: hedgewars
Architecture: any
-Depends: ${shlibs:Depends}, ttf-dejavu, hedgewars-data (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends},
+ ttf-dejavu,
+ hedgewars-data (>= ${source:Upstream-Version})
Description: Worms style game
Each player controls a team of several hedgehogs. During the
course of the game, players take turns with one of their
diff --git a/debian/hedgewars-data.files b/debian/hedgewars-data.files
deleted file mode 100644
index 5bad92b..0000000
--- a/debian/hedgewars-data.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/games
diff --git a/debian/hedgewars-data.install b/debian/hedgewars-data.install
new file mode 100644
index 0000000..a97eda2
--- /dev/null
+++ b/debian/hedgewars-data.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/games/hedgewars /usr/share/games/
diff --git a/debian/hedgewars.docs b/debian/hedgewars.docs
deleted file mode 100644
index 7e4e1c7..0000000
--- a/debian/hedgewars.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/README
diff --git a/debian/hedgewars.files b/debian/hedgewars.files
deleted file mode 100644
index 6845771..0000000
--- a/debian/hedgewars.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/hedgewars.install b/debian/hedgewars.install
index 97dfc5d..8805b77 100644
--- a/debian/hedgewars.install
+++ b/debian/hedgewars.install
@@ -1,2 +1,3 @@
-build/misc/hedgewars.desktop /usr/share/applications/
-build/misc/hedgewars.png /usr/share/pixmaps/
+debian/tmp/usr/lib/* /usr/lib/
+misc/hedgewars.desktop /usr/share/applications/
+
diff --git a/debian/hedgewars.manpages b/debian/hedgewars.manpages
index 216ae94..7da6ccd 100644
--- a/debian/hedgewars.manpages
+++ b/debian/hedgewars.manpages
@@ -1 +1 @@
-build/man/hedgewars.6
+man/hedgewars.6
diff --git a/debian/rules b/debian/rules
index 4923dce..c7f982c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,108 +1,9 @@
#!/usr/bin/make -f
+DEB_CMAKE_INSTALL_PREFIX := /usr/lib/hedgewars
+DEB_CMAKE_EXTRA_FLAGS := -DWITH_SERVER=1 \
+ -DDATA_INSTALL_DIR=/usr/share/games
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-#
-#
-# # -*- makefile -*-
-#
-# PACKAGE=hedgewars
-# DATAPACKAGE=hedgewars-data
-#
-# unpack: unpack-stamp
-# unpack-stamp:
-# mkdir build
-# tar xjf *.tar.bz2 -C build
-# name_top=`ls build`; \
-# mv build/$$name_top/* build; \
-# rmdir build/$$name_top; \
-# if test -f debian/patches/00list; then \
-# for patch in `cat debian/patches/00list`; do \
-# patch -p0 < debian/patches/$$patch; \
-# done; \
-# fi
-# touch $@
-#
-# configure: configure-stamp
-# configure-stamp: unpack
-# dh_testdir
-# cd build && \
-# cmake -DCMAKE_INSTALL_PREFIX=/usr/lib/$(PACKAGE) \
-# -DWITH_SERVER=1 \
-# -DDATA_INSTALL_DIR=/usr/share/games .
-#
-# # delete depends to libraries we needn't
-# perl -pi -e 's/-l(Xext|X11|QtXml)\s/ /g' \
-# build/QTfrontend/CMakeFiles/hedgewars.dir/link.txt
-# perl -pi -e \
-# 's{^bin/hedgewars: /usr/lib/lib(Xext|X11|QtXml)\..*}{# $$&}mg' \
-# build/QTfrontend/CMakeFiles/hedgewars.dir/build.make
-#
-# touch configure-stamp
-#
-#
-# build: build-stamp
-# build-stamp: configure
-# dh_testdir
-# $(MAKE) -C build
-# touch $@
-#
-# clean:
-# rm -fr build *-stamp
-# dh_clean
-#
-# install: install-stamp
-# install-stamp: build
-# dh_testdir
-# dh_testroot
-# dh_clean -k
-# dh_installdirs -A
-# dh_install
-# rm -fr debian/tmp
-# $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
-# dh_movefiles
-# touch $@
-#
-# # Build architecture-independent files here.
-# binary-indep: build install
-# dh_testdir
-# dh_testroot
-# dh_installdocs -p$(DATAPACKAGE)
-# dh_installchangelogs -p$(DATAPACKAGE)
-# dh_link -p$(DATAPACKAGE)
-# dh_compress -p$(DATAPACKAGE)
-# dh_fixperms -p$(DATAPACKAGE)
-# dh_gencontrol -p$(DATAPACKAGE)
-# dh_md5sums -p$(DATAPACKAGE)
-# dh_builddeb -p$(DATAPACKAGE)
-#
-# # Build architecture-dependent files here.
-# binary-arch: build install
-# dh_testdir
-# dh_testroot
-# dh_installdocs -p$(PACKAGE)
-# dh_installman -p$(PACKAGE)
-# dh_installchangelogs -p$(PACKAGE)
-# dh_installmenu -p$(PACKAGE)
-# dh_link -p$(PACKAGE)
-# dh_strip -p$(PACKAGE)
-# dh_compress -p$(PACKAGE)
-# dh_fixperms -p$(PACKAGE)
-# dh_installdeb -p$(PACKAGE)
-# dh_shlibdeps -p$(PACKAGE)
-# dh_gencontrol -p$(PACKAGE)
-# dh_md5sums -p$(PACKAGE)
-# dh_builddeb -p$(PACKAGE)
-#
-# binary: binary-indep binary-arch
-#
-# .PHONY: build \
-# clean \
-# binary-indep \
-# binary-arch \
-# binary \
-# install-arch \
-# install-indep \
-# configure \
-# install unpack
--
Worms style game
More information about the Pkg-games-commits
mailing list