Source: realtimebattle
Severity: wishlist
Tags: patch
Hi,
Attached you will find a patch that:
* Adds build-arch and build-indep targets. (/proposed/ release goal)
- Cannot yet be used realibly on buildds, so the current "is javac
available" code has been left for now.
* Enables hardning flags (accepted release goal)
- Required a minor patch to one of the upstream files.
- Done in the .diff.gz, since there were other changes in the diff.gz
already.
* Migrates from default-jdk-builddep to default-jdk.
- This saves an unused JDK on most common platforms (i.e. i386 and amd64)
- Details about this can be found in java-common.
~Niels
diff -u realtimebattle-1.0.8/debian/rules realtimebattle-1.0.8/debian/rules
--- realtimebattle-1.0.8/debian/rules
+++ realtimebattle-1.0.8/debian/rules
@@ -1,13 +1,20 @@
#!/usr/bin/make -f
+DPKG_EXPORT_BUILDFLAGS=1
+
+include /usr/share/dpkg/buildflags.mk
+
d=debian/tmp
ROOT=$(d)/usr
LC_ALL=C
PACKAGE=realtimebattle
-export JAVAC=/usr/bin/ecj
+JAVA_HOME=/usr/lib/jvm/default-java
+export JAVAC=$(JAVA_HOME)/bin/javac
export ROBOTS=empty rotate_and_fire seek_and_destroy xt-bot thomas2 joypad_robot perl-Skeleton perl raziel $(shell [ -x $(JAVAC) ] && echo jBot )
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
@@ -91,3 +98,3 @@
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install clean1
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install clean1
diff -u realtimebattle-1.0.8/debian/control realtimebattle-1.0.8/debian/control
--- realtimebattle-1.0.8/debian/control
+++ realtimebattle-1.0.8/debian/control
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Rémi Vanicat <vani...@debian.org>
Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglib2.0-dev
-Build-Depends-Indep: default-jdk-builddep
+Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglib2.0-dev,
+ dpkg-dev (>= 1.16.1~)
+Build-Depends-Indep: default-jdk
Vcs-Browser: http://git.debian.org/?p=collab-maint/realtimebattle.git;a=summary
Vcs-Git: git://git.debian.org/git/collab-maint/realtimebattle.git
diff -u realtimebattle-1.0.8/debian/changelog realtimebattle-1.0.8/debian/changelog
--- realtimebattle-1.0.8/debian/changelog
+++ realtimebattle-1.0.8/debian/changelog
@@ -1,3 +1,15 @@
+realtimebattle (1.0.8-10.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Added build-arch and build-indep to debian/rules.
+ * Reduce default-jdk-builddep to default-jdk and use default-java.
+ * Use buildflags.mk from dpkg-dev to set default build flags.
+ - This enables hardning build by default.
+ * Patched team-framework/log/sysloglogdriver.cpp, which was using
+ a non-constant as a format string to syslog.
+
+ -- Niels Thykier <ni...@thykier.net> Tue, 08 Nov 2011 21:25:27 +0100
+
realtimebattle (1.0.8-10) unstable; urgency=low
* Use default-jdk-builddep and default-jre for jBot (Closes: #548811)
only in patch2:
unchanged:
--- realtimebattle-1.0.8.orig/team-framework/log/sysloglogdriver.cpp
+++ realtimebattle-1.0.8/team-framework/log/sysloglogdriver.cpp
@@ -198,7 +198,7 @@
}
}
- syslog(_syslogPriority, message.c_str());
+ syslog(_syslogPriority, "%s", message.c_str());
}
map<string, string> SyslogLogDriver::parseParameterString(const string& parameters) throw
