summaryrefslogtreecommitdiff
diff options
authorEmmanuel Bourg <ebourg@apache.org>2013-07-25 00:53:19 +0200
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2013-07-25 04:14:46 +0000
commit1afcfd471776c238bac1a549164b0ddeacad6291 (patch)
tree37c423716558005eb22021ae240271a26148229f
parentd6ce13308985f577eb52df7ac0ba023a37ae3126 (diff)
Imported using git-ubuntu import.
Notes
Notes: * Upload to unstable * Use canonical URLs for the Vcs-* fields * debian/rules: Improved the clean target * Enabled the hardening for libxerces2-java-gcj
-rw-r--r--debian/changelog9
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules7
3 files changed, 18 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 23d720b..a34351c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxerces2-java (2.11.0-7) unstable; urgency=low
+
+ * Upload to unstable
+ * Use canonical URLs for the Vcs-* fields
+ * debian/rules: Improved the clean target
+ * Enabled the hardening for libxerces2-java-gcj
+
+ -- Emmanuel Bourg <ebourg@apache.org> Thu, 25 Jul 2013 00:53:19 +0200
+
libxerces2-java (2.11.0-7~exp1) experimental; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index 1ddcd61..0013b28 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), default-jdk, gcj-native-helper
maven-repo-helper, javahelper, libxml-commons-resolver1.1-java, libstylebook-java,
libxml-commons-external-java (>= 1.4.01-2)
Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxerces2-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxerces2-java
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libxerces2-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java
Homepage: http://xerces.apache.org/xerces2-j/
Package: libxerces2-java
diff --git a/debian/rules b/debian/rules
index e434505..43f3f9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,12 @@ JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
ANT_OPTS = -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Djavac.source=1.4 -Djavac.target=1.4
+# hardening
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export AOT_GCJFLAGS=$(CFLAGS)
+export AOT_LDFLAGS=$(LDFLAGS)
+
include /usr/share/gcj/debian_defaults
ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
with_gcj_native := yes
@@ -34,6 +40,7 @@ endif
clean::
rm -rf build
-rm -rf debian/tmp
+ mh_clean
binary-post-install/libxerces2-java-doc::
dh_install -plibxerces2-java-doc build/docs/javadocs/* \