r7507 - packages/trunk/chromium/debian
Paul Wise
pabs at alioth.debian.org
Wed Jun 25 16:46:56 UTC 2008
Author: pabs
Date: 2008-06-25 16:46:56 +0000 (Wed, 25 Jun 2008)
New Revision: 7507
Added:
packages/trunk/chromium/debian/chromium-data.install
packages/trunk/chromium/debian/chromium.install
Modified:
packages/trunk/chromium/debian/changelog
packages/trunk/chromium/debian/control
packages/trunk/chromium/debian/docs
packages/trunk/chromium/debian/rules
Log:
update rules, build -data package too
Modified: packages/trunk/chromium/debian/changelog
===================================================================
--- packages/trunk/chromium/debian/changelog 2008-06-25 15:34:56 UTC (rev 7506)
+++ packages/trunk/chromium/debian/changelog 2008-06-25 16:46:56 UTC (rev 7507)
@@ -4,6 +4,7 @@
- switched to FTGL and removed non-free TexFont code (Closes: #467123)
- replaced non-free sound and music with free versions (Closes: #385115)
- fix watch file since upstream merged the tarballs
+ - build the chromium-data package since upstream merged the tarballs
- needs API-stable FTGL 2.1.3 RC5, build-depend on it
- doesn't use libsmpeg-dev, drop from build-depends
- manual page, freedesktop menu, patches merged upstream, drop
@@ -14,6 +15,8 @@
* Add myself to uploaders
* Add misc:Depends to the package depends
* Drop build-dep on transition package libglu1-xorg-dev
+ * Respect noopt, parallel=n, crossbuild properly, update config.sub/guess
+ - update Standards-Version since we are now compliant with 3.8.0
-- Paul Wise <pabs at debian.org> Wed, 25 Jun 2008 21:34:36 +0800
Added: packages/trunk/chromium/debian/chromium-data.install
===================================================================
--- packages/trunk/chromium/debian/chromium-data.install (rev 0)
+++ packages/trunk/chromium/debian/chromium-data.install 2008-06-25 16:46:56 UTC (rev 7507)
@@ -0,0 +1,2 @@
+usr/share/games/chromium
+usr/share/doc/chromium
Added: packages/trunk/chromium/debian/chromium.install
===================================================================
--- packages/trunk/chromium/debian/chromium.install (rev 0)
+++ packages/trunk/chromium/debian/chromium.install 2008-06-25 16:46:56 UTC (rev 7507)
@@ -0,0 +1,5 @@
+usr/games/chromium
+usr/share/man
+usr/share/applications
+usr/share/pixmaps
+../../debian/chromium.xpm usr/share/pixmaps
Modified: packages/trunk/chromium/debian/control
===================================================================
--- packages/trunk/chromium/debian/control 2008-06-25 15:34:56 UTC (rev 7506)
+++ packages/trunk/chromium/debian/control 2008-06-25 16:46:56 UTC (rev 7507)
@@ -4,7 +4,7 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Paul Wise <pabs at debian.org>
Build-Depends: debhelper (>= 5.0), quilt, libsdl1.2-dev (>= 1.2.2-3.1~), libopenal-dev (>= 0.2005080600), libalut-dev, libglpng-dev, libglu1-mesa-dev, libftgl-dev (>= 2.1.3~rc5), libfontconfig1-dev | libfontconfig-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://chromium-bsu.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/chromium/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/chromium/?op=log
@@ -19,3 +19,9 @@
delivering supplies to our troops on the front line. Your ship
has a small fleet of robotic fighters which you control from the
relative safety of the Chromium vessel.
+
+Package: chromium-data
+Architecture: all
+Description: data pack for chromium
+ This package provides all the sounds and images required for Chromium
+ B.S.U, a fast paced high action scrolling space shooter.
Modified: packages/trunk/chromium/debian/docs
===================================================================
--- packages/trunk/chromium/debian/docs 2008-06-25 15:34:56 UTC (rev 7506)
+++ packages/trunk/chromium/debian/docs 2008-06-25 16:46:56 UTC (rev 7507)
@@ -1 +1,2 @@
-README
+AUTHORS
+NEWS
Modified: packages/trunk/chromium/debian/rules
===================================================================
--- packages/trunk/chromium/debian/rules 2008-06-25 15:34:56 UTC (rev 7506)
+++ packages/trunk/chromium/debian/rules 2008-06-25 16:46:56 UTC (rev 7507)
@@ -3,17 +3,39 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-PACKAGE=chromium
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ build_flags = --build=$(DEB_BUILD_GNU_TYPE)
+else
+ build_flags = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
configure: configure-stamp
configure-stamp:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- ./configure --disable-setup
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure $(build_flags) CXXFLAGS="$(CFLAGS)" --prefix=/usr --with-font-path=/usr/share/fonts/truetype/uralic/gothub__.ttf
touch configure-stamp
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch build-stamp
@@ -22,37 +44,44 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ rm -f config.sub config.guess
[ ! -f Makefile ] || $(MAKE) distclean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
- dh_install bin/chromium usr/games
- dh_install debian/chromium.xpm usr/share/pixmaps
- dh_install debian/chromium.desktop usr/share/applications
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-binary-indep:
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_install -i --sourcedir=debian/tmp
+ dh_installdocs -i
+ dh_installchangelogs -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installmenu
- dh_installman debian/chromium.6
- dh_installchangelogs CHANGES
- dh_desktop
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_testdir -a
+ dh_testroot -a
+ dh_install -a --sourcedir=debian/tmp
+ dh_installdocs -a
+ dh_installmenu -a
+ dh_installchangelogs -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary-indep binary install
+.PHONY: configure build clean binary-arch binary-indep binary install
More information about the Pkg-games-commits
mailing list