Bug#865117: [pkg-db-devel] Bug#865117: db5.3: GCJ package removal

2017-07-12 Thread Emmanuel Bourg 
Here is a patch, only build tested on amd64, that's the best I can do.
diff --git a/debian/control b/debian/control
index 369594d98..3ff9f1b76 100644
--- a/debian/control
+++ b/debian/control
@@ -6,16 +6,14 @@ Uploaders: Ondrej Surý , Dmitrijs Ledkovs 

 Standards-Version: 3.9.6
 # For cross building one also needs tcl8.4:native (ie. such that it
 # can be executed to pre-process sqlite3 components).
-# For DEB_STAGE=stage1 build tcl-dev, javahelper, default-jdk,
-# gcj-native-helper can be dropped
+# For DEB_STAGE=stage1 build tcl-dev, javahelper, default-jdk can be dropped
 Build-Depends: debhelper (>= 9.20141221~),
   autotools-dev (>= 20100122.1),
   dh-autoreconf,
   tcl-dev,
   procps [!hurd-i386],
   javahelper [!m68k],
-  default-jdk [!m68k],
-  gcj-native-helper [!m68k]
+  default-jdk [!m68k]
 Homepage: 
http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-db/db5.3.git
 Vcs-Git: git://anonscm.debian.org/pkg-db/db5.3.git
@@ -158,25 +156,11 @@ Depends: libdb5.3-java-jni (>= ${source:Version}),
 ${shlibs:Depends},
 ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Suggests: libdb5.3-java-gcj
 Multi-Arch: foreign
 Description: Berkeley v5.3 Database Libraries for Java
  This package provides the Java interface for the Berkeley v5.3 database
  library.

-Package: libdb5.3-java-gcj
-Architecture: any
-Section: java
-Priority: optional
-Depends: libdb5.3-java (= ${source:Version}),
-${shlibs:Depends},
-${misc:Depends}
-Description: Berkeley v5.3 Database Libraries for Java (native code)
- This package provides the Java interface for the Berkeley v5.3 database
- library.
- .
- This package contains the natively compiled code for use by gij.
-
 Package: libdb5.3-java-dev
 Architecture: any
 Section: libdevel
diff --git a/debian/libdb5.3-java-gcj.dirs b/debian/libdb5.3-java-gcj.dirs
deleted file mode 100644
index 38c8e1b77..0
--- a/debian/libdb5.3-java-gcj.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/gcj
-usr/share/gcj
diff --git a/debian/rules b/debian/rules
index b512d2a5c..3cfa59431 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,32 +13,21 @@ export DH_ALWAYS_EXCLUDE=.arch-ids
 include /usr/share/dpkg/architecture.mk

 # Don't try to build this file if missing
-/usr/share/gcj/debian_defaults /usr/share/javahelper/java-vars.mk:
+/usr/share/javahelper/java-vars.mk:
:

--include /usr/share/gcj/debian_defaults
 -include /usr/share/javahelper/java-vars.mk

 JAVA_BROKEN_ARCHS = m68k
-GCJ_BROKEN_ARCHS =
-GCJ_NATIVE_ARCHS = $(filter-out $(GCJ_BROKEN_ARCHS), $(gcj_native_archs))

 ENABLE_JAVA=no
-ENABLE_GCJ=no

 ifeq (,$(filter $(DEB_HOST_ARCH), $(JAVA_BROKEN_ARCHS)))
   ENABLE_JAVA=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHS)))
-  ENABLE_GCJ=yes
-else
-  # work around bug #719842 in javahelper
-  ENABLE_JAVA=no
-endif
 endif

 ifeq ($(DEB_STAGE),stage1)
   ENABLE_JAVA=no
-  ENABLE_GCJ=no
   ENABLE_TCL=no
 else
   ENABLE_TCL=yes
@@ -98,11 +87,7 @@ CONFIGURE_SWITCHES += --enable-java
 DH_PLUGINS += --with=javahelper
 else
 CONFIGURE_SWITCHES += --disable-java
-DH_OPTIONS += -Nlibdb5.3-java -Nlibdb5.3-java-dev -Nlibdb5.3-java-gcj 
-Nlibdb5.3-java-jni
-endif
-
-ifeq (no,$(ENABLE_GCJ))
-DH_OPTIONS += -Nlibdb5.3-java-gcj
+DH_OPTIONS += -Nlibdb5.3-java -Nlibdb5.3-java-dev -Nlibdb5.3-java-jni
 endif

 ifeq (no,$(ENABLE_SQL))
@@ -269,6 +254,3 @@ override_jh_installlibs:
 ifeq (yes,$(ENABLE_JAVA))
jh_installlibs
 endif
-ifeq (yes,$(ENABLE_GCJ))
-   dh_nativejava
-endif

Bug#865117: [pkg-db-devel] Bug#865117: db5.3: GCJ package removal

2017-07-12 Thread Ondřej Surý 
Emmanuel,

would you be willing to provide (tested) patch, please?

Cheers,
-- 
Ondřej Surý 
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server
Knot Resolver (https://www.knot-resolver.cz/) – secure, privacy-aware,
fast DNS(SEC) resolver
Vše pro chleba (https://vseprochleba.cz) – Mouky ze mlýna a potřeby pro
pečení chleba všeho druhu

On Mon, Jun 19, 2017, at 15:00, Emmanuel Bourg wrote:
> Source: db5.3
> Severity: important
> 
> Hi,
> 
> GCJ will go away in Buster with GCC 7, could you please stop building
> the libdb5.3-java-gcj package and remove the build dependency
> on gcj-native-helper?
> 
> Thank you,
> 
> Emmanuel Bourg
> 
> ___
> pkg-db-devel mailing list
> pkg-db-de...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-db-devel