libxpm: Changes to 'debian-unstable'
.gitignore | 76 +++
CHANGES | 957 -------------------------------------------------
COPYING | 101 +++--
ChangeLog | 335 +++++++++++++++++
FAQ.html | 344 -----------------
FILES | 68 ---
Makefile.am | 30 -
NEWS | 957 +++++++++++++++++++++++++++++++++++++++++++++++++
README.AMIGA | 10
README.MSW | 127 ------
README.html | 303 ---------------
acinclude.m4 | 46 --
configure.ac | 63 +--
cxpm/.gitignore | 3
cxpm/Makefile.am | 20 -
cxpm/cxpm.c | 1
debian/README.source | 2
debian/changelog | 14
debian/control | 4
debian/copyright | 46 ++
debian/libxpm-dev.docs | 1
debian/rules | 2
debian/xsfbs/xsfbs.mk | 35 +
dev/null |binary
doc/FAQ.html | 344 +++++++++++++++++
doc/Makefile.am | 6
doc/README.AMIGA | 10
doc/README.MSW | 127 ++++++
doc/README.html | 303 +++++++++++++++
doc/xpm.PS.gz |binary
include/Makefile.am | 1
include/X11/xpm.h | 1
m4/ax_define_dir.m4 | 49 ++
src/CrBufFrI.c | 2
src/CrDatFrI.c | 1
src/Makefile.am | 5
src/RdFToI.c | 1
src/WrFFrI.c | 1
src/XpmI.h | 1
src/create.c | 2
src/data.c | 1
src/parse.c | 3
src/scan.c | 1
sxpm/.gitignore | 3
sxpm/Makefile.am | 25 -
sxpm/sxpm.c | 1
sxpm/sxpm.man | 1
47 files changed, 2403 insertions(+), 2031 deletions(-)
New commits:
commit 636f6d0cfeec636582ed9166ddc54e9b0c68dd75
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:59:06 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 4f3b4a7..872838a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxpm (1:3.5.9-1) UNRELEASED; urgency=low
+libxpm (1:3.5.9-1) unstable; urgency=low
[ Julien Cristau ]
* Remove myself from Uploaders.
@@ -14,7 +14,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
* Exclude libXpm.la from dh_install accordingly.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:59:03 +0100
libxpm (1:3.5.8-1) unstable; urgency=low
commit bab039d3f20e2c273a9290b26608a75e3f8096a5
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:59:01 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 3096959..4f3b4a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
* Drop debian/libxpm-dev.docs, xpm.PS is gone.
* Switch from --list-missing to --fail-missing for additional safety.
* Exclude libXpm.la from dh_install accordingly.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
diff --git a/debian/control b/debian/control
index 66ef9fa..f45b491 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 <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 3a11264ed5f9e89b4788f98bfd04e490145ea18e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:52:50 2010 +0100
Exclude libXpm.la from dh_install accordingly.
diff --git a/debian/changelog b/debian/changelog
index 139a580..3096959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Drop debian/libxpm-dev.docs, xpm.PS is gone.
* Switch from --list-missing to --fail-missing for additional safety.
+ * Exclude libXpm.la from dh_install accordingly.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
diff --git a/debian/rules b/debian/rules
index f16d8df..07c8e19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --sourcedir=debian/tmp --fail-missing -XlibXpm.la
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
commit afaa3e20f269e417346a945e546615deddfd617c
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:50:54 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index de78d2a..139a580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Update debian/copyright from upstream COPYING.
* Drop debian/libxpm-dev.docs, xpm.PS is gone.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
diff --git a/debian/rules b/debian/rules
index a2f4d30..f16d8df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
commit 3be3290005e5eefa4968ba056d19dd58badca42a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:49:31 2010 +0100
Drop debian/libxpm-dev.docs, xpm.PS is gone.
diff --git a/debian/changelog b/debian/changelog
index 4ed343f..de78d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
* New upstrem release.
* Bump xutils-dev build-dep for new macros.
* Update debian/copyright from upstream COPYING.
+ * Drop debian/libxpm-dev.docs, xpm.PS is gone.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
diff --git a/debian/libxpm-dev.docs b/debian/libxpm-dev.docs
deleted file mode 100644
index 406202c..0000000
--- a/debian/libxpm-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-xpm.PS.gz
commit f1737139a0a04a59d3b6b6e3ce9c7613fd9e0eb6
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:34:44 2010 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 10d7449..4ed343f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstrem release.
* Bump xutils-dev build-dep for new macros.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
diff --git a/debian/copyright b/debian/copyright
index a0488f7..4b4a0a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,3 +23,49 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of GROUPE BULL shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from GROUPE BULL.
+
+Copyright (C) 1998 Arnaud LE HORS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+Arnaud LE HORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Arnaud LE HORS shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Arnaud LE HORS.
+
+Copyright (C) 19896 Lorens Younes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+Lorens Younes BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Lorens Younes shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Lorens Younes.
commit 84fdd302e071062ee0e97499bcb57bd835907f05
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:33:02 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 71bdb90..10d7449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxpm (1:3.5.9-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstrem release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
diff --git a/debian/control b/debian/control
index c15c1d7..66ef9fa 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
libtool,
- xutils-dev (>= 1:7.5~1),
+ xutils-dev (>= 1:7.5+4),
libx11-dev (>= 1:0.99.2),
libxt-dev (>= 1:0.99.1-5),
x11proto-core-dev (>= 7.0.1),
commit 58f961e5f87e92e954734aa26c9bcae00d088019
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 10:30:27 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 23d644a..b94f5bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,338 @@
+commit 22a434d061af224536baee6c6110b603c5c96b2c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 17:29:25 2010 -0700
+
+ libXpm 3.5.9
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c11f1bd18303139f070e1873382632ee80cd9878
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 20 08:30:56 2010 -0400
+
+ config: remove obsolete FILES file from the Imakefile days
+
+ It lists the files contained in the original
+ BULL Research Koala Project.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0ea6c432a068fc4edf90c614e68a4f4be94edd14
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Oct 17 12:51:15 2010 -0400
+
+ doc: move doc files to the newly created doc dir.
+
+ As per guidelines for all xorg modules.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7a3e69cfb079c7345f3d9b1217f373a706ba544c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Oct 15 17:14:39 2010 -0400
+
+ config: provide a Makefile for the include directory
+
+ Reduce some complexity in the src makefile as it should not
+ handle sibling directories.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e50f645f4cc5bb1db0e025fc6e39c6e84a894c13
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Oct 15 14:56:32 2010 -0400
+
+ libXpm make: remove redundant -I.
+
+ It is always included by Automake
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8dee37ff3bb908d597d53f2b335fc2111643cce7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Oct 24 19:39:54 2010 -0400
+
+ sxpm make: no need to use a per target LDADD
+
+ There is only one program in this makefile.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 34abbaaacddf1018d1805bc4890226ab200a50fb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Oct 15 11:45:58 2010 -0400
+
+ sxpm make: remove redundant $(XMP_LIBS) linker flags
+
+ SXPM_LIBS contains the complete list of dependencies.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b818f5cf7f7d8240db2a94ebcc28603730760e48
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Oct 15 10:21:08 2010 -0400
+
+ src make: remove -I$(top_builddir)/include
+
+ This directory does not exist, only object code is created
+ in "builddir".
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 78bca7e85b930593fefe85cc51b5e24f98de31d0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 21:56:21 2010 -0400
+
+ config: fix warnings, m4 quoting and layout
+
+ Fix some m4 quoting
+ Fix some autoconf warnings
+ Regroup statements per section
+ Add comments
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8e47c819490331c01959332e067f06a382d9a14a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:35:47 2010 -0400
+
+ config: AC_OUTPUT with parms is deprecated, use AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c6915d034fa3f72a9724816d2e3f5e8432ef9321
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:33:40 2010 -0400
+
+ config: AC_HELP_STRING is deprecated, use AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e2fdf80a7f9feedacf67e46a8e577b2e6d415a5f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:29:42 2010 -0400
+
+ config: remove unrequired AC_SUBST(XPM_CFLAGS)
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 937d8c8cf82bd57e82152af3768bdbfc5de4316a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:28:43 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0ed9cb4546d0c65f08a9511736400c0f7fba982f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:28:08 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e99bce47294eab031fc733d695e3c9589b52aff8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:25:00 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements at the top.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0b5e15c685d295262bf2307d65bee3a0b28e74f5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:15:08 2010 -0400
+
+ sxpm: use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use the appropriate platform version of sed
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 262bb7e9426150f6c7b553d184c51d3884d04adf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:11:43 2010 -0400
+
+ cxpm: use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit acd4856aac05a884376736196154842959803aa6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:03:13 2010 -0400
+
+ config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+ It depends on util-macros 1.8
+ The LT_AC_PROG_SED macro was never released by libtool.
+ Neither man makefile actually used $SED anyway.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d1bd1fbc6d7f7b4817aca4fecd8ccfe80a1c2f03
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 14 20:02:30 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3b20344bf3c5ae7a8291041d4887dc8f23644d40
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Thu Oct 7 13:49:17 2010 +0200
+
+ Missing end comment in libXpm/src/parse.c
+
+ CVS tag removal chopped too much out in this case...
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit f8f0a68247b920052df0796a39ebcdc2e4161d05
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:03 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d026662cce0808cf402e0d50932d90984a2ea1bb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Apr 1 21:11:35 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d4a7b15b3ed9e7cf94dbf64f929ae954bada9f60
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Apr 1 21:07:54 2010 -0400
+
+ config: update and relocate AX_DEFINE_DIR macro
+
+ Remove deprecated acinclude.m4 macro container file
+ Use separate macro files as per autoconf recommendation
+ Use the latest version of the macro from GNU
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e0920779d1227338e61aaab16458b9daad508c36
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Mar 29 14:53:49 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 34ebac912c6f1223a274ab2e4f0c12928d357ddd
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 14 09:36:38 2010 -0500
+
+ COPYING: add missing copyright notices
+
+ Refer to: amigax.c, cxpm.c
+ Copyright (C) 1998 Arnaud LE HORS
+ Copyright (C) 19896 Lorens Younes
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dca7a9ccbdd4c85d84668c3a4bc14b0049f0c893
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit af0d92b686c65f7ffb5556b74fd937b01719c535
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 8bda9cdb6344c6cdf87237cb84c16c54a3ae84d8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 089237b624722b141a9ba6888584ebcc5247b227
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:43 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 37e75b28f4d30a66e16cfe192a0612a335aa8d46
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 68ae0e442ad57534c25566284ad049299a982d00
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:25 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
commit 130b2fb0ea716143c63ba30856eecb351bc2af2a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 10:32:08 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index ede57a0..71bdb90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libxpm (1:3.5.8-2) UNRELEASED; urgency=low
+libxpm (1:3.5.9-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Remove myself from Uploaders.
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
- -- Julien Cristau <jcristau@debian.org> Sat, 23 Jan 2010 03:16:04 +0100
+ [ Cyril Brulebois ]
+ * New upstrem release.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 10:30:05 +0100
libxpm (1:3.5.8-1) unstable; urgency=low
commit 22a434d061af224536baee6c6110b603c5c96b2c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 17:29:25 2010 -0700
libXpm 3.5.9
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 8fc2caa..057c056 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libXpm],
- [3.5.8],
+ [3.5.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXpm])
AC_CONFIG_SRCDIR([Makefile.am])
commit c11f1bd18303139f070e1873382632ee80cd9878
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 20 08:30:56 2010 -0400
config: remove obsolete FILES file from the Imakefile days
It lists the files contained in the original
BULL Research Koala Project.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/FILES b/FILES
deleted file mode 100644
index e1bf3fa..0000000
--- a/FILES
+++ /dev/null
@@ -1,68 +0,0 @@
-CHANGES
-COPYRIGHT
-FAQ.html
-FILES
-Imakefile
-Makefile.noX
-README.html
-README.AMIGA
-README.MSW
-namecvt
-lib
-lib/Imakefile
-lib/Makefile.noX
-lib/Makefile.AmigaGCC
-lib/Smakefile
-lib/Attrib.c
-lib/CrBufFrI.c
-lib/CrBufFrP.c
-lib/CrDatFrI.c
-lib/CrDatFrP.c
-lib/CrIFrBuf.c
-lib/CrIFrDat.c
-lib/CrIFrP.c
-lib/CrPFrBuf.c
-lib/CrPFrDat.c
-lib/CrPFrI.c
-lib/Image.c
-lib/Info.c
-lib/RdFToBuf.c
-lib/RdFToDat.c
-lib/RdFToI.c
-lib/RdFToP.c
-lib/WrFFrBuf.c
-lib/WrFFrDat.c
-lib/WrFFrI.c
-lib/WrFFrP.c
-lib/amigax.h
-lib/amigax.c
-lib/create.c
-lib/data.c
-lib/descrip.mms
-lib/hashtab.c
-lib/make.com
-lib/misc.c
-lib/parse.c
-lib/rgb.c
-lib/rgbtab.h
-lib/scan.c
-lib/simx.h
-lib/simx.c
-lib/xpm.h
-lib/XpmI.h
-lib/Xpm-def.cpp
-doc
-doc/xpm.PS
-sxpm
-sxpm/Imakefile
-sxpm/Makefile.noX
-sxpm/plaid.xpm
-sxpm/plaid_ext.xpm
-sxpm/plaid_mask.xpm
-sxpm/sxpm.c
-sxpm/sxpm.man
-cxpm
-cxpm/Imakefile
-cxpm/Makefile.noX
-cxpm/cxpm.c
-cxpm/cxpm.man
diff --git a/Makefile.am b/Makefile.am
index 08f6072..a289a24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xpm.pc
-EXTRA_DIST = COPYRIGHT FILES NEWS.old
+EXTRA_DIST = COPYRIGHT NEWS.old
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 0ea6c432a068fc4edf90c614e68a4f4be94edd14
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Oct 17 12:51:15 2010 -0400
doc: move doc files to the newly created doc dir.
As per guidelines for all xorg modules.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index b90e6cd..0000000
--- a/CHANGES
+++ /dev/null
@@ -1,957 +0,0 @@
-/*
- * Copyright (C) 1989-95 GROUPE BULL
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of GROUPE BULL shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from GROUPE BULL.
- */
-
-/**************************************************************************\
-* *
-* HISTORY of user-visible changes *
-* *
-\**************************************************************************/
-
-3.4k (98/03/18)
-
- ENHANCEMENTS:
- - A new program called cxpm is provided to check on XPM files and help
- figuring out where the file might be invalid.
- - The FAQ and README are now in HTML.
-
- BUGS CORRECTED:
- - A bug in writing pixmaps out on an 32 bit depth visual and MSBFirst
- machine.
- - patch from Uwe Langenkamp <Uwe.Langenkamp@t-online.de>
- - A severe bug in parsing the pixels section when an unknown character
- is encountered.
-
-3.4j (96/12/31)
-
- ENHANCEMENTS:
- - The XPM library can now be built under Amiga DOS. This entirely comes
- from: Lorens Younes <d93-hyo@nada.kth.se>
- See the README.AMIGA file for details.
- - Changes for MSW: big performance improvement in ParseAndPutPixels(),
- fixed creation of the mask in SetColor()
- - patch from Jan Wielemaker <jan@swi.psy.uva.nl>
- - makefiles are provided for VMS
- - given by Martin P.J. Zinser m.zinser@gsi.de
- - Imakefiles reworked to get smoother builds and fixes from:
- - Paul DuBois dubois@primate.wisc.edu
- - Larry Schwimmer schwim@cyclone.stanford.edu
- - thanks to some code rearrangement the library is smaller (the size
- reduction goes from 4 to 7% depending on the system)
-
- BUGS CORRECTED:
- - A severe bug (introduced in 3.4i as part of the sprintf
- optimization) in code writing XPM extensions to a buffer
- XpmCreateBufferFromImage/Pixmap.
- - The XpmAttributes definition in xpm.h was declaring nalloc_colors to
- be Bool, it's an int.
-
-3.4i (96/09/13)
-
- NEW FEATURES:
- - The XPM library now allows the application to pass its own color
- allocation/free functions. For this matter the following was done:
- The XpmAttributes structure has three new fields alloc_color,
- free_color, and color_closure. The following new valuemasks were
- added XpmAllocColorFunc, XpmFreeColorsFunc, XpmColorClosure. And
- two new types were defined XpmAllocColorFunc and XpmFreeColorsFunc.
- See documentation for details.
-
- ENHANCEMENTS:
- - Windows NT support. It should compile and run fine based on the X
- Consortium X11R6 distribution.
- - The README file contains information to compile on Solaris with gcc.
- - Part of the code has been optimized by using the value returned by
- sprintf instead of calling strlen. Add the flag -DVOID_SPRINTF
- if on your system sprintf returns void.
- - patch from Thomas Ott thommy@rz.fh-augsburg.de
-
- BUGS CORRECTED:
- - XpmFree is now a real function (simply calling free by default).
-
- CHANGES TO THE DOC:
- - The documentation describes the new XpmAttributes fields and their
- use.
-
-3.4h (96/02/01)
-
- NEW FEATURES:
- - The XpmAttributes has a new member called 'alloc_close_colors' which
- lets the caller specify whether close colors should be allocated
- using XAllocColor or not. This is especially useful when one uses a
- private colormap full of read/write cells.
- The xpm.h header file define a new bitmap flag called
- XpmAllocCloseColors to use along with this new slot.
- - Dale Pease peased@bigbird.cso.gtegsc.com
- - The XpmAttributes has a new member called 'bitmap_format' which lets
- the caller specify the format of 1 bit depth images (XYBitmap or
- ZPixmap). The xpm.h header file define a new bitmap flag called
- XpmBitmapFormat to use along with this new field.
-
- ENHANCEMENTS:
- - XpmReadFileTo[Image/Pixmap], XpmCreate[Image/Pixmap]FromData,
- XpmCreateImageFromDataFromBuffer functions do no longer use a
- temporary XpmImage object, which reduces a lot the amount of memory
- used. On the other hand it can take a little more time, but given the
- following figures (based on sxpm) it is a real good trade-off.
-
- Reading a 22x22 pixmap with 5 colors no time change is detected
- using time:
- real 0.3
- user 0.1
- sys 0.1
-
- Reading a 1279x1023 pixmap with 14 colors (quite extreme case for
- XPM!) the time goes from:
- real 1.9
- user 0.8
- sys 0.8
-
- to:
- real 2.2
- user 1.8
- sys 0.3
-
- Reading the 22x22 pixmap with 5 colors the memory usage (under
- purify) goes from:
- 255256 code
- 55496 data/bss
- 163848 heap (peak use)
- 4248 stack
- to:
- 271240 code
- 55472 data/bss
- 159752 heap (peak use)
- 4224 stack
-
- And reading the 1279x1023 pixmap with 14 colors it goes from:
- 255256 code
- 55496 data/bss
- 6705160 heap (peak use)
- 4280 stack
- to:
- 271240 code
- 55472 data/bss
- 1732616 heap (peak use)
- 4264 stack
-
- This clearly shows that while for small pixmaps there is no real
- difference on both sides, for large pixmaps this makes a huge
- difference about the amount of memory used and it is not much
- slower.
-
- Note that you can still get the old behavior using both
- XpmReadFileToXpmImage and XpmCreate[Image/Pixmap]FromXpmImage instead
- of XpmReadFileTo[Image/Pixmap]. Once more XPM gives you the choice!
-
- BUGS CORRECTED:
- - when defined locally the global symbols strcasecmp and strdup are
- now called xpmstrcasecmp and xpmstrdup to avoid any possible
- conflict.
- - VMS has a bogus file system which requires a work around in
- XpmReadFileToBuffer.
- - patch from Bob.Deen@jpl.nasa.gov
- - the type of the exactColors attribute has been changed from unsigned
- int to Bool.
-
- CHANGES TO THE DOC:
- - the documentation describes the new XpmAttributes fields
- alloc_close_colors and bitmap_format.
-
-3.4g (95/10/08)
-
- ENHANCEMENTS:
- - The XpmAttributes structure has now two new slots: alloc_pixels and
- nalloc_pixels in order to provide an easy way to free allocated
- colors. The new bitmask XpmReturnAllocPixels should be used to
- request this data through the valuemask. Unless you really know why,
- you should use this instead of XpmReturnPixels, pixels, and npixels.
Reply to: