diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2018-11-25 22:22:29 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2018-11-25 22:23:11 -0500 |
| commit | 3ca7fe142e5afc290eb3c1a6e9a01d48de3e6cbf (patch) | |
| tree | dd72d9ef25384227b1a7b06f68787102836a6301 /contrib | |
| parent | 812da460cfbd147a7fe0e8b480d1bd5c43f41661 (diff) | |
| download | tigervnc-3ca7fe142e5afc290eb3c1a6e9a01d48de3e6cbf.tar.gz tigervnc-3ca7fe142e5afc290eb3c1a6e9a01d48de3e6cbf.zip | |
Remove Java viewer from debian packages (4a4453f broke nightly builds)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/packages/deb/ubuntu-trusty/debian/rules | 6 | ||||
| -rw-r--r-- | contrib/packages/deb/ubuntu-xenial/debian/rules | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules index 81f4f89d..ea9f1437 100755 --- 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 531a1c44..60af69a6 100644 --- 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-*/* \ |