Remove Java viewer from debian packages (4a4453f broke nightly builds)

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index 81f4f89d1907f7101a8813d264c9fae1aaab90f2..ea9f1437bcaad929f1cc548b5a2a479d4b4fe865 100755 (executable)
--- a/contrib/packages/deb/ubuntu-trusty/debian/rules
+++ b/contrib/packages/deb/ubuntu-trusty/debian/rules
@@ -151,7 +151,7 @@ build-indep-stamp:
        #  anything for this package.
        #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
        (cd media;make)
-       (cd java;cmake -G"Unix Makefiles";make)
+       #(cd java;cmake -G"Unix Makefiles";make)
 
        touch build-indep-stamp
 
@@ -213,8 +213,8 @@ install: build
        mv $(CURDIR)/debian/xtigervncviewer/usr/share/man/man1/vncviewer.1 \
                $(CURDIR)/debian/xtigervncviewer/usr/share/man/man1/xtigervncviewer.1
        # tigervnc-java
-       mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share
-       (cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share)
+       #mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share
+       #(cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share)
        #dh_movefiles
 
 # Build architecture-independent files here.

diff --git a/contrib/packages/deb/ubuntu-xenial/debian/rules b/contrib/packages/deb/ubuntu-xenial/debian/rules
index 531a1c44827ed8f69c22bac714435587f7ed748d..60af69a68e0bda8ae2c1d6251b4d2a777991603b 100644 (file)
--- a/contrib/packages/deb/ubuntu-xenial/debian/rules
+++ b/contrib/packages/deb/ubuntu-xenial/debian/rules
@@ -138,7 +138,7 @@ build-indep-stamp:
        #  anything for this package.
        #/usr/bin/docbook-to-man debian/vnc.sgml > vnc.1
        (cd media;make)
-       (cd java;cmake -G"Unix Makefiles";make)
+       #(cd java;cmake -G"Unix Makefiles";make)
 
        touch build-indep-stamp
 
@@ -204,14 +204,14 @@ install: build
        mv $(CURDIR)/debian/tigervncserver/usr/share/icons \
                $(CURDIR)/debian/xtigervncviewer/usr/share/
        # tigervnc-java
-       mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share
-       (cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share)
+       #mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share
+       #(cd java; make install DESTDIR=$(CURDIR)/debian/tigervnc-java/usr/share)
        # install additional license files
        mkdir -p $(CURDIR)/debian/xtigervncviewer/usr/share/doc/xtigervncviewer
        cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \
                $(CURDIR)/debian/xtigervncviewer/usr/share/doc/xtigervncviewer/
-       mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java
-       cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \
+       #mkdir -p $(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java
+       #cp $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \
                $(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java/
        mkdir -p $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver
        mv $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervnc-*/* \