This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tecnoballz.
commit 60b2e260f0d9a9203c1342afe4c1187b9cb2adda Author: Barry deFreese <[email protected]> Date: Thu Apr 16 18:15:34 2009 +0000 * Add autoconf and automake to build-deps and autoreconf on build. * Clean up rules file and use .install files. Clean up build system. --- debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 47 ++++++++++++++++++++---------------------- debian/tecnoballz-data.install | 2 ++ debian/tecnoballz.install | 5 +++++ 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index c61b672..3068f51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ tecnoballz (0.92-3) unstable; urgency=low [ Barry deFreese ] * Add myself to uploaders. * Move desktop file and icon under debian/ dir. + * Add autoconf and automake to build-deps and autoreconf on build. + * Clean up rules file and use .install files. * Bump debhelper build-dep and compat to 5. * Bump Standards Version to 3.8.1. + Menu policy transition. diff --git a/debian/control b/debian/control index ec3d15c..e582684 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Alexis Sukrieh <[email protected]>, Barry deFreese <[email protected]> -Build-Depends: debhelper (>= 5.0.0), libsdl-mixer1.2-dev, +Build-Depends: debhelper (>= 5.0.0), autoconf, automake, libsdl-mixer1.2-dev, libmikmod2-dev, libxext-dev, libvorbis-dev, libogg-dev, libsmpeg-dev, libxxf86dga-dev, libxxf86vm-dev, quilt, autotools-dev, diff --git a/debian/rules b/debian/rules index 144d57e..29e77a6 100755 --- a/debian/rules +++ b/debian/rules @@ -28,9 +28,9 @@ configure-stamp: dh_testdir @echo -e "\n\n*** Configuring the package ***\n\n" QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - touch configure.in && \ - touch aclocal.m4 && \ - touch configure + + autoreconf -fvi + CXXFLAGS="$(CXXFLAGS)" ./configure $(confflags) --prefix=/usr --datadir=/usr/share/games touch configure-stamp @@ -45,18 +45,22 @@ clean: @echo "*** Cleaning the package ***" dh_testdir dh_testroot - -test -r /usr/share/misc/config.sub && \ - cp -f /usr/share/misc/config.sub config.sub - -test -r /usr/share/misc/config.guess && \ - cp -f /usr/share/misc/config.guess config.guess - -test -f config.status && \ - $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 rm -f build-stamp rm -f configure-stamp - rm -f config.status - rm -f config.log + rm -f config.status config.log + rm -f config.sub config.guess + rm -f configure + rm -f aclocal.m4 + rm -f INSTALL + rm -f autotools/config.sub + rm -f autotools/config.guess + rm -f autotools/depcomp + rm -f autotools/install-sh + find ./ -name Makefile.in -delete rm -rf src/.deps + rm -rf .pc dh_clean install: build @@ -65,26 +69,17 @@ install: build dh_clean -k dh_installdirs # building the main package - $(MAKE) install DESTDIR=$(CURDIR)/debian/tecnoballz - # Icon, desktop and stuff for menus - cp tecnoballz.xpm debian/tecnoballz/usr/share/games/tecnoballz - install -d $(CURDIR)/debian/tecnoballz/usr/share/applications - cp tecnoballz.desktop $(CURDIR)/debian/tecnoballz/usr/share/applications - install -d $(CURDIR)/debian/tecnoballz/usr/share/pixmaps - cp tecnoballz.xpm $(CURDIR)/debian/tecnoballz/usr/share/pixmaps + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + # The data package - ln -s tecnoballz-data debian/tecnoballz/usr/share/doc/tecnoballz - mv debian/tecnoballz/var/games/tecnoballz/tecnoballz.hi \ - debian/tecnoballz/var/games/tecnoballz/tecnoballz.hi.clean - # building the data package - install -d $(CURDIR)/debian/tecnoballz-data/usr/share/games/tecnoballz - mv $(CURDIR)/debian/tecnoballz/usr/share/games/tecnoballz/* $(CURDIR)/debian/tecnoballz-data/usr/share/games/tecnoballz - mv $(CURDIR)/debian/tecnoballz-data/usr/share/games/tecnoballz/tecnoballz.xpm debian/tecnoballz/usr/share/games/tecnoballz + mv $(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi \ + $(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi.clean # Build architecture-independent files here. binary-indep: build install dh_testdir dh_testroot + dh_install -i --list-missing dh_installchangelogs -i dh_installdocs -i dh_installexamples -i @@ -99,6 +94,8 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot + dh_install -s --list-missing + dh_installchangelogs -s dh_installmenu -s dh_installman -s man/*.6 dh_link -s diff --git a/debian/tecnoballz-data.install b/debian/tecnoballz-data.install new file mode 100644 index 0000000..05eadcd --- /dev/null +++ b/debian/tecnoballz-data.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/games/tecnoballz/* usr/share/games/tecnoballz/ + diff --git a/debian/tecnoballz.install b/debian/tecnoballz.install new file mode 100644 index 0000000..bdec535 --- /dev/null +++ b/debian/tecnoballz.install @@ -0,0 +1,5 @@ +debian/tmp/usr/games/* usr/games/ +debian/tmp/var/games/* var/games/ +debian/tecnoballz.desktop usr/share/applications/ +debian/tecnoballz.xpm usr/share/pixmaps/ + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tecnoballz.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
