[libjogl2-java] 26/58: Imported Debian patch 2.0-rc8-2

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libjogl2-java.

commit bfc1800e0f9fe794da9349f294568f8ad1737b28
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sun Mar 3 14:12:38 2013 +0100

    Imported Debian patch 2.0-rc8-2
---
 debian/ant.properties          |  6 ++++++
 debian/changelog               | 12 ++++++++++++
 debian/control                 |  3 ++-
 debian/patches/armv7build.diff | 15 +++++++++++++++
 debian/patches/series          |  1 +
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index d73613e..30d135f 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -52,3 +52,9 @@ antlr.jar=/usr/share/java/antlrall.jar
 
 
 user.properties.file=true 
+
+# Ensure that source and target are 1.6
+# For backwards compat on Java 7
+target.sourcelevel=1.6
+target.targetlevel=1.6
+target.rt.jar=/usr/lib/jvm/default-java/jre/lib/rt.jar
diff --git a/debian/changelog b/debian/changelog
index 4047429..0827fdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libjogl2-java (2.0-rc8-2) unstable; urgency=low
+
+  [ Colin Watson ]
+  * Remove more TARGET_PLATFORM_ROOT variables, this time for armv7.
+  * Set source and target to 1.5 for OpenJDK 6 compatibility (LP: #1049719).
+
+  [ Sylvestre Ledru ]
+  * Sync from Ubuntu to avoid FTBFS (Closes: #692557)
+    Please note that the current efforts are on the rc11.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 03 Mar 2013 14:12:38 +0100
+
 libjogl2-java (2.0-rc8-1) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index 98ee7d9..31843c9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libjogl2-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
  libgluegen2-build-java (>= 2.0-rc8-1~), libgluegen2-rt-java (>= 2.0-rc8-1~),
diff --git a/debian/patches/armv7build.diff b/debian/patches/armv7build.diff
new file mode 100644
index 0000000..4e4f380
--- /dev/null
+++ b/debian/patches/armv7build.diff
@@ -0,0 +1,15 @@
+Index: b/make/build-newt.xml
+===================================================================
+--- a/make/build-newt.xml
++++ b/make/build-newt.xml
+@@ -274,8 +274,8 @@
+       </linker>
+ 
+       <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
+-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
++        <syslibset libs="X11" />
++        <syslibset libs="Xrandr" />
+       </linker>
+ 
+       <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
diff --git a/debian/patches/series b/debian/patches/series
index b97b07b..66dbb9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ TARGET_PLATFORM_LIBS_2.diff
 manifest.diff
 armhfbuild.diff
 s390x.diff
+armv7build.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git