libxmu: Changes to 'debian-unstable'
.gitignore | 20
ChangeLog | 310 -
INSTALL | 69
Makefile.am | 2
Makefile.in | 19
aclocal.m4 | 76
config.guess | 667 +--
config.sub | 222 -
configure | 8074 ++++++++++++++++++++-------------------
configure.ac | 2
debian/changelog | 11
debian/control | 38
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 359 +
debian/xsfbs/xsfbs.sh | 907 ++++
include/.gitignore | 2
include/Makefile.in | 14
ltmain.sh | 12
mkinstalldirs | 89
src/.gitignore | 7
src/CvtStdSel.c | 2
src/Makefile.in | 14
23 files changed, 6553 insertions(+), 4515 deletions(-)
New commits:
commit c01497cef489f7e445173183023a355e71861167
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 12 13:40:33 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 12f6856..6b1c0b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxmu (1:1.0.3-1) UNRELEASED; urgency=low
+libxmu (1:1.0.3-1) unstable; urgency=low
* New upstream release.
* Install the upstream changelog.
@@ -7,7 +7,7 @@ libxmu (1:1.0.3-1) UNRELEASED; urgency=low
* Fix package sections (libraries in libs, development stuff in libdevel).
* Use ${binary:Version} instead of ${Source-Version}.
- -- Julien Cristau <jcristau@debian.org> Thu, 12 Apr 2007 13:35:39 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Apr 2007 13:40:07 +0200
libxmu (1:1.0.2-2) unstable; urgency=low
commit 23b392a40626edd3daccebb2ce3937446b1007d3
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 12 13:36:46 2007 +0200
Fix package sections, use ${binary:Version} instead of ${Source-Version}.
diff --git a/debian/changelog b/debian/changelog
index 04f1129..12f6856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ libxmu (1:1.0.3-1) UNRELEASED; urgency=low
* Install the upstream changelog.
* Remove outdated CVS information from the package descriptions, and add
XS-Vcs-Git and XS-Vcs-Browser.
+ * Fix package sections (libraries in libs, development stuff in libdevel).
+ * Use ${binary:Version} instead of ${Source-Version}.
- -- Julien Cristau <jcristau@debian.org> Sat, 07 Apr 2007 17:18:18 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 12 Apr 2007 13:35:39 +0200
libxmu (1:1.0.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ff21018..5c95a3f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
Package: libxmu6
+Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 miscellaneous utility library
@@ -21,9 +22,10 @@ Description: X11 miscellaneous utility library
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
Package: libxmu6-dbg
+Section: libdevel
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmu6 (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmu6 (= ${binary:Version})
Description: X11 miscellaneous utility library (debug package)
libXmu provides a set of miscellaneous utility convenience functions for X
libraries to use. libXmuu is a lighter-weight version that does not depend
@@ -37,8 +39,9 @@ Description: X11 miscellaneous utility library (debug package)
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
Package: libxmu-dev
+Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxext-dev, libxt-dev, libxmu6 (= ${Source-Version}), libxmu-headers
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxext-dev, libxt-dev, libxmu6 (= ${binary:Version}), libxmu-headers
Description: X11 miscellaneous utility library (development headers)
libXmu provides a set of miscellaneous utility convenience functions for X
libraries to use. libXmuu is a lighter-weight version that does not depend
@@ -52,6 +55,7 @@ Description: X11 miscellaneous utility library (development headers)
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
Package: libxmuu1
+Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 miscellaneous micro-utility library
@@ -64,9 +68,10 @@ Description: X11 miscellaneous micro-utility library
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
Package: libxmuu1-dbg
+Section: libdevel
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmuu1 (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmuu1 (= ${binary:Version})
Description: X11 miscellaneous micro-utility library (debug package)
libXmuu provides a set of miscellaneous utility convenience functions for X
libraries to use. It is a lighter version of libXmu that does not depend
@@ -80,8 +85,9 @@ Description: X11 miscellaneous micro-utility library (debug package)
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
Package: libxmuu-dev
+Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmuu1 (= ${Source-Version}), libxmu-headers
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxmuu1 (= ${binary:Version}), libxmu-headers
Description: X11 miscellaneous micro-utility library (development headers)
libXmuu provides a set of miscellaneous utility convenience functions for X
libraries to use. It is a lighter version of libXmu that does not depend
@@ -95,6 +101,7 @@ Description: X11 miscellaneous micro-utility library (development headers)
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
Package: libxmu-headers
+Section: libdevel
Architecture: all
Depends: libx11-dev, x11proto-core-dev
Pre-Depends: x11-common (>= 1:7.0.0)
commit 75d296f74a17415c69d492e989b81093fc557209
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 12 13:24:33 2007 +0200
Fix name of the XS-Vcs-Browser field.
diff --git a/debian/changelog b/debian/changelog
index f1e58eb..04f1129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ libxmu (1:1.0.3-1) UNRELEASED; urgency=low
* New upstream release.
* Install the upstream changelog.
* Remove outdated CVS information from the package descriptions, and add
- XS-Vcs-Git and XS-Vcs-Browse.
+ XS-Vcs-Git and XS-Vcs-Browser.
-- Julien Cristau <jcristau@debian.org> Sat, 07 Apr 2007 17:18:18 +0200
diff --git a/debian/control b/debian/control
index 3b06303..ff21018 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>= 1:0.99.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/libxmu
-XS-Vcs-Browse: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
Package: libxmu6
Architecture: any
commit 18d8658e721142fb82c9de071758db694c0ecca3
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 7 17:18:45 2007 +0200
Add XS-Vcs-Browse header in debian/control.
diff --git a/debian/changelog b/debian/changelog
index 761a42d..f1e58eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,9 @@ libxmu (1:1.0.3-1) UNRELEASED; urgency=low
* New upstream release.
* Install the upstream changelog.
* Remove outdated CVS information from the package descriptions, and add
- XS-Vcs-Git.
+ XS-Vcs-Git and XS-Vcs-Browse.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 1 Feb 2007 05:38:52 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 07 Apr 2007 17:18:18 +0200
libxmu (1:1.0.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3268d47..3b06303 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>= 1:0.99.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/libxmu
+XS-Vcs-Browse: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
Package: libxmu6
Architecture: any
commit a8be2be88aad5935c7bef4ad682fe147abe752d8
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 1 05:40:02 2007 +0100
Drop obsolete CVS information and add XS-Vcs-Git to debian/control.
diff --git a/debian/changelog b/debian/changelog
index 1e7559d..761a42d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ libxmu (1:1.0.3-1) UNRELEASED; urgency=low
* New upstream release.
* Install the upstream changelog.
+ * Remove outdated CVS information from the package descriptions, and add
+ XS-Vcs-Git.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 1 Feb 2007 05:33:01 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 1 Feb 2007 05:38:52 +0100
libxmu (1:1.0.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0129fb3..3268d47 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>= 1:0.99.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/libxmu
Package: libxmu6
Architecture: any
@@ -17,9 +18,6 @@ Description: X11 miscellaneous utility library
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: libxmu6-dbg
Architecture: any
@@ -36,9 +34,6 @@ Description: X11 miscellaneous utility library (debug package)
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: libxmu-dev
Architecture: any
@@ -54,9 +49,6 @@ Description: X11 miscellaneous utility library (development headers)
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: libxmuu1
Architecture: any
@@ -69,9 +61,6 @@ Description: X11 miscellaneous micro-utility library
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: libxmuu1-dbg
Architecture: any
@@ -88,9 +77,6 @@ Description: X11 miscellaneous micro-utility library (debug package)
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: libxmuu-dev
Architecture: any
@@ -106,9 +92,6 @@ Description: X11 miscellaneous micro-utility library (development headers)
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
Package: libxmu-headers
Architecture: all
@@ -124,6 +107,3 @@ Description: X11 miscellaneous utility library headers
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'lib/Xmu' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
commit b3bca5df739fa8173e9e075ef049bed867bb7eeb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 1 05:33:33 2007 +0100
Update and install the upstream changelog.
diff --git a/ChangeLog b/ChangeLog
index 639a02b..2cf88f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,187 +1,236 @@
-2006-04-30 Matthieu Herrb <matthieu.herrb@laas.fr>
+commit a3e01af0f4b56b3b8891040cf0f7208265bbea2a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Nov 8 20:01:35 2006 +0200
- * src/Makefile.am
- Define BITMAPDIR for the case where ${prefix} != /usr
+ bump to 1.0.3
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
+commit 7beb4c2909af805e61d073a6f2b93234eb91834d
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 16:22:06 2006 -0400
- * configure.ac:
- Bump to 1.0.1
+ Bump to 1.0.2
-2006-03-20 Adam Jackson <ajax@freedesktop.org>
+commit 339368b404a807d1c494b260314da16d044986ff
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jul 13 14:59:01 2006 -0700
- * src/Makefile.am:
- Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz)
+ renamed: .cvsignore -> .gitignore
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 60620a4b7eeb004e55ba57aef8df33f6adc930f0
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Jul 3 19:33:05 2006 +0200
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Added README missing from CVS conversion.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 05a5c96fcef9822ff3c0312427d2c2672f73b551
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Apr 30 14:22:53 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Define BITMAPDIR for the case where ${prefix} != /usr
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0aa6a46099fb319c82da51b8a73566007ad5acbd
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Apr 27 00:18:38 2006 +0000
- * xmu.pc.in:
- * xmuu.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.
+ Bump to 1.0.1
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7bb6398aa024d782706125bebd93468f9cc8a0ec
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Mar 20 19:57:04 2006 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz)
-2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 78ab364fec59fa84ac914d51628dfb8ac4a048a5
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:30 2005 +0000
- * Makefile.am:
- Add missing file to EXTRA_DIST
+ Update package version number for final X11R7 release candidate.
-2005-07-08 Keith Packard <keithp@keithp.com>
+commit 1d93f5a9968e6e9af8f15c60107b1691009d1bd8
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:44 2005 +0000
- * .cvsignore:
- * include/.cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
+ Update package version number for X11R7 RC3 release.
-2005-05-21 Alan Coopersmith <alan.coopersmith@sun.com>
+commit 5a807bcce047a8072db2c0cef05a84aa6e6cd3ca
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:42 2005 +0000
- * configure.ac:
- Add XTRANS_CONNECTION_FLAGS to get network transport #defines
- for CvdStdSel.c
- * src/Makefile.am:
- Add libXmuu_la_LIBADD
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
-2005-01-29 Daniel Stone <daniel@freedesktop.org>
+commit c50ca633b633d25ba672fb19ac182cea40242069
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:11 2005 +0000
- * CvtStdSel.c (get_os_name):
- Change uname == 0 to uname >= 0 (X.Org HEAD).
+ Update package version number for RC1 release.
- * include/X11/Xmu/SysUtil.h:
- * include/X11/Xmu/Xmu.h:
- Add gcc format attribute (X.Org HEAD).
+commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 5 19:57:36 2005 +0000
-2005-01-01 Phil Blundell <philb@gnu.org>
+ Add missing file to EXTRA_DIST
- * configure.ac (XMUU_CFLAGS, XMUU_LIBS): New.
- * xmuu.pc.in: Use XMUU_CFLAGS+XMUU_LIBS, not XMU_CFLAGS+XMU_LIBS.
+commit bf4087e453d8fd83630976cd6e7e31c63737a4a1
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Oct 3 20:55:36 2005 +0000
-2004-05-17 Eric Anholt <anholt@FreeBSD.org>
+ Remvoe README file that is symlinked from monolith
- * EditresCom.c:
- * WidgetNode.c: (XmuWnFetchResources):
- Axe the Xaw header dependency again.
+commit 82b5da0b34780df3fe91c4b617cb541ee767d794
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 30 19:15:16 2005 +0000
-2004-05-10 Eric Anholt <anholt@FreeBSD.org>
+ Add -D flags to clear various warnings (Stefan Dirsch)
- * configure.ac:
- * xmu.pc.in:
- * xmuu.pc.in:
- Properly include LIBS/CFLAGS in .pc and linking.
- Bump to version 6.2.3.
+commit 43f43567e3c8c63f6b70d7e529827cd5f15e15d3
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:52 2005 +0000
-2004-04-13 Daniel Stone <daniel@freedesktop.org>
+ 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
- * EditresCom.c:
- X11R6.7 merge - various minor cleanups.
+commit e9ee49d99a20458e5f36bba48a7ea65bb5230a8d
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Jul 16 07:16:27 2005 +0000
- * Bump version to 6.2.2 for xlibs 1.0.1.
+ Set soversions to 6.2.0 and 1.0.0 with -version-number.
-2004-03-17 Carlos Romero <kidcrash@bellsouth.net>
+commit 81f5815d0c42b7065eb8e5aeef8e115e7398128f
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jul 9 06:43:26 2005 +0000
- (Commit sponsored by Daniel Stone.)
- * Makefile.am:
- * xmu.pc.in:
- * configure.ac:
- Various cleanups to build system, including correct use of pkg-config.
+ Add .cvsignore files
-2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
+commit 56ef5803a7def4f0d08ce8863e317b250c9c0ce4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Jul 3 07:00:57 2005 +0000
- * ChangeLog
- Caught up on all missing by me starting Dec. 16.
+ Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
+ Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
+ Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
+ source files in the xserver/xorg tree, predicated on defines of
+ HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
+ <X11/fonts/foo.h>.
-2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
+commit 5a64c1de0a1d620039afbb0805ae23f10470e815
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun May 22 19:06:20 2005 +0000
- * Makefile.am
- * configure.ac
- Fix versions for Xmu and Xmuu libraries. Using
- -version-number 6:2:1 for Xmu. And using -version-info
- 1:0:1 for Xmuu. (This may be out of order, need to test
- again.)
+ Add XTRANS_CONNECTION_FLAGS to get network transport #defines for
+ CvdStdSel.c
+ Add libXmuu_la_LIBADD
-2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
+commit 506a8f64c84b3db3ad64d03ee698c1de227247de
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun May 22 04:36:38 2005 +0000
- * configure.ac
- * xmu.pc.in
- * xmuu.pc.in
- Fix LIBS and CFLAGS for xmuu.pc.in and xmu.pc.in. Also use
- pkgconfig info for Xt for xmu.pc.in.
+ Move #ifdef HAVE_CONFIG_H outside of #ifdef SYSVNET
-2003-12-23 Jeremy C. Reed <reed@reedmedia.net>
+commit 9ca353477c403ab1341e994a5a42a998d29e9a58
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:22:32 2005 +0000
- * EditresCom.c
- * WidgetNode.c
- Get rid of X11/Xaw/Cardinals.h include. Xmu should
- not depend on Xaw to build, because Xaw needs many Xmu
- functions to build. In WidgetNode.c, define ZERO (which
- X11/Xaw/Cardinals.h would define).
+ revert last change, didn't do right thing at all, sorry for the noise
-2003-12-17 Jeremy C. Reed <reed@reedmedia.net>
+commit 0a662934f050cff90e82d463ec809c3758b260b1
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:10:08 2005 +0000
- * Makefile.am
- Don't repeat source filenames for both Xmu and Xmuu.
- Just list in libXmuu_la_SOURCES; and use that variable in
- the libXmu_la_SOURCES list. (As suggested by keithp on
- xlibs@ list.)
+ Require automake 1.7 in AM_INIT_AUTOMAKE
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit 2e403190ff21b0bb277391a73741cfc6d5005ac3
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed May 18 19:38:36 2005 +0000
- * .cvsignore
- Add two ltconfig related files for CVS to ignore.
+ - Add Xmu build system
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit 7cea083d37cfaaad321bddca0fb75b3308956938
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed May 18 19:30:41 2005 +0000
- * Lower.c
- Comment out snprintf.c include. (Maybe as a temporary
- workaround.) Later, maybe have autoconf check for it.
+ - Add Xmu to symlink.sh
+ - Conditionally include config.h in Xmu sources
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit ab0973b4595cfe27c81202bfb4a148780b05bb02
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Wed Dec 22 08:28:16 2004 +0000
- * INSTALL
- Add autoconf (./configure) INSTALL instructions.
+ Bug #2123 <https://bugs.freedesktop.org/show_bug.cgi?id=2123> Attachment
+ #1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587> Call to
+ uname should not check for return == 0, but for >= 0 instead
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit ece6cefc8e0238071f89de520d4a969fede53bd6
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Tue May 18 04:45:29 2004 +0000
- * AUTHORS
- * COPYING
- * ChangeLog
- * Makefile.am
- * NEWS
- * autogen.sh
- * configure.ac
- * xmu.pc.in
- * xmuu.pc.in
- Add beginnings of autoconf/automake/pkgconfig framework for Xmu
- and mini Xmu (Xmuu).
+ Remove Xaw header dependency from Xmu library build.
+ http://freedesktop.org/cgi-bin/bugzilla/attachment.cgi?bugid=634
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit 51156051e17f4ec53cbfe34f3a79f38d5884b78d
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 18:43:45 2004 +0000
- * include/Makefile.am
- Using automake/autoconf for headers. (Note that
- headers from original xc/Xmu were moved in CVS to this
- Xmu/include/X11/Xmu/ directory.)
+ Merging XORG-CURRENT into trunk
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit 832c5a7d7b07b88f6468daabae56d9daeeee0db8
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:32:24 2004 +0000
- * include/.cvsignore
- Add .cvsignore for CVS to ignore Makefile and Makefile.in.
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
-2003-12-16 Jeremy C. Reed <reed@reedmedia.net>
+commit 410cf462f4a8733c58303de686f07fbd98f2e30e
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:11:29 2004 +0000
- * .cvsignore
- Add .cvsignore to list files that should be ignored by CVS.
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit b00bc81852e56578939fb4d63796f8e0cd187cbf
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:33 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit aa59d04a1a50b5978e886c2e7248f77bea515ce0
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:22:44 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 0d10732a71487293bd70c2675ced6bffb6093c8d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:06 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 6b975651aef1797eb795bd876486c565c52f66fd
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 865329b4e079334b4cb846347ab9a572ac946228
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 709dda59a506e0c4ad17b085aa381f35cd86176f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
+
+commit e3925d3087dc381a24b47c5602e086645e942fcf
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:39 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/debian/changelog b/debian/changelog
index f1a71c5..1e7559d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
libxmu (1:1.0.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Install the upstream changelog.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 1 Feb 2007 05:25:58 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 1 Feb 2007 05:33:01 +0100
libxmu (1:1.0.2-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 13dd39a..73f3782 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_link
dh_strip -Nlibxmu6 -Nlibxmuu1
dh_strip -plibxmu6 --dbg-package=libxmu6-dbg
commit aababa2bed50f8ee5e1979f9cfbfca6612071e24
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 1 05:29:23 2007 +0100
autoreconf
diff --git a/INSTALL b/INSTALL
index 54caf7c..23e5f25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
- This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- These are generic installation instructions.
+These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -67,9 +70,9 @@ The simplest way to compile this package is:
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -82,7 +85,7 @@ is an example:
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+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
@@ -99,19 +102,19 @@ for another architecture.
Installation Names
==================
- By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -156,7 +159,7 @@ where SYSTEM can have one of these forms:
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -186,14 +189,18 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+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:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
diff --git a/Makefile.in b/Makefile.in
index 45e6bd2..94efc6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am,v 1.1 2005/05/18 19:38:35 sandmann Exp $
+# $Id$
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -42,7 +42,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/xmu.pc.in $(srcdir)/xmuu.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh ltmain.sh missing
+ 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
@@ -50,7 +51,7 @@ 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
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = xmu.pc xmuu.pc
SOURCES =
@@ -113,6 +114,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+GREP = @GREP@
HAS_SNPRINTF = @HAS_SNPRINTF@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -146,13 +148,9 @@ XMUU_CFLAGS = @XMUU_CFLAGS@
XMUU_LIBS = @XMUU_LIBS@
XMU_CFLAGS = @XMU_CFLAGS@
XMU_LIBS = @XMU_LIBS@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -169,23 +167,30 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff --git a/aclocal.m4 b/aclocal.m4
index b4818e4..f18ffa3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1397,18 +1397,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
Reply to: