rev 15623 - in krap/libvncserver/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue Aug 11 09:39:19 UTC 2009
Author: fabo
Date: 2009-08-11 09:39:19 +0000 (Tue, 11 Aug 2009)
New Revision: 15623
Added:
krap/libvncserver/trunk/debian/libvncserver0.docs
krap/libvncserver/trunk/debian/linuxvnc.docs
krap/libvncserver/trunk/debian/not-installed
krap/libvncserver/trunk/debian/patches/03_no_x11vnc_subdir.patch
krap/libvncserver/trunk/debian/patches/04_rename_linuxvnc.patch
krap/libvncserver/trunk/debian/patches/series
Removed:
krap/libvncserver/trunk/debian/x11vnc.install
Modified:
krap/libvncserver/trunk/debian/changelog
krap/libvncserver/trunk/debian/compat
krap/libvncserver/trunk/debian/control
krap/libvncserver/trunk/debian/copyright
krap/libvncserver/trunk/debian/libvncserver-dev.install
krap/libvncserver/trunk/debian/libvncserver0.install
krap/libvncserver/trunk/debian/linuxvnc.install
krap/libvncserver/trunk/debian/patches/01_ignore_classes.patch
krap/libvncserver/trunk/debian/patches/02_linux_test.patch
krap/libvncserver/trunk/debian/rules
Log:
Update package to my latest upload
Modified: krap/libvncserver/trunk/debian/changelog
===================================================================
--- krap/libvncserver/trunk/debian/changelog 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/changelog 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,3 +1,36 @@
+libvncserver (0.9.7-1) unstable; urgency=low
+
+ * QA upload.
+ * New upstream release (Closes: #529010):
+ - x11vnc is removed upstream from libvncserver sources.
+ Now, it is released separately.
+ * Added patches:
+ - 03_no_x11vnc_subdir.patch
+ Remove x11vnc remaining occurrences from the build system.
+ - 04_rename_linuxvnc.patch
+ Rename LinuxVNC to linuxvnc.
+ * Bumped debian/compat from 5 to 7.
+ * Updated debian/control:
+ - Cleanuped build dependencies.
+ - Switched to quilt patch system.
+ - Added Homepage field.
+ - Added libjpeg62-dev and zlib1g-dev dependencies to libvncserver-dev.
+ (Closes: #515029)
+ - Added priority extra and section debug to libvncserver0-dbg.
+ - Removed x11vnc package.
+ * Added debian/not-installed:
+ - *.la files are not installed anymore in libvncserver-dev.
+ * Switched debian/rules from cdbs to dh usage.
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 07 Aug 2009 15:45:36 +0200
+
+libvncserver (0.9.3.dfsg.1-2) unstable; urgency=low
+
+ * QA upload.
+ * Drop useless build-depends on linux-libc-dev.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 13 May 2009 20:11:07 +0200
+
libvncserver (0.9.3.dfsg.1-1) unstable; urgency=low
* QA upload.
@@ -92,4 +125,3 @@
* Integrated the last release of x11vnc.
-- Ludovic Drolez <ldrolez at debian.org> Wed, 10 Mar 2004 23:42:26 +0100
-
Modified: krap/libvncserver/trunk/debian/compat
===================================================================
--- krap/libvncserver/trunk/debian/compat 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/compat 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1 +1 @@
-5
+7
Modified: krap/libvncserver/trunk/debian/control
===================================================================
--- krap/libvncserver/trunk/debian/control 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/control 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,14 +1,30 @@
Source: libvncserver
-Section: libs
Priority: optional
Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: autoconf, automake, autotools-dev, cdbs, debhelper (>= 5.0.0), patchutils, libtool, linux-libc-dev, libavahi-client-dev, libjpeg62-dev, libssl-dev, libx11-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxinerama-dev, libxrandr-dev, libxtst-dev, xutils-dev, zlib1g-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.3), quilt, automake, libtool,
+ libjpeg62-dev, zlib1g-dev
+Standards-Version: 3.8.2
+Section: libs
+Homepage: http://libvncserver.sourceforge.net
+Package: libvncserver-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libvncserver0 (= ${binary:Version}),
+ libjpeg62-dev, zlib1g-dev
+Description: API to write one's own vnc server - development files
+ LibVNCServer makes writing a VNC server (or more correctly, a program
+ exporting a framebuffer via the Remote Frame Buffer protocol) easy. It hides
+ the programmer from the tedious task of managing clients
+ and compression schemata.
+ .
+ This is the development package which contains headers and static libraries
+ for libvncserver.
+
Package: libvncserver0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: libvncserver0-dbg (= ${binary:Version})
Description: API to write one's own vnc server
LibVNCServer makes writing a VNC server (or more correctly, a program
@@ -17,9 +33,10 @@
and compression schemata.
Package: libvncserver0-dbg
-Section: libdevel
+Priority: extra
+Section: debug
Architecture: any
-Depends: ${shlibs:Depends}, libvncserver0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libvncserver0 (= ${binary:Version})
Description: debugging symbols for libvncserver
LibVNCServer makes writing a VNC server (or more correctly, a program
exporting a framebuffer via the Remote Frame Buffer protocol) easy. It hides
@@ -28,19 +45,6 @@
.
This package contains the debugging symbols for libvncserver.
-Package: libvncserver-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, libvncserver0 (= ${binary:Version})
-Description: API to write one's own vnc server - development files
- LibVNCServer makes writing a VNC server (or more correctly, a program
- exporting a framebuffer via the Remote Frame Buffer protocol) easy. It hides
- the programmer from the tedious task of managing clients
- and compression schemata.
- .
- This is the development package which contains headers and static libraries
- for libvncserver.
-
Package: linuxvnc
Section: net
Architecture: linux-any
@@ -49,14 +53,3 @@
linuxvnc can export your currently running text sessions to any VNC client.
It can be useful if you want to move to another computer without having to
log out or to help a distant colleague solve a problem.
-
-Package: x11vnc
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: VNC server to allow remote access to an existing X session
- x11vnc allows one to view remotely and interact with real X displays (i.e. a
- display corresponding to a physical monitor, keyboard, and mouse) with any
- VNC viewer. It has built-in SSL encryption and authentication, UNIX account
- and password support, server-side scaling, single port HTTPS and VNC, mDNS
- service advertising, and TightVNC and UltraVNC file-transfer.
Modified: krap/libvncserver/trunk/debian/copyright
===================================================================
--- krap/libvncserver/trunk/debian/copyright 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/copyright 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,35 +1,44 @@
-This package was debianized by Matthew Rosewarne <mrosewarne at inoutbox.com> on
-Sun, 04 Nov 2007 19:28:19 -0500.
-Previous packaging made by Ludovic Drolez <ldrolez at debian.org> on
-Wed, 10 Mar 2004 23:42:26 +0100.
+This package was debianized by:
-It was downloaded from http://libvncserver.sourceforge.net/
+ Fathi Boudra <fabo at debian.org> on Fri, 07 Aug 2009 15:45:36 +0200
-Upstream Authors:
+Previous packaging made by:
+ Matthew Rosewarne <mrosewarne at inoutbox.com> on Sun, 04 Nov 2007 19:28:19 -0500
+ Ludovic Drolez <ldrolez at debian.org> on Wed, 10 Mar 2004 23:42:26 +0100
+
+It was downloaded from:
+
+ http://libvncserver.sourceforge.net
+
+Upstream Authors:
+
Johannes Schindelin <dscho at users.sourceforge.net>
Mark McLoughlin <mark at skynet.ie>
Rohit Kumar <rokumar at novell.com>
Karl J. Runge <runge at karlrunge.com>
Steven Carr <scarr at jsa-usa.com>
-Copyright:
+Copyright for LibVNCServer:
- LibVNCServer (C) 2001 Johannes E. Schindelin
- X11vnc Copyright (c) 2002-2003 Karl J. Runge <runge at karlrunge.com>
+ Copyright (C) 2001 Johannes E. Schindelin
+Copyright for X11vnc:
+
+ Copyright (C) 2002-2003 Karl J. Runge <runge at karlrunge.com>
+
License:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -37,6 +46,11 @@
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is (C) 2007, Matthew Rosewarne <mrosewarne at inoutbox.com>
-and is licensed under the GPL, see above.
+The Debian packaging is:
+ Copyright (C) 2009 Fathi Boudra <fabo at debian.org>
+ Copyright (C) 2007 Matthew Rosewarne <mrosewarne at inoutbox.com>
+ Copyright (C) 2004-2007 Ludovic Drolez <ldrolez at debian.org>
+
+and is licensed under the GPL version 2,
+see `/usr/share/common-licenses/GPL-2'.
Modified: krap/libvncserver/trunk/debian/libvncserver-dev.install
===================================================================
--- krap/libvncserver/trunk/debian/libvncserver-dev.install 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/libvncserver-dev.install 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,5 +1,6 @@
usr/bin/libvncserver-config
usr/include/rfb
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/*.so
+usr/lib/libvncclient.a
+usr/lib/libvncclient.so
+usr/lib/libvncserver.a
+usr/lib/libvncserver.so
Added: krap/libvncserver/trunk/debian/libvncserver0.docs
===================================================================
--- krap/libvncserver/trunk/debian/libvncserver0.docs (rev 0)
+++ krap/libvncserver/trunk/debian/libvncserver0.docs 2009-08-11 09:39:19 UTC (rev 15623)
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
Modified: krap/libvncserver/trunk/debian/libvncserver0.install
===================================================================
--- krap/libvncserver/trunk/debian/libvncserver0.install 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/libvncserver0.install 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,3 +1,2 @@
usr/lib/libvncclient.so.*
usr/lib/libvncserver.so.*
-
Added: krap/libvncserver/trunk/debian/linuxvnc.docs
===================================================================
--- krap/libvncserver/trunk/debian/linuxvnc.docs (rev 0)
+++ krap/libvncserver/trunk/debian/linuxvnc.docs 2009-08-11 09:39:19 UTC (rev 15623)
@@ -0,0 +1,3 @@
+vncterm/ChangeLog
+vncterm/README
+vncterm/TODO
Modified: krap/libvncserver/trunk/debian/linuxvnc.install
===================================================================
--- krap/libvncserver/trunk/debian/linuxvnc.install 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/linuxvnc.install 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1 +1 @@
-usr/bin/LinuxVNC
+usr/bin/linuxvnc
Added: krap/libvncserver/trunk/debian/not-installed
===================================================================
--- krap/libvncserver/trunk/debian/not-installed (rev 0)
+++ krap/libvncserver/trunk/debian/not-installed 2009-08-11 09:39:19 UTC (rev 15623)
@@ -0,0 +1,2 @@
+./usr/lib/libvncclient.la
+./usr/lib/libvncserver.la
Modified: krap/libvncserver/trunk/debian/patches/01_ignore_classes.patch
===================================================================
--- krap/libvncserver/trunk/debian/patches/01_ignore_classes.patch 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/patches/01_ignore_classes.patch 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,7 +1,6 @@
-diff -Nur libvncserver-0.9.3/configure.ac libvncserver-0.9.3.new/configure.ac
---- libvncserver-0.9.3/configure.ac 2007-11-15 01:26:29.569174000 -0500
-+++ libvncserver-0.9.3.new/configure.ac 2007-11-16 01:34:45.345565229 -0500
-@@ -711,8 +711,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -751,8 +751,6 @@ AC_CONFIG_FILES([Makefile
contrib/Makefile
examples/Makefile
vncterm/Makefile
@@ -10,15 +9,15 @@
libvncclient/Makefile
client_examples/Makefile
test/Makefile
-diff -Nur libvncserver-0.9.3/Makefile.am libvncserver-0.9.3.new/Makefile.am
---- libvncserver-0.9.3/Makefile.am 2007-11-15 01:26:29.569174000 -0500
-+++ libvncserver-0.9.3.new/Makefile.am 2007-11-16 01:34:45.345565229 -0500
-@@ -1,7 +1,7 @@
- CFLAGS=-g -Wall
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,8 +4,8 @@ if WITH_X11VNC
+ X11VNC=x11vnc
+ endif
--SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test
+-SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC)
-DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test
-+SUBDIRS=libvncserver examples contrib libvncclient vncterm client_examples test
++SUBDIRS=libvncserver examples contrib libvncclient vncterm client_examples test $(X11VNC)
+DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm client_examples test
bin_SCRIPTS = libvncserver-config
Modified: krap/libvncserver/trunk/debian/patches/02_linux_test.patch
===================================================================
--- krap/libvncserver/trunk/debian/patches/02_linux_test.patch 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/patches/02_linux_test.patch 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,7 +1,6 @@
-diff -Nur libvncserver-0.9.3/configure.ac libvncserver-0.9.3.new/configure.ac
---- libvncserver-0.9.3/configure.ac 2007-11-16 01:35:42.347400528 -0500
-+++ libvncserver-0.9.3.new/configure.ac 2007-11-16 01:35:48.347593652 -0500
-@@ -679,8 +679,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -718,8 +718,8 @@ fi
AC_CHECK_LIB(cygipc,shmget)
AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true")
Added: krap/libvncserver/trunk/debian/patches/03_no_x11vnc_subdir.patch
===================================================================
--- krap/libvncserver/trunk/debian/patches/03_no_x11vnc_subdir.patch (rev 0)
+++ krap/libvncserver/trunk/debian/patches/03_no_x11vnc_subdir.patch 2009-08-11 09:39:19 UTC (rev 15623)
@@ -0,0 +1,430 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,10 +1,6 @@
+ CFLAGS=-g -Wall
+
+-if WITH_X11VNC
+-X11VNC=x11vnc
+-endif
+-
+-SUBDIRS=libvncserver examples contrib libvncclient vncterm client_examples test $(X11VNC)
++SUBDIRS=libvncserver examples contrib libvncclient vncterm client_examples test
+ DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm client_examples test
+
+ bin_SCRIPTS = libvncserver-config
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,367 +66,17 @@ else
+ build_x11vnc="no"
+ fi
+
+-# x11vnc only:
+-if test "$build_x11vnc" = "yes"; then
+-
+-AH_TEMPLATE(HAVE_XSHM, [MIT-SHM extension build environment present])
+-AH_TEMPLATE(HAVE_XTEST, [XTEST extension build environment present])
+-AH_TEMPLATE(HAVE_XTESTGRABCONTROL, [XTEST extension has XTestGrabControl])
+-AH_TEMPLATE(HAVE_XKEYBOARD, [XKEYBOARD extension build environment present])
+-AH_TEMPLATE(HAVE_LIBXINERAMA, [XINERAMA extension build environment present])
+-AH_TEMPLATE(HAVE_LIBXRANDR, [XRANDR extension build environment present])
+-AH_TEMPLATE(HAVE_LIBXFIXES, [XFIXES extension build environment present])
+-AH_TEMPLATE(HAVE_LIBXDAMAGE, [XDAMAGE extension build environment present])
+-AH_TEMPLATE(HAVE_LIBXTRAP, [DEC-XTRAP extension build environment present])
+-AH_TEMPLATE(HAVE_RECORD, [RECORD extension build environment present])
+-AH_TEMPLATE(HAVE_SOLARIS_XREADSCREEN, [Solaris XReadScreen available])
+-AH_TEMPLATE(HAVE_IRIX_XREADDISPLAY, [IRIX XReadDisplay available])
+-AH_TEMPLATE(HAVE_FBPM, [FBPM extension build environment present])
+-AH_TEMPLATE(HAVE_DPMS, [DPMS extension build environment present])
+-AH_TEMPLATE(HAVE_LINUX_VIDEODEV_H, [video4linux build environment present])
+-AH_TEMPLATE(HAVE_LINUX_FB_H, [linux fb device build environment present])
+-AH_TEMPLATE(HAVE_LINUX_INPUT_H, [linux/input.h present])
+-AH_TEMPLATE(HAVE_LINUX_UINPUT_H, [linux uinput device build environment present])
+-AH_TEMPLATE(HAVE_MACOSX_NATIVE_DISPLAY, [build MacOS X native display support])
+-
+-AC_ARG_WITH(xkeyboard,
+-[ --without-xkeyboard disable xkeyboard extension support],,)
+-AC_ARG_WITH(xinerama,
+-[ --without-xinerama disable xinerama extension support],,)
+-AC_ARG_WITH(xrandr,
+-[ --without-xrandr disable xrandr extension support],,)
+-AC_ARG_WITH(xfixes,
+-[ --without-xfixes disable xfixes extension support],,)
+-AC_ARG_WITH(xdamage,
+-[ --without-xdamage disable xdamage extension support],,)
+-AC_ARG_WITH(xtrap,
+-[ --without-xtrap disable xtrap extension support],,)
+-AC_ARG_WITH(xrecord,
+-[ --without-xrecord disable xrecord extension support],,)
+-AC_ARG_WITH(fbpm,
+-[ --without-fbpm disable fbpm extension support],,)
+-AC_ARG_WITH(dpms,
+-[ --without-dpms disable dpms extension support],,)
+-AC_ARG_WITH(v4l,
+-[ --without-v4l disable video4linux support],,)
+-AC_ARG_WITH(fbdev,
+-[ --without-fbdev disable linux fb device support],,)
+-AC_ARG_WITH(uinput,
+-[ --without-uinput disable linux uinput device support],,)
+-AC_ARG_WITH(macosx-native,
+-[ --without-macosx-native disable MacOS X native display support],,)
+-
+-fi
+-# end x11vnc only.
+-
+ if test "x$with_x" = "xno"; then
+ HAVE_X="false"
+ elif test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
+ AC_CHECK_LIB(X11, XGetImage, [AC_DEFINE(HAVE_X11) HAVE_X="true"],
+ HAVE_X="false",
+ $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+-
+- # x11vnc only:
+- if test $HAVE_X = "true" -a "$build_x11vnc" = "yes"; then
+- X_PRELIBS="$X_PRELIBS -lXext"
+-
+- AC_CHECK_LIB(Xext, XShmGetImage,
+- [AC_DEFINE(HAVE_XSHM)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+-
+- AC_CHECK_LIB(Xext, XReadScreen,
+- [AC_DEFINE(HAVE_SOLARIS_XREADSCREEN)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+-
+- AC_CHECK_HEADER(X11/extensions/readdisplay.h,
+- [AC_DEFINE(HAVE_IRIX_XREADDISPLAY)], ,
+- [#include <X11/Xlib.h>])
+-
+- if test "x$with_fbpm" != "xno"; then
+- AC_CHECK_LIB(Xext, FBPMForceLevel,
+- [AC_DEFINE(HAVE_FBPM)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- if test "x$with_dpms" != "xno"; then
+- AC_CHECK_LIB(Xext, DPMSForceLevel,
+- [AC_DEFINE(HAVE_DPMS)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- AC_CHECK_LIB(Xtst, XTestGrabControl,
+- X_PRELIBS="-lXtst $X_PRELIBS"
+- [AC_DEFINE(HAVE_XTESTGRABCONTROL) HAVE_XTESTGRABCONTROL="true"], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+-
+- AC_CHECK_LIB(Xtst, XTestFakeKeyEvent,
+- X_PRELIBS="-lXtst $X_PRELIBS"
+- [AC_DEFINE(HAVE_XTEST) HAVE_XTEST="true"], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+-
+- if test "x$with_xrecord" != "xno"; then
+- AC_CHECK_LIB(Xtst, XRecordEnableContextAsync,
+- X_PRELIBS="-lXtst $X_PRELIBS"
+- [AC_DEFINE(HAVE_RECORD)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- # we use XTRAP on X11R5, or user can set X11VNC_USE_XTRAP
+- if test "x$with_xtrap" != "xno"; then
+- if test ! -z "$X11VNC_USE_XTRAP" -o -z "$HAVE_XTESTGRABCONTROL"; then
+- AC_CHECK_LIB(XTrap, XETrapSetGrabServer,
+- X_PRELIBS="$X_PRELIBS -lXTrap"
+- [AC_DEFINE(HAVE_LIBXTRAP)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- # tru64 uses libXETrap.so
+- AC_CHECK_LIB(XETrap, XETrapSetGrabServer,
+- X_PRELIBS="$X_PRELIBS -lXETrap"
+- [AC_DEFINE(HAVE_LIBXTRAP)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+- fi
+-
+- if test "x$with_xkeyboard" != "xno"; then
+- saved_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+- AC_CHECK_HEADER(X11/XKBlib.h, HAVE_XKBLIB_H="true",
+- HAVE_XKBLIB_H="false", [#include <X11/Xlib.h>])
+- CPPFLAGS="$saved_CPPFLAGS"
+- if test $HAVE_XKBLIB_H = "true"; then
+- AC_CHECK_LIB(X11, XkbSelectEvents,
+- [AC_DEFINE(HAVE_XKEYBOARD)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+- fi
+-
+- if test "x$with_xinerama" != "xno"; then
+- AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
+- X_PRELIBS="$X_PRELIBS -lXinerama"
+- [AC_DEFINE(HAVE_LIBXINERAMA)], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- if test "x$with_xrandr" != "xno"; then
+- AC_CHECK_LIB(Xrandr, XRRSelectInput,
+- X_PRELIBS="$X_PRELIBS -lXrandr"
+- [AC_DEFINE(HAVE_LIBXRANDR) HAVE_LIBXRANDR="true"], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- if test "x$with_xfixes" != "xno"; then
+- AC_CHECK_LIB(Xfixes, XFixesGetCursorImage,
+- X_PRELIBS="$X_PRELIBS -lXfixes"
+- [AC_DEFINE(HAVE_LIBXFIXES) HAVE_LIBXFIXES="true"], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- if test "x$with_xdamage" != "xno"; then
+- AC_CHECK_LIB(Xdamage, XDamageQueryExtension,
+- X_PRELIBS="$X_PRELIBS -lXdamage"
+- [AC_DEFINE(HAVE_LIBXDAMAGE) HAVE_LIBXDAMAGE="true"], ,
+- $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
+- fi
+-
+- if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
+- # need /usr/sfw/lib in RPATH for Solaris 10 and later
+- case `(uname -sr) 2>/dev/null` in
+- "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
+- esac
+- fi
+- if test ! -z "$HAVE_LIBXRANDR"; then
+- # also need /usr/X11/include for Solaris 10 10/08 and later
+- case `(uname -sr) 2>/dev/null` in
+- "SunOS 5"*) CPPFLAGS="$CPPFLAGS -I/usr/X11/include" ;;
+- esac
+- fi
+-
+- X_LIBS="$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS"
+- fi
+- # end x11vnc only.
+ fi
+
+ AC_SUBST(X_LIBS)
+ AM_CONDITIONAL(HAVE_X, test $HAVE_X != "false")
+
+-# x11vnc only:
+-if test "$build_x11vnc" = "yes"; then
+-
+-if test "x$HAVE_X" = "xfalse" -a "x$with_x" != "xno"; then
+- AC_MSG_ERROR([
+-==========================================================================
+-*** A working X window system build environment is required to build ***
+-x11vnc. Make sure any required X development packages are installed.
+-If they are installed in non-standard locations, one can use the
+---x-includes=DIR and --x-libraries=DIR configure options or set the
+-CPPFLAGS and LDFLAGS environment variables to indicate where the X
+-window system header files and libraries may be found. On 64+32 bit
+-machines you may need to point to lib64 or lib32 directories to pick up
+-the correct word size.
+-
+-If you want to build x11vnc without X support (e.g. for -rawfb use only
+-or for native Mac OS X), specify the --without-x configure option.
+-==========================================================================
+-])
+-fi
+-
+-if test "x$HAVE_X" = "xtrue" -a "x$HAVE_XTEST" != "xtrue"; then
+- AC_MSG_WARN([
+-==========================================================================
+-*** A working build environment for the XTEST extension was not found ***
+-(libXtst). An x11vnc built this way will be *ONLY BARELY USABLE*.
+-You will be able to move the mouse but not click or type. There can
+-also be deadlocks if an application grabs the X server.
+-
+-It is recommended that you install the necessary development packages
+-for XTEST (perhaps it is named something like libxtst-dev) and run
+-configure again.
+-==========================================================================
+-])
+- sleep 5
+-fi
+-
+-# set some ld -R nonsense
+-#
+-uname_s=`(uname -s) 2>/dev/null`
+-ld_minus_R="yes"
+-if test "x$uname_s" = "xHP-UX"; then
+- ld_minus_R="no"
+-elif test "x$uname_s" = "xOSF1"; then
+- ld_minus_R="no"
+-elif test "x$uname_s" = "xDarwin"; then
+- ld_minus_R="no"
+-fi
+-
+-
+-AH_TEMPLATE(HAVE_LIBCRYPT, [libcrypt library present])
+-AC_ARG_WITH(crypt,
+-[ --without-crypt disable support for libcrypt],,)
+-if test "x$with_crypt" != "xno"; then
+- AC_CHECK_FUNCS([crypt], HAVE_LIBC_CRYPT="true")
+- if test -z "$HAVE_LIBC_CRYPT"; then
+- AC_CHECK_LIB(crypt, crypt,
+- CRYPT_LIBS="-lcrypt"
+- [AC_DEFINE(HAVE_LIBCRYPT)], ,)
+- fi
+-fi
+-AC_SUBST(CRYPT_LIBS)
+-
+-# some OS's need both -lssl and -lcrypto on link line:
+-AH_TEMPLATE(HAVE_LIBCRYPTO, [openssl libcrypto library present])
+-AC_ARG_WITH(crypto,
+-[ --without-crypto disable support for openssl libcrypto],,)
+-
+-AH_TEMPLATE(HAVE_LIBSSL, [openssl libssl library present])
+-AC_ARG_WITH(ssl,
+-[ --without-ssl disable support for openssl libssl]
+-[ --with-ssl=DIR use openssl include/library files in DIR],,)
+-
+-if test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno"; then
+- if test ! -z "$with_ssl" -a "x$with_ssl" != "xyes"; then
+- saved_CPPFLAGS="$CPPFLAGS"
+- saved_LDFLAGS="$LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
+- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
+- if test "x$ld_minus_R" = "xno"; then
+- :
+- elif test "x$GCC" = "xyes"; then
+- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+- else
+- LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+- fi
+- fi
+- AC_CHECK_LIB(crypto, RAND_file_name,
+- [AC_DEFINE(HAVE_LIBCRYPTO) HAVE_LIBCRYPTO="true"], ,)
+- if test ! -z "$with_ssl" -a "x$with_ssl" != "xyes"; then
+- if test "x$HAVE_LIBCRYPTO" != "xtrue"; then
+- CPPFLAGS="$saved_CPPFLAGS"
+- LDFLAGS="$saved_LDFLAGS"
+- fi
+- fi
+-fi
+-
+-AH_TEMPLATE(HAVE_X509_PRINT_EX_FP, [open ssl X509_print_ex_fp available])
+-if test "x$with_ssl" != "xno"; then
+- if test "x$HAVE_LIBCRYPTO" = "xtrue"; then
+- AC_CHECK_LIB(ssl, SSL_library_init,
+- SSL_LIBS="-lssl -lcrypto"
+- [AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,
+- -lcrypto)
+- else
+- AC_CHECK_LIB(ssl, SSL_library_init,
+- SSL_LIBS="-lssl"
+- [AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,)
+- fi
+-fi
+-AC_SUBST(SSL_LIBS)
+-
+- if test "x$HAVE_LIBSSL" != "xtrue" -a "x$with_ssl" != "xno"; then
+- AC_MSG_WARN([
+-==========================================================================
+-*** The openssl encryption library libssl.so was not found. ***
+-An x11vnc built this way will not support SSL encryption. To enable
+-SSL install the necessary development packages (perhaps it is named
+-something like libssl-dev) and run configure again.
+-==========================================================================
+-])
+- sleep 5
+- elif test "x$with_ssl" != "xno"; then
+- AC_CHECK_LIB(ssl, X509_print_ex_fp,
+- [AC_DEFINE(HAVE_X509_PRINT_EX_FP) HAVE_X509_PRINT_EX_FP="true"], , $SSL_LIBS
+- )
+- fi
+-
+-if test "x$with_v4l" != "xno"; then
+- AC_CHECK_HEADER(linux/videodev.h,
+- [AC_DEFINE(HAVE_LINUX_VIDEODEV_H)],,)
+-fi
+-if test "x$with_fbdev" != "xno"; then
+- AC_CHECK_HEADER(linux/fb.h,
+- [AC_DEFINE(HAVE_LINUX_FB_H)],,)
+-fi
+-if test "x$with_uinput" != "xno"; then
+- AC_CHECK_HEADER(linux/input.h,
+- [AC_DEFINE(HAVE_LINUX_INPUT_H) HAVE_LINUX_INPUT_H="true"],,)
+- if test "x$HAVE_LINUX_INPUT_H" = "xtrue"; then
+- AC_CHECK_HEADER(linux/uinput.h,
+- [AC_DEFINE(HAVE_LINUX_UINPUT_H)],, [#include <linux/input.h>])
+- fi
+-fi
+-
+-if test "x$with_macosx_native" != "xno"; then
+- AC_DEFINE(HAVE_MACOSX_NATIVE_DISPLAY)
+-fi
+-
+-AH_TEMPLATE(HAVE_AVAHI, [Avahi/mDNS client build environment present])
+-AC_ARG_WITH(avahi,
+-[ --without-avahi disable support for Avahi/mDNS]
+-[ --with-avahi=DIR use avahi include/library files in DIR],,)
+-if test "x$with_avahi" != "xno"; then
+- printf "checking for avahi... "
+- if test ! -z "$with_avahi" -a "x$with_avahi" != "xyes"; then
+- AVAHI_CFLAGS="-I$with_avahi/include"
+- AVAHI_LIBS="-L$with_avahi/lib -lavahi-common -lavahi-client"
+- echo "using $with_avahi"
+- with_avahi=yes
+- elif pkg-config --atleast-version=0.6.4 avahi-client >/dev/null 2>&1; then
+- AVAHI_CFLAGS=`pkg-config --cflags avahi-client`
+- AVAHI_LIBS=`pkg-config --libs avahi-client`
+- with_avahi=yes
+- echo yes
+- else
+- with_avahi=no
+- echo no
+- fi
+-fi
+-if test "x$with_avahi" = "xyes"; then
+- AC_DEFINE(HAVE_AVAHI)
+- AC_SUBST(AVAHI_CFLAGS)
+- AC_SUBST(AVAHI_LIBS)
+-fi
+-
+-fi
+-# end x11vnc only.
+-
+ # Checks for libraries.
+
+ if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then
+@@ -662,11 +312,6 @@ AC_SUBST(WSOCKLIB)
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h])
+
+-# x11vnc only:
+-if test "$build_x11vnc" = "yes"; then
+- AC_CHECK_HEADERS([pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h])
+-fi
+-
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
+@@ -709,10 +354,6 @@ if test "x$uname_s" = "xHP-UX"; then
+ fi
+
+ AC_CHECK_FUNCS([ftime gethostbyname gethostname gettimeofday inet_ntoa memmove memset mmap mkfifo select socket strchr strcspn strdup strerror strstr])
+-# x11vnc only:
+-if test "$build_x11vnc" = "yes"; then
+- AC_CHECK_FUNCS([setsid setpgrp getpwuid getpwnam getspnam getuid geteuid setuid setgid seteuid setegid initgroups waitpid setutxent grantpt shmat])
+-fi
+
+ # check, if shmget is in cygipc.a
+ AC_CHECK_LIB(cygipc,shmget)
+@@ -756,22 +397,6 @@ AC_CONFIG_FILES([Makefile
+ test/Makefile
+ libvncserver-config
+ LibVNCServer.spec])
+-#
+-# x11vnc only:
+-#
+-if test "$build_x11vnc" = "yes"; then
+- #
+- # NOTE: if you are using the LibVNCServer-X.Y.Z.tar.gz source
+- # tarball and nevertheless want to run autoconf (i.e. aclocal,
+- # autoheader, automake, autoconf) AGAIN (perhaps you have a
+- # special target system, e.g. embedded) then you will need to
+- # comment out the following 'AC_CONFIG_FILES' line to avoid
+- # automake error messages like:
+- #
+- # configure.ac:690: required file `x11vnc/Makefile.in' not found
+- #
+- AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile])
+-fi
+
+ AC_CONFIG_COMMANDS([chmod-libvncserver-config],[chmod a+x libvncserver-config])
+ AC_OUTPUT
Added: krap/libvncserver/trunk/debian/patches/04_rename_linuxvnc.patch
===================================================================
--- krap/libvncserver/trunk/debian/patches/04_rename_linuxvnc.patch (rev 0)
+++ krap/libvncserver/trunk/debian/patches/04_rename_linuxvnc.patch 2009-08-11 09:39:19 UTC (rev 15623)
@@ -0,0 +1,13 @@
+--- a/vncterm/Makefile.am
++++ b/vncterm/Makefile.am
+@@ -8,8 +8,8 @@ LDADD=../libvncserver/libvncserver.la @W
+ INCLUDES=-I.
+
+ if LINUX
+-bin_PROGRAMS=LinuxVNC
+-LinuxVNC_SOURCES=LinuxVNC.c $(CONSOLE_SRCS)
++bin_PROGRAMS=linuxvnc
++linuxvnc_SOURCES=LinuxVNC.c $(CONSOLE_SRCS)
+ endif
+
+ if ! MINGW
Added: krap/libvncserver/trunk/debian/patches/series
===================================================================
--- krap/libvncserver/trunk/debian/patches/series (rev 0)
+++ krap/libvncserver/trunk/debian/patches/series 2009-08-11 09:39:19 UTC (rev 15623)
@@ -0,0 +1,4 @@
+01_ignore_classes.patch
+02_linux_test.patch
+03_no_x11vnc_subdir.patch
+04_rename_linuxvnc.patch
Modified: krap/libvncserver/trunk/debian/rules
===================================================================
--- krap/libvncserver/trunk/debian/rules 2009-08-11 09:37:12 UTC (rev 15622)
+++ krap/libvncserver/trunk/debian/rules 2009-08-11 09:39:19 UTC (rev 15623)
@@ -1,42 +1,22 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+ dh --with quilt --dbg-package=libvncserver0-dbg $@
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+override_dh_auto_configure:
+ aclocal
+ autoheader
+ automake --add-missing --copy
+ autoconf
+ dh_auto_configure
-# Only install debug symbols for libraries
-DEB_DBG_PACKAGE_libvncserver0 = libvncserver0-dbg
-
-# Use included autotools+configure script
-# !!! Replace this hack with DEB_AUTO_UPDATE_* if CDBS gets support for automake args !!!
-DEB_CONFIGURE_SCRIPT = $(CURDIR)/$(DEB_SRCDIR)/autogen.sh
-DEB_CONFIGURE_EXTRA_FLAGS = --with-x11vnc
-
-# clean up x11vnc & autotools mess
-clean::
- +-$(DEB_MAKE_INVOKE)/x11vnc -k $(DEB_MAKE_CLEAN_TARGET)
- rm -rf aclocal.m4 autom4te.cache config.* _configs.sed configure depcomp install-sh missing rfbconfig.h.in rfb/rfbconfig.h rfb/rfbint.h
+override_dh_clean:
+ dh_clean
+ rm -rf autom4te.cache
+ rm -f aclocal.m4 config.guess config.sub configure \
+ depcomp install-sh missing \
+ rfbconfig.h.in rfb/rfbconfig.h rfb/rfbint.h
find . -name Makefile -delete
find . -name Makefile.in -delete
-# linuxvnc has its own README, TODO, & ChangeLog
-DEB_INSTALL_CHANGELOGS_linuxvnc = vncterm/ChangeLog
-DEB_INSTALL_DOCS_linuxvnc = vncterm/README vncterm/TODO
-
-# Rename LinuxVNC to linuxvnc
-binary-post-install/linuxvnc::
- mv debian/linuxvnc/usr/bin/LinuxVNC debian/linuxvnc/usr/bin/linuxvnc
-
-
-# x11vnc has its own README & ChangeLog
-DEB_INSTALL_CHANGELOGS_x11vnc = x1lvnc/ChangeLog
-DEB_INSTALL_DOCS_x11vnc = x11vnc/README
-
-# x11vnc has a different makefile
-build/x11vnc::
- $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR)/x11vnc
-
-install/x11vnc::
- $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR)/x11vnc $(DEB_MAKE_INSTALL_TARGET)
+.PHONY: dh_auto_test
More information about the pkg-kde-commits
mailing list