diff -Nru java-gnome-4.1.3/debian/changelog java-gnome-4.1.3/debian/changelog --- java-gnome-4.1.3/debian/changelog 2014-09-10 04:29:30.000000000 +0000 +++ java-gnome-4.1.3/debian/changelog 2015-07-12 02:18:51.000000000 +0000 @@ -1,3 +1,24 @@ +java-gnome (4.1.3-4) unstable; urgency=medium + + * Team upload. + + [ Guillaume Mazoyer ] + * debian/rules + - Set CFLAGS and LDFLAGS variables according to the Debian standards. + - Add -ffunction-sections to CFLAGS for hppa. + - Set V=1 to build in verbose mode so the compiler flags are not hidden. + * Properly use debhelper 9. + + [ tony mancill ] + * Add patch for configure script on ppc64el. (Closes: #767322) + - Note that patch only enables for binary (-B) builds. + * Disable GLIB deprecation warnings during test phase by setting + G_ENABLE_DIAGNOSTIC=0. This was causing build failures. + (Closes: #789851) + * Bump Standards-Version to 3.9.6. + + -- tony mancill Sat, 11 Jul 2015 19:09:25 -0700 + java-gnome (4.1.3-3) unstable; urgency=medium * Team upload. diff -Nru java-gnome-4.1.3/debian/compat java-gnome-4.1.3/debian/compat --- java-gnome-4.1.3/debian/compat 2014-09-10 04:29:30.000000000 +0000 +++ java-gnome-4.1.3/debian/compat 2015-07-12 02:18:51.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru java-gnome-4.1.3/debian/control java-gnome-4.1.3/debian/control --- java-gnome-4.1.3/debian/control 2014-09-10 04:29:30.000000000 +0000 +++ java-gnome-4.1.3/debian/control 2015-07-12 02:18:51.000000000 +0000 @@ -5,7 +5,7 @@ Onkar Shinde , Guillaume Mazoyer Build-Depends: cdbs, - debhelper (>= 9), + debhelper (>= 9~), default-jdk, hicolor-icon-theme, junit, @@ -23,7 +23,7 @@ xvfb, dbus-x11, python -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Section: java Homepage: http://java-gnome.sourceforge.net/ Vcs-Git: git://anonscm.debian.org/pkg-java/java-gnome.git diff -Nru java-gnome-4.1.3/debian/patches/05_ppc64el_configure.patch java-gnome-4.1.3/debian/patches/05_ppc64el_configure.patch --- java-gnome-4.1.3/debian/patches/05_ppc64el_configure.patch 1970-01-01 00:00:00.000000000 +0000 +++ java-gnome-4.1.3/debian/patches/05_ppc64el_configure.patch 2015-07-12 02:18:51.000000000 +0000 @@ -0,0 +1,25 @@ +diff -ruN java-gnome-4.1.3.orig/configure java-gnome-4.1.3/configure +--- java-gnome-4.1.3.orig/configure 2014-10-30 05:46:34.000000000 +0000 ++++ java-gnome-4.1.3/configure 2014-10-30 05:46:54.000000000 +0000 +@@ -359,7 +359,8 @@ + my $item = $_[1]; + my $program = $_[2]; + my $args = $_[3]; +- ++ my $arch; ++ + chomp $program; + if ( ! -f "$program") { + $$scalarref = ""; +@@ -395,6 +396,12 @@ + return + } + ++ $arch = `uname -m 2>/dev/null`; ++ chomp $arch; ++ if($arch eq "ppc64le") { ++ $args =~ s/-client //; ++ } ++ + $output = `$program $args Hello 2>/dev/null`; + chomp $output; diff -Nru java-gnome-4.1.3/debian/patches/series java-gnome-4.1.3/debian/patches/series --- java-gnome-4.1.3/debian/patches/series 2014-09-10 04:29:30.000000000 +0000 +++ java-gnome-4.1.3/debian/patches/series 2015-07-12 02:18:51.000000000 +0000 @@ -2,3 +2,4 @@ 02_build_python.diff 03_build_doc_snapshots.diff 04_translations.patch +05_ppc64el_configure.patch diff -Nru java-gnome-4.1.3/debian/rules java-gnome-4.1.3/debian/rules --- java-gnome-4.1.3/debian/rules 2014-09-10 04:29:30.000000000 +0000 +++ java-gnome-4.1.3/debian/rules 2015-07-12 02:18:51.000000000 +0000 @@ -7,17 +7,20 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +DEB_MAKE_ENVVARS += CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" +DEB_MAKE_ENVVARS += LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" +DEB_MAKE_ENVVARS += V=1 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/jni jdk=/usr/lib/jvm/default-java DEB_ARCH_PACKAGES = libjava-gnome-jni DEB_INDEP_PACKAGES = libjava-gnome-java-doc libjava-gnome-java ifneq (,$(filter $(DEB_HOST_ARCH), i386 amd64 powerpc)) DEB_MAKE_ENVVARS += DISPLAY=":99" +DEB_MAKE_ENVVARS += G_ENABLE_DIAGNOSTIC=0 DEB_MAKE_BUILD_TARGET += doc endif ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) -DEB_MAKE_ENVVARS += V=1 -CFLAGS += -ffunction-sections +DEB_MAKE_ENVVARS += CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -ffunction-sections" endif get-orig-source: