Package: tightvnc
Version: 1.2.9-8
Severity: normal
Tags: patch
Hi,
Attached is the diff for my tightvnc 1.2.9-8.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u tightvnc-1.2.9/Xvnc/Makefile tightvnc-1.2.9/Xvnc/Makefile
--- tightvnc-1.2.9/Xvnc/Makefile
+++ tightvnc-1.2.9/Xvnc/Makefile
@@ -4,7 +4,7 @@
# ----------------------------------------------------------------------
# Makefile generated from "Imake.tmpl" and <Imakefile>
# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.6 2004/07/28 03:24:29 gisburn Exp $
+# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $
#
#
#
@@ -16,13 +16,11 @@
.SUFFIXES: .i
-# $XdotOrg: xc/config/cf/Imake.cf,v 1.4 2004/08/11 21:14:01 kem Exp $
+# $XdotOrg: xc/config/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
-# Keep cpp from replacing path elements containing i486/i586/i686
-
# -----------------------------------------------------------------------
# site-specific configuration parameters that need to come before
# the platform-specific parameters - edit site.def to change
@@ -36,23 +34,23 @@
# ----------------------------------------------------------------------
# platform-specific configuration parameters - edit linux.cf to change
-# $XdotOrg: xc/config/cf/linux.cf,v 1.13 2004/08/11 21:14:01 kem Exp $
+# $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $
# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
Exp $
-# operating system: Linux 2.4.27-mppe+ctx+vlan-686-smp i686 [ELF] (2.4.27)
+# operating system: Linux 2.6.14.3 x86_64 [ELF] (2.6.14)
# libc: (6.3.5)
# binutils: (216)
# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
-# $XdotOrg: xc/config/cf/xorg.cf,v 1.27.2.6 2005/01/24 03:11:42 gisburn Exp $
+# $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
-XORG_VERSION_CURRENT = (((6) * 10000000) + ((8) * 100000) + ((2) * 1000) + 0)
+XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0)
RELEASE_VERSION = RELEASE-1
AFB_DEFS = -DUSE_AFB
@@ -97,7 +95,7 @@
# ---------------------------------------------------------------------
# Imake rules for building libraries, programs, scripts, and data files
# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.6 2004/08/13 17:21:43 krh Exp
$
+# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj
Exp $
#
#
#
@@ -110,7 +108,7 @@
X_BYTE_ORDER = X_LITTLE_ENDIAN
-GLIDE2INCDIR = /usr/include/glide
+GLIDE2INCDIR =
GLIDE3INCDIR = /usr/include/glide3
@@ -175,12 +173,12 @@
# from top Makefile
BOOTSTRAPCFLAGS =
- CC = gcc -m32
- AS = gcc -m32 -c -x assembler
+ CC = gcc
+ AS = gcc -c -x assembler
.SUFFIXES: .cc
- CXX = c++ -m32
+ CXX = c++
CXXFILT = c++filt
@@ -190,7 +188,7 @@
CXXDEPENDINCLUDES =
CXXEXTRA_DEFINES =
CXXEXTRA_INCLUDES =
- CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(CXXPROJECT_DEFINES)
+ CXXSTD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(CXXPROJECT_DEFINES)
CXXOPTIONS =
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES)
$(DEFINES) $(CXXEXTRA_DEFINES)
@@ -201,12 +199,12 @@
CPP = cpp $(STD_CPP_DEFINES)
RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
- PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
+ PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
INSTALL = install
INSTALLFLAGS = -c
- LD = gcc -m32 -nostdlib
+ LD = gcc -nostdlib
LEX = flex -l
M4 = m4
@@ -262,8 +260,6 @@
TROFF = groff -Tps
NROFF = nroff
- HTMLROFF = groff -Thtml
-
MSMACROS = -ms
MANMACROS = -man
TBL = tbl
@@ -272,14 +268,14 @@
COL = col
COLFLAGS = -b
- MODCC = gcc -m32
+ MODCC = gcc
MODCPP = cpp
MODCFLAGS = $(CFLAGS)
- MODAS = gcc -m32 -c -x assembler
+ MODAS = gcc -c -x assembler
MODASFLAGS =
- MODLD = gcc -m32 -nostdlib
+ MODLD = gcc -nostdlib
MODLDFLAGS =
MODLDCOMBINEFLAGS = -r
@@ -292,8 +288,8 @@
STD_INCLUDES =
STD_CPP_OPTIONS = -traditional
- STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
- STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
+ STD_CPP_DEFINES = -traditional -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(PROJECT_DEFINES)
+ STD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(PROJECT_DEFINES)
EXTRA_LOAD_FLAGS =
EXTRA_LDOPTIONS =
EXTRA_LIBRARIES =
@@ -306,6 +302,9 @@
SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS)
+ NOSTDLIB = -nostdlib
+ POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic
+
PICFLAGS = -fPIC
CXXPICFLAGS = -fPIC
@@ -374,7 +373,7 @@
# ----------------------------------------------------------------------
# X Window System Build Parameters and Rules
-# $XdotOrg: xc/config/cf/X11.tmpl,v 1.35.2.3 2005/02/01 04:07:39 gisburn Exp $
+# $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $
# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
#
#
@@ -382,7 +381,7 @@
#
# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
-XORGRELSTRING = `echo 6 8 2 | sed 's/ /./g'`
+XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
XORGMANNAME = X Version 11
STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
@@ -427,7 +426,7 @@
DOCPSDIR = $(DOCDIR)/PostScript
DOCPDFDIR = $(DOCDIR)/PDF
FONTDIR = $(LIBDIR)/fonts
- ENCODINGSDIR = $(FONTDIR)/encodings
+ ENCODINGSDIR = $(LIBDIR)/fonts/encodings
XINITDIR = $(LIBDIR)/xinit
XDMDIR = $(LIBDIR)/xdm
XDMVARDIR = $(VARLIBDIR)/xdm
@@ -487,8 +486,8 @@
XTRANS_FAILDEFINES = -DFAIL_HARD
VENDORMANNAME = X.Org
- VENDORMANVERSION = `echo 6 8 2 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
- XORGMANDEFS = -D__xorgversion__="$(XORGRELSTRING) Release"'
"$(XORGMANNAME)"'
+ VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+ XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)"
VENDORNAME = The X.Org Foundation
VENDORNAMESHORT = X.Org
@@ -618,24 +617,21 @@
DPSLIBSRC = $(LIBSRC)/dps
-SODPSREV = 1.0
-DEPDPSLIB =
+DEPDPSLIB = $(USRLIBDIR)/libdps.a
DPSLIB = -ldps
LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
DPSTKLIBSRC = $(LIBSRC)/dpstk
-SODPSTKREV = 1.0
-DEPDPSTKLIB =
+DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a
DPSTKLIB = -ldpstk
LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
PSRESLIBSRC = $(LIBSRC)/psres
-SOPSRESREV = 1.0
-DEPPSRESLIB =
+DEPPSRESLIB = $(USRLIBDIR)/libpsres.a
PSRESLIB = -lpsres
LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
@@ -853,7 +849,7 @@
ICESRC = $(LIBSRC)/ICE
-SOICEREV = 6.3
+SOICEREV = 6.4
DEPICELIB =
ICELIB = -lICE
@@ -1095,7 +1091,7 @@
VerifyOS::
@echo ""
- @echo Building on Linux 2.4.27-mppe+ctx+vlan-686-smp i686 [ELF]
"("2"."4"."27")."
+ @echo Building on Linux 2.6.14.3 x86_64 [ELF] "("2"."6"."14")."
@echo ""
@echo libc version 6"."3"."5
@@ -1182,7 +1178,7 @@
emptyrule::
cleandir::
- $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut grohtml*.png *-auto-*.png "#"*
+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut "#"*
tags::
$(TAGS) -w *.[ch]
diff -u tightvnc-1.2.9/debian/control tightvnc-1.2.9/debian/control
--- tightvnc-1.2.9/debian/control
+++ tightvnc-1.2.9/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ola Lundqvist <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>> 3.0.0), lynx, zlib1g-dev, xutils, libjpeg62-dev,
libxaw7-dev (>> 4.1.0), perl-modules, xfonts-base, xutils, xlibs-dev
+Build-Depends: debhelper (>> 3.0.0), lynx, zlib1g-dev, xutils, libjpeg62-dev,
libxaw7-dev (>> 4.1.0), perl-modules, xfonts-base, xutils, libx11-dev,
libxau-dev, libxext-dev, libxi-dev, libxkbfile-dev, libxmu-dev, libxt-dev, x-dev
Package: tightvncserver
Architecture: any
diff -u tightvnc-1.2.9/debian/changelog tightvnc-1.2.9/debian/changelog
--- tightvnc-1.2.9/debian/changelog
+++ tightvnc-1.2.9/debian/changelog
@@ -1,3 +1,11 @@
+tightvnc (1.2.9-8.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. (Closes: #346923)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sat, 21 Jan 2006 02:15:13 +0100
+
tightvnc (1.2.9-8) unstable; urgency=low
* Applied a simple patch to avoid crash in xtightvncviewer when
diff -u tightvnc-1.2.9/Makefile tightvnc-1.2.9/Makefile
--- tightvnc-1.2.9/Makefile
+++ tightvnc-1.2.9/Makefile
@@ -4,7 +4,7 @@
# ----------------------------------------------------------------------
# Makefile generated from "Imake.tmpl" and <Imakefile>
# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
-# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.6 2004/07/28 03:24:29 gisburn Exp $
+# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $
#
#
#
@@ -16,13 +16,11 @@
.SUFFIXES: .i
-# $XdotOrg: xc/config/cf/Imake.cf,v 1.4 2004/08/11 21:14:01 kem Exp $
+# $XdotOrg: xc/config/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
-# Keep cpp from replacing path elements containing i486/i586/i686
-
# -----------------------------------------------------------------------
# site-specific configuration parameters that need to come before
# the platform-specific parameters - edit site.def to change
@@ -36,23 +34,23 @@
# ----------------------------------------------------------------------
# platform-specific configuration parameters - edit linux.cf to change
-# $XdotOrg: xc/config/cf/linux.cf,v 1.13 2004/08/11 21:14:01 kem Exp $
+# $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $
# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
Exp $
-# operating system: Linux 2.4.27-mppe+ctx+vlan-686-smp i686 [ELF] (2.4.27)
+# operating system: Linux 2.6.14.3 x86_64 [ELF] (2.6.14)
# libc: (6.3.5)
# binutils: (216)
# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
-# $XdotOrg: xc/config/cf/xorg.cf,v 1.27.2.6 2005/01/24 03:11:42 gisburn Exp $
+# $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
-XORG_VERSION_CURRENT = (((6) * 10000000) + ((8) * 100000) + ((2) * 1000) + 0)
+XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0)
RELEASE_VERSION = RELEASE-1
AFB_DEFS = -DUSE_AFB
@@ -97,7 +95,7 @@
# ---------------------------------------------------------------------
# Imake rules for building libraries, programs, scripts, and data files
# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
-# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.6 2004/08/13 17:21:43 krh Exp
$
+# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj
Exp $
#
#
#
@@ -110,7 +108,7 @@
X_BYTE_ORDER = X_LITTLE_ENDIAN
-GLIDE2INCDIR = /usr/include/glide
+GLIDE2INCDIR =
GLIDE3INCDIR = /usr/include/glide3
@@ -175,12 +173,12 @@
# from top Makefile
BOOTSTRAPCFLAGS =
- CC = gcc -m32
- AS = gcc -m32 -c -x assembler
+ CC = gcc
+ AS = gcc -c -x assembler
.SUFFIXES: .cc
- CXX = c++ -m32
+ CXX = c++
CXXFILT = c++filt
@@ -190,7 +188,7 @@
CXXDEPENDINCLUDES =
CXXEXTRA_DEFINES =
CXXEXTRA_INCLUDES =
- CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(CXXPROJECT_DEFINES)
+ CXXSTD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(CXXPROJECT_DEFINES)
CXXOPTIONS =
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES)
$(DEFINES) $(CXXEXTRA_DEFINES)
@@ -201,12 +199,12 @@
CPP = cpp $(STD_CPP_DEFINES)
RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
- PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
+ PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
INSTALL = install
INSTALLFLAGS = -c
- LD = gcc -m32 -nostdlib
+ LD = gcc -nostdlib
LEX = flex -l
M4 = m4
@@ -262,8 +260,6 @@
TROFF = groff -Tps
NROFF = nroff
- HTMLROFF = groff -Thtml
-
MSMACROS = -ms
MANMACROS = -man
TBL = tbl
@@ -272,14 +268,14 @@
COL = col
COLFLAGS = -b
- MODCC = gcc -m32
+ MODCC = gcc
MODCPP = cpp
MODCFLAGS = $(CFLAGS)
- MODAS = gcc -m32 -c -x assembler
+ MODAS = gcc -c -x assembler
MODASFLAGS =
- MODLD = gcc -m32 -nostdlib
+ MODLD = gcc -nostdlib
MODLDFLAGS =
MODLDCOMBINEFLAGS = -r
@@ -292,8 +288,8 @@
STD_INCLUDES =
STD_CPP_OPTIONS = -traditional
- STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
- STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
$(PROJECT_DEFINES)
+ STD_CPP_DEFINES = -traditional -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(PROJECT_DEFINES)
+ STD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE
-D_BSD_SOURCE -D_SVID_SOURCE
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
$(PROJECT_DEFINES)
EXTRA_LOAD_FLAGS =
EXTRA_LDOPTIONS =
EXTRA_LIBRARIES =
@@ -306,6 +302,9 @@
SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS)
+ NOSTDLIB = -nostdlib
+ POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic
+
PICFLAGS = -fPIC
CXXPICFLAGS = -fPIC
@@ -374,7 +373,7 @@
# ----------------------------------------------------------------------
# X Window System Build Parameters and Rules
-# $XdotOrg: xc/config/cf/X11.tmpl,v 1.35.2.3 2005/02/01 04:07:39 gisburn Exp $
+# $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $
# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
#
#
@@ -382,7 +381,7 @@
#
# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $
-XORGRELSTRING = `echo 6 8 2 | sed 's/ /./g'`
+XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
XORGMANNAME = X Version 11
STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
@@ -427,7 +426,7 @@
DOCPSDIR = $(DOCDIR)/PostScript
DOCPDFDIR = $(DOCDIR)/PDF
FONTDIR = $(LIBDIR)/fonts
- ENCODINGSDIR = $(FONTDIR)/encodings
+ ENCODINGSDIR = $(LIBDIR)/fonts/encodings
XINITDIR = $(LIBDIR)/xinit
XDMDIR = $(LIBDIR)/xdm
XDMVARDIR = $(VARLIBDIR)/xdm
@@ -487,8 +486,8 @@
XTRANS_FAILDEFINES = -DFAIL_HARD
VENDORMANNAME = X.Org
- VENDORMANVERSION = `echo 6 8 2 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
- XORGMANDEFS = -D__xorgversion__="$(XORGRELSTRING) Release"'
"$(XORGMANNAME)"'
+ VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
+ XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""
VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)"
VENDORNAME = The X.Org Foundation
VENDORNAMESHORT = X.Org
@@ -618,24 +617,21 @@
DPSLIBSRC = $(LIBSRC)/dps
-SODPSREV = 1.0
-DEPDPSLIB =
+DEPDPSLIB = $(USRLIBDIR)/libdps.a
DPSLIB = -ldps
LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
DPSTKLIBSRC = $(LIBSRC)/dpstk
-SODPSTKREV = 1.0
-DEPDPSTKLIB =
+DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a
DPSTKLIB = -ldpstk
LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
PSRESLIBSRC = $(LIBSRC)/psres
-SOPSRESREV = 1.0
-DEPPSRESLIB =
+DEPPSRESLIB = $(USRLIBDIR)/libpsres.a
PSRESLIB = -lpsres
LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
@@ -853,7 +849,7 @@
ICESRC = $(LIBSRC)/ICE
-SOICEREV = 6.3
+SOICEREV = 6.4
DEPICELIB =
ICELIB = -lICE
@@ -1101,7 +1097,7 @@
emptyrule::
cleandir::
- $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut grohtml*.png *-auto-*.png "#"*
+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS
make.log MakeOut "#"*
Makefile::
[EMAIL PROTECTED] [ -f Makefile ]; then set -x; \
