diff options
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 | 12 | ||||
| -rw-r--r-- | contrib/packages/rpm/el7/SPECS/tigervnc.spec | 11 |
3 files changed, 16 insertions, 13 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..7509e7b4 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,15 +204,15 @@ 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-*/* \ - $(CURDIR)/debian/tigervnc-java/usr/share/doc/tigervnc-java/ + #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-*/* \ $(CURDIR)/debian/tigervncserver/usr/share/doc/tigervncserver/ diff --git a/contrib/packages/rpm/el7/SPECS/tigervnc.spec b/contrib/packages/rpm/el7/SPECS/tigervnc.spec index 1b8630a6..77db8261 100644 --- a/contrib/packages/rpm/el7/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el7/SPECS/tigervnc.spec @@ -9,8 +9,8 @@ %endif Name: tigervnc -Version: 1.6.80 -Release: 1%{?snap:.%{snap}}%{?dist} +Version: 1.9.80 +Release: 2%{?snap:.%{snap}}%{?dist} Summary: A TigerVNC remote display system Group: User Interface/Desktops @@ -151,7 +151,7 @@ pushd unix/xserver for all in `find . -type f -perm -001`; do chmod -x "$all" done -patch -p1 -b --suffix .vnc < ../xserver119.patch +patch -p1 -b --suffix .vnc < ../xserver120.patch popd # Don't use shebang in vncserver script. @@ -219,7 +219,7 @@ autoreconf -fiv --with-fontdir=%{_datadir}/X11/fonts \ --with-xkb-output=%{_localstatedir}/lib/xkb \ --enable-install-libxf86config \ - --enable-glx --disable-dri --enable-dri2 \ + --enable-glx --disable-dri --enable-dri2 --disable-dri3 \ --disable-wayland \ --disable-present \ --disable-config-dbus \ @@ -354,6 +354,9 @@ fi %endif %changelog +* Sun Nov 26 2018 Brian P. Hinz <bphinz@users.sourceforge.net> 1.9.80-2 +- Bumped Xorg version to 1.2.0 + * Sun Jul 22 2018 Brian P. Hinz <bphinz@users.sourceforge.net> 1.9.80-1 - Updated fltk to latest version |