.gitignore | 1
ChangeLog | 406 +++++++++++++---
INSTALL | 50 +-
Makefile.in | 137 +++--
acinclude.m4 | 47 +
aclocal.m4 | 699 +++++++++++++++++++----------
config.guess | 34 +
config.h.in | 15
config.sub | 36 +
configure | 1319 +++++++++++++++++++++++++++++++++++++------------------
configure.ac | 22
cxpm/Makefile.am | 11
cxpm/Makefile.in | 151 +++---
cxpm/cxpm.c | 50 +-
debian/changelog | 9
debian/control | 6
debian/copyright | 3
depcomp | 64 ++
install-sh | 348 +++++++++++---
ltmain.sh | 233 ++++++---
missing | 61 +-
mkinstalldirs | 5
src/Makefile.am | 5
src/Makefile.in | 134 ++---
src/RdFToI.c | 4
src/WrFFrI.c | 15
src/XpmI.h | 4
src/data.c | 2
src/parse.c | 2
src/simx.h | 17
sxpm/Makefile.am | 12
sxpm/Makefile.in | 153 +++---
sxpm/sxpm.c | 77 ++-
33 files changed, 2831 insertions(+), 1301 deletions(-)
New commits:
commit 89d8a2b252e7b68106067c8f8723c68f3a2140f1
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 25 10:51:03 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 774733c..1341822 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxpm (1:3.5.7-1) UNRELEASED; urgency=low
+libxpm (1:3.5.7-1) unstable; urgency=low
* New upstream release.
* Add the upstream URL to debian/copyright.
* Use binary:Version instead of the deprecated Source-Version.
* Add myself to uploaders, and remove Branden with his permission.
- -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:49:11 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:50:50 +0200
libxpm (1:3.5.6-3) unstable; urgency=low
commit 4fb5dbb537906d03dbbad90b98a1e3cfe011dec9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 25 10:50:39 2007 +0200
debian/control updates
- replace the deprecated Source-Version with binary:Version
- remove Branden from Uploaders and add myself.
diff --git a/debian/changelog b/debian/changelog
index bf515b5..774733c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ libxpm (1:3.5.7-1) UNRELEASED; urgency=low
* New upstream release.
* Add the upstream URL to debian/copyright.
+ * Use binary:Version instead of the deprecated Source-Version.
+ * Add myself to uploaders, and remove Branden with his permission.
- -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:39:45 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:49:11 +0200
libxpm (1:3.5.6-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3c33207..0d6a2a4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxpm
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>=
1:0.99.1-5), x11proto-core-dev (>= 7.0.1-1), libxext-dev (>= 1:0.99.1-1),
pkg-config
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxpm
@@ -25,7 +25,7 @@ Package: libxpm4-dbg
Section: libdevel
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxpm4 (=
${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxpm4 (=
${binary:Version})
Description: X11 pixmap library (debug package)
libXpm provides support and common operation for the XPM pixmap format, which
is commonly used in legacy X applications. XPM is an extension of the
@@ -41,7 +41,7 @@ Description: X11 pixmap library (debug package)
Package: libxpm-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxpm4 (= ${Source-Version}),
libx11-dev, x11proto-core-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxpm4 (= ${binary:Version}),
libx11-dev, x11proto-core-dev
Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 pixmap library (development headers)
libXpm provides support and common operation for the XPM pixmap format, which
commit 25d93f59b2b60de332f244aa8c9a243ffb3db1d1
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 25 10:40:26 2007 +0200
* Add the upstream URL to debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index 939ceee..bf515b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
libxpm (1:3.5.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add the upstream URL to debian/copyright.
- -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:39:18 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:39:45 +0200
libxpm (1:3.5.6-3) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index e291d20..a0488f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/lib/
+
Copyright (C) 1989-95 GROUPE BULL
Permission is hereby granted, free of charge, to any person obtaining a copy
commit 47ffde1376246463de2de7637c4037cc7ac736a4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 25 10:32:14 2007 +0200
Update changelogs for new upstream release.
diff --git a/ChangeLog b/ChangeLog
index 7217698..41abeef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,101 +1,365 @@
-2006-06-02 Alan Coopersmith <[EMAIL PROTECTED]>
+commit 3e37dd39b6169af9928d5b959c40ba79a07450ee
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Wed Aug 22 13:23:30 2007 -0700
- * src/hashtab.c (xpmHashTableInit):
- Always initialize atomTable to NULL, so xpmHashTableFree() doesn't
- try to free a random value from the stack if xpmHashTableInit returns
- an error.
+ Version bump: 3.5.7
- * src/create.c (xpmParseDataAndCreate):
- Coverity #1432: Returned without freeing storage "hints_cmt"
- (in error case when xpmHashTableInit failed)
-
- * src/parse.c (xpmParseData):
- Coverity #1415: Returned without freeing storage "hints_cmt"
- (in error case when xpmHashTableInit failed)
-
-2006-04-26 Adam Jackson <[EMAIL PROTECTED]>
+commit d82244497b54889f91c78585374d1ad6a0cef2cf
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Wed Aug 22 13:08:42 2007 -0700
- * configure.ac:
- Bump to 3.5.5
+ Replace strcpy with strncpy to match previous code block
-2006-03-18 Matthieu Herrb <[EMAIL PROTECTED]>
+commit 47c974872b51b8c1d6965eff4599f8ce739bcedc
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Aug 6 14:22:48 2007 -0700
- * src/Attrib.c: XpmFreeExtensions
- doublecheck that a pointer is not NULL before dereferencing it.
- (Coverity CID 121).
+ Use srcdir in paths passed to xgettext when making .po files
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6e003fd5f174a8e312d799d7f8812c2a5b87e433
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Aug 6 12:59:04 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Replace index/rindex with C89 standard strchr/strrchr
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 43dfc6be8128139888426d8c709aa78efc207953
+Author: Jason Rumney <[EMAIL PROTECTED]>
+Date: Mon Aug 6 12:52:52 2007 -0700
- * cxpm/Makefile.am:
- * sxpm/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ X.Org Bug #11863: Build libXpm on MS Windows (with MinGW)
+
+ * src/XpmI.h [FOR_MSW]: Include simx.h instead of real X headers.
+
+ * src/simx.h (_XFUNCPROTOBEGIN, _XFUNCPROTOEND, NO_ZPIPE): Define.
+ (XAllocColor): Fix arg list in prototype.
+ (bzero, close, fdopen, index, rindex, open, strdup, O_RDONLY):
+ Map to W32 equivalents.
+
+ * src/RdFToI.c [FOR_MSW]: Include fcntl.h.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 290f0b9115428dab0cbf2880d154468c557b3e7e
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Wed Jul 25 17:45:15 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d4bc7dc0dea218cea380aba972f10f60dc1e86ac
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Wed Jun 27 13:54:07 2007 -0700
- * xpm.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Use AM_CFLAGS & AM_CPPFLAGS to replace per-program and obsolete macros
+
+ Clears some warnings from automake-1.10
-2005-11-12 Alan Coopersmith <[EMAIL PROTECTED]>
+commit 85a87de3c03ca8be526dedc0a2973f9426518c39
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Nov 21 17:12:18 2006 -0800
- * configure.ac:
- * cxpm/Makefile.am:
- * sxpm/Makefile.am:
- Use sed to substitute variables in man pages
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Sun bug 4486226: Xpm is not internationalized
+
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4486226>
+ Use gettext() to allow translated messages in sxpm & cxpm
+ (cherry picked from bcda4f17ab3fa9f0572f876dbeb09b45fbc23f3d commit)
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 3c881daddcc251d6e806715d267e4e55934abd1a
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue Nov 21 15:13:44 2006 -0800
-2005-10-28 Alan Coopersmith <[EMAIL PROTECTED]>
+ Add *~ to .gitignore to skip over emacs/patch droppings
- * configure.ac:
- Add --enable-stat-zfile (on by default) to replace Imake's
- ZFILEDEF = -DSTAT_ZFILE to enable automatically searching
- for file.xpm.Z & file.xpm.gz when file.xpm is requested.
+commit 60817dd28774540622ea404f650db8389c66da54
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Oct 13 16:23:49 2006 -0400
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 3.5.6
- * configure.ac:
- Update package version number for RC1 release.
+commit 12dc4dc15234ae818a21c20ebf7b2d053b7a94be
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Thu Jul 13 14:59:03 2006 -0700
-2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ renamed: .cvsignore -> .gitignore
- * Makefile.am:
- * src/Makefile.am:
- Add missing files to EXTRA_DIST
+commit 4daea919c3aa104b6caf8c0f42f49ae755545986
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Jun 3 06:11:30 2006 +0000
- * cxpm/Makefile.am:
- * sxpm/Makefile.am:
- Fix man page installation
+ Always initialize atomTable to NULL, so xpmHashTableFree() doesn't try to
+ free a random value from the stack if xpmHashTableInit returns an
+ error.
-2005-07-08 Keith Packard <[EMAIL PROTECTED]>
+commit 19855d6e09aa36db7686ad6f538179bf87e9c6ea
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri Jun 2 19:48:01 2006 +0000
- * .cvsignore:
- * cxpm/.cvsignore:
- * src/.cvsignore:
- * sxpm/.cvsignore:
- Add .cvsignore files
+ Coverity #1432: Returned without freeing storage "hints_cmt" (in error case
+ when xpmHashTableInit failed)
-2005-06-09 Alexander Gottwald <[EMAIL PROTECTED]>
+commit 000abcd371d0c4b1d0a5380023d74bf5bfc47685
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Fri Jun 2 19:33:29 2006 +0000
- * cxpm/Makefile.am: Use $(top_srcdir)/src instead of $(top_builddir)/src
- in INCLUDES
+ Coverity #1415: Returned without freeing storage "hints_cmt" (in error case
+ when xpmHashTableInit failed)
-2005-05-19 Soren Sandmann <[EMAIL PROTECTED]>
+commit 5c70c99833d4040aaf595d0005b861e0a930ee66
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Thu Apr 27 00:19:37 2006 +0000
- * sxpm/Makefile.am: Add $(top_builddir)/include to INCLUDES
+ Bump to 3.5.5
+commit 2dcc187c92c1a579e6e9f0bad999a3b4e47228c3
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sat Mar 18 15:18:56 2006 +0000
+
+ doublecheck that a pointer is not NULL before dereferencing it. (Coverity
+ CID 121).
+
+commit 93421a53ccf159ff39bc9f8ff72c57246f9cb90c
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Thu Dec 15 00:24:31 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 2b229ddcb52a3bf9bef32e764f93cc57c1351420
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Tue Dec 6 22:48:44 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 50214deb692a9af760088f8e7a51955c7d3f1707
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Dec 3 05:49:44 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 19881d3c88ff0713ef550382fd0dfb03123dabed
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Mon Nov 28 22:03:06 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit a6fbdb403efd3bf7e1179660959fd0e66a301ce0
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Sat Nov 19 07:15:42 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 82513d04a8381da8d2281d7581f6b0d65901aede
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sun Nov 13 02:08:07 2005 +0000
+
+ Use sed to substitute variables in man pages
+
+commit d1b430289b2ddb6c1f3383c5288aa125b058508a
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Nov 9 21:19:13 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit e2c9276ccc1ef619dcfbdeb414ef0dec5113c1ee
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Oct 29 02:26:49 2005 +0000
+
+ Add --enable-stat-zfile (on by default) to replace Imake's ZFILEDEF =
+ -DSTAT_ZFILE to enable automatically searching for file.xpm.Z &
+ file.xpm.gz when file.xpm is requested.
+
+commit 2f57ab95012d9221cca1af6c0a1ccea5d308c66f
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 19 02:48:11 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 72bf88ed120fb888c57ed3223faa316403031b36
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Wed Oct 5 20:24:14 2005 +0000
+
+ Add missing files to EXTRA_DIST
+ Fix man page installation
+
+commit 08c43c5f1f851c1acad360a28767670dc62d8a66
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Mon Oct 3 19:53:58 2005 +0000
+
+ Last argument of variable parameter list needs to be casted to a pointer
+ type.
+
+commit 5ecad7c12c3104d653972385f548e3f86532cbe3
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date: Fri Jul 29 21:22:52 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 703207d3b3718223d4b2711fb77fc96a4f3909ef
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sun Jul 17 10:32:57 2005 +0000
+
+ fix build outside of $(srcdir)
+
+commit 5a0177d4474787951c0cae56e285bb075ab405f3
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Jul 16 21:11:25 2005 +0000
+
+ Accept autoconf HAVE_STRLCPY as alias for HAS_STRLCAT
+
+commit fd38ee667976855150d3c1231a1acc2cf1a89330
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Sat Jul 16 21:10:44 2005 +0000
+
+ Check for strlcat() for use in parse.c
+
+commit 9b3eed6e4f7ee542149ecec0d017a3a460f7c084
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Sat Jul 16 07:23:39 2005 +0000
+
+ Set soversion to 4.11.0 with -version-number.
+
+commit a705a1cd9dc4c4ba1940c9b59d2107ba59360e39
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date: Sat Jul 9 06:45:44 2005 +0000
+
+ Add .cvsignore files
+
+commit b1d84a9fc9b15232c09b6ce5d96c097fdd4f0a15
+Author: Alexander Gottwald <[EMAIL PROTECTED]>
+Date: Thu Jun 9 13:42:36 2005 +0000
+
+ Use $(top_srcdir)/src instead of $(top_builddir)/src in INCLUDES
+
+commit 769751fba3e32f49272d19799929e1ad5a3d2cd0
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Thu May 19 17:09:13 2005 +0000
+
+ Add $(top_builddir)/include to INCLUDES
+
+commit 2cc1896c61eef5739bb6a8ffa89e58ba5c175a05
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Thu May 19 15:02:48 2005 +0000
+
+ - Add build system for lib/Xpm
+ - Add Xpm to symlink.sh
+ - Conditionally include config.h in xc/extras/Xpm
+
+commit cf0d69c7ace679f27f105c582760b9be14923aba
+Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
+Date: Thu May 19 14:37:53 2005 +0000
+
+ Thu May 19 10:36:54 2005 Søren Sandmann <[EMAIL PROTECTED]>
+ Add "../lib" to INCLUDES.
+ Replace #include "../lib/foo" with #include "foo".
+
+commit 639b3598cd0e7214010248efb62b75ef85a8e5c5
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Mon Feb 21 20:52:32 2005 +0000
+
+ Avoid inifite loops. From Chris Gilbert in bug #1920.
+
+commit f1908d7ee5e2d2d44db2116b3c88213da9dfb854
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sat Dec 11 16:14:05 2004 +0000
+
+ Fix incomplete merge.
+
+commit b041980732f6a6002001cfe079fdfb982937d4a8
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sat Dec 11 16:08:59 2004 +0000
+
+ more s_open() cleanup.
+
+commit 90d0638a42553786f54df333f0da4d008e9a0573
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Sat Dec 11 16:04:34 2004 +0000
+
+ Replace s_popen() by a more specific function that allows only one command
+ in the pipe. Remove extraneous tests on file names that broke some
+ applications. From Alex Reisen in Bugzilla #1920.
+
+commit 2c23dbf2cafaad72b1f45da915eb87a8f792fdb0
+Author: Roland Mainz <[EMAIL PROTECTED]>
+Date: Wed Dec 8 01:16:48 2004 +0000
+
+ //bugs.freedesktop.org/show_bug.cgi?id=830): Fix libXpm header (xpm.h) to
+ use the X11 function begin/end marker macros (_XFUNCPROTOBEGIN,
+ _XFUNCPROTOEND) instead of homegrown (native) C++ code. Patch by Kevin
+ DeKorte <[EMAIL PROTECTED]>.
+
+commit 50986a34f231fbc7a4b62466bd89bd4ae4027d2e
+Author: Matthieu Herrb <[EMAIL PROTECTED]>
+Date: Thu Nov 25 21:19:11 2004 +0000
+
+ Fixes for CAN-2004-0914 (Thomas Biege).
+
+commit a983dafac59dcb425666a5a5556da4734e50c6c5
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Tue Sep 21 17:57:35 2004 +0000
+
+ Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and
+ Alan Coopersmith from release 6.8.1.
+ Fail during initialization with error if font/fontset is not set for
+ widget. This prevents a sig11 later when the non-existent font/fontset
+ structs are referenced.
+ Check if xf86Info.kbdProc pointer is really set before calling it on abort
+ as this pointer won't be set if the new modular keyboard driver is used
+ (Matthias Hopf).
+ Added new libs to the bindist control files.
+ Removed inclusion of unnecessary kernel header on Linux. This may fail in
+ an -ansi environment.
+
+commit 2773a7214e282f6f673483f5233b880505947c3f
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Fri Apr 23 18:42:32 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 65c64a2eaa8698434f1869dcdcb5d9ccb21c6932
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Sun Mar 14 08:28:26 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 0b313707a677523fed9ac485445e8b09d2a85c13
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Wed Mar 3 12:09:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 658f8e9a9094ba5d18743694cad7275be53c7a25
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 13:34:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 9971f91864e8f722b42c58f2ff19025715f33b98
+Author: Egbert Eich <[EMAIL PROTECTED]>
+Date: Thu Feb 26 09:21:31 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit fbfe965054d8144946651b19085684af7f6715b9
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Tue Nov 25 19:27:16 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c037348b5df0ac94ad4daba59f8bc9acf12ef623
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:24 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit aafaabc4a0bfab6544e085ee504ad69de4a5ddb1
+Author: Kaleb Keithley <[EMAIL PROTECTED]>
+Date: Fri Nov 14 16:48:24 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 7019f01..939ceee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxpm (1:3.5.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 25 Aug 2007 10:39:18 +0200
+
libxpm (1:3.5.6-3) unstable; urgency=low
* Put binary packages in the correct sections.
commit 98799a0ae488356e578883e1dd04a0be11968abb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 25 10:31:23 2007 +0200
autoreconf.
diff --git a/INSTALL b/INSTALL
index 23e5f25..5458714 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want
to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +87,15 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'.
For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
diff --git a/Makefile.in b/Makefile.in
index 5221fba..51491bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,15 +17,11 @@
# Daniel Stone disowns all copyright on this file; no warranty is given as to
its
# suitability or otherwise.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -39,18 +35,19 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/xpm.pc.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = xpm.pc
@@ -58,10 +55,11 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -71,6 +69,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -88,8 +88,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -98,8 +96,6 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-BUILD_SXPM_FALSE = @BUILD_SXPM_FALSE@
-BUILD_SXPM_TRUE = @BUILD_SXPM_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -125,6 +121,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -136,13 +133,13 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
+LOCALEDIR = @LOCALEDIR@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -153,6 +150,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -161,13 +159,13 @@ SXPM_LIBS = @SXPM_LIBS@
VERSION = @VERSION@
XPM_CFLAGS = @XPM_CFLAGS@
XPM_LIBS = @XPM_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -179,6 +177,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -206,8 +205,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = src sxpm cxpm
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xpm.pc
@@ -263,7 +265,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -287,10 +289,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -337,8 +338,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -440,24 +440,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/.
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -471,7 +469,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -479,6 +477,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -486,7 +486,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {}
\; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
@@ -561,7 +561,7 @@ distcheck: dist
$(am__remove_distdir)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
