libxmu: Changes to 'debian-unstable'
.gitignore | 73
ChangeLog | 336 ++
Makefile.am | 16
README | 6
configure.ac | 29
debian/changelog | 14
debian/control | 4
debian/libxmu-headers.install | 1
debian/rules | 10
doc/.gitignore | 6
doc/Makefile.am | 62
doc/Xmu.xml | 4727 ++++++++++++++++++++++++++++++++++++++++++
doc/xlogo.svg | 45
include/Makefile.am | 3
include/X11/Xmu/Atoms.h | 3
include/X11/Xmu/CharSet.h | 4
include/X11/Xmu/CloseHook.h | 3
include/X11/Xmu/Converters.h | 4
include/X11/Xmu/CurUtil.h | 3
include/X11/Xmu/CvtCache.h | 3
include/X11/Xmu/DisplayQue.h | 3
include/X11/Xmu/Drawing.h | 3
include/X11/Xmu/Editres.h | 3
include/X11/Xmu/EditresP.h | 3
include/X11/Xmu/Error.h | 3
include/X11/Xmu/ExtAgent.h | 3
include/X11/Xmu/Initer.h | 3
include/X11/Xmu/Lookup.h | 4
include/X11/Xmu/Misc.h | 2
include/X11/Xmu/StdCmap.h | 3
include/X11/Xmu/StdSel.h | 3
include/X11/Xmu/SysUtil.h | 9
include/X11/Xmu/WhitePoint.h | 2
include/X11/Xmu/WidgetNode.h | 3
include/X11/Xmu/WinUtil.h | 3
include/X11/Xmu/Xct.h | 3
include/X11/Xmu/Xmu.h | 10
src/AllCmap.c | 3
src/Atoms.c | 3
src/ClientWin.c | 3
src/Clip.c | 1
src/CloseHook.c | 3
src/CmapAlloc.c | 3
src/CrCmap.c | 3
src/CrPixFBit.c | 3
src/CursorName.c | 3
src/CvtCache.c | 3
src/CvtStdSel.c | 4
src/DefErrMsg.c | 4
src/DelCmap.c | 3
src/DisplayQue.c | 3
src/Distinct.c | 3
src/DrRndRect.c | 3
src/DrawLogo.c | 3
src/EditresCom.c | 3
src/ExtAgent.c | 3
src/FToCback.c | 3
src/GetHost.c | 3
src/GrayPixmap.c | 3
src/Initer.c | 3
src/LocBitmap.c | 3
src/Lookup.c | 3
src/LookupCmap.c | 3
src/Lower.c | 4
src/RdBitF.c | 3
src/ScrOfWin.c | 3
src/ShapeWidg.c | 3
src/StdCmap.c | 3
src/StrToBS.c | 4
src/StrToBmap.c | 3
src/StrToCurs.c | 4
src/StrToGrav.c | 3
src/StrToJust.c | 4
src/StrToLong.c | 3
src/StrToOrnt.c | 4
src/StrToShap.c | 3
src/StrToWidg.c | 3
src/UpdMapHint.c | 3
src/VisCmap.c | 3
src/WidgetNode.c | 4
src/Xct.c | 3
src/sharedlib.c | 3
82 files changed, 5295 insertions(+), 261 deletions(-)
New commits:
commit 0eef98205771d69cea4123f631929e227333a8c0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 08:42:39 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 95fe6a6..f837cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxmu (2:1.1.0-1) UNRELEASED; urgency=low
+libxmu (2:1.1.0-1) unstable; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
@@ -10,7 +10,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* Kill *.xml in the doc directory, no point in shipping them.
* Switch from --list-missing to --fail-missing for additional safety.
- -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 08:42:29 +0100
libxmu (2:1.0.5-2) unstable; urgency=high
commit 9346d182432efc8075e4ca5fa0abc352477ce097
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 08:41:27 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 8eeefc2..95fe6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
libxmu-headers.install file.
* Remove the hardcoded path to the X logo in the Xmu.html file.
* Kill *.xml in the doc directory, no point in shipping them.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/rules b/debian/rules
index 122c2b9..faf789d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: install
dh_testroot
dh_installdocs -s
- dh_install -s --sourcedir=debian/tmp --list-missing -Xusr/include -X.la
+ dh_install -s --sourcedir=debian/tmp --fail-missing -Xusr/include -X.la
dh_installchangelogs -s ChangeLog
dh_link -s
dh_strip -Nlibxmu6 -Nlibxmuu1
commit 212867b79e75482652948f8f4b78295bf39094e9
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 08:40:49 2010 +0100
Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/changelog b/debian/changelog
index 2fe37fc..8eeefc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* Pass --docdir=/usr/share/doc/libxmu-headers and add this directory to
libxmu-headers.install file.
* Remove the hardcoded path to the X logo in the Xmu.html file.
+ * Kill *.xml in the doc directory, no point in shipping them.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/rules b/debian/rules
index d544eb5..122c2b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,8 @@ install: build
# hardcoded path to the logo (in the build directory):
sed -i 's,data="\S*/xlogo.svg",data="xlogo.svg",' \
debian/tmp/usr/share/doc/libxmu-headers/Xmu.html
+ # No need to keep '*.xml' around:
+ find debian/tmp/usr/share/doc/libxmu-headers -name '*.xml' -delete
# Build architecture-dependent files here.
binary-arch: install
commit 74640225d134fd79554634719aba8a14bdfd538f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 08:40:38 2010 +0100
Remove the hardcoded path to the X logo in the Xmu.html file.
diff --git a/debian/changelog b/debian/changelog
index f5e0ce2..2fe37fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* Pass --with-xmlto and --without-fop (we want html and txt only).
* Pass --docdir=/usr/share/doc/libxmu-headers and add this directory to
libxmu-headers.install file.
+ * Remove the hardcoded path to the X logo in the Xmu.html file.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/rules b/debian/rules
index fb3545a..d544eb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,10 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ # Post-process the generated html file, get rid of the
+ # hardcoded path to the logo (in the build directory):
+ sed -i 's,data="\S*/xlogo.svg",data="xlogo.svg",' \
+ debian/tmp/usr/share/doc/libxmu-headers/Xmu.html
# Build architecture-dependent files here.
binary-arch: install
commit fa05ec1dc465d96878381a9adb3b4ff53a59f7d0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 02:09:01 2010 +0100
Pass --docdir=/usr/share/doc/libxmu-headers and add this directory to libxmu-headers.install file.
diff --git a/debian/changelog b/debian/changelog
index 289f1f6..f5e0ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
* Pass --with-xmlto and --without-fop (we want html and txt only).
+ * Pass --docdir=/usr/share/doc/libxmu-headers and add this directory to
+ libxmu-headers.install file.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/libxmu-headers.install b/debian/libxmu-headers.install
index 097e3db..514fd32 100644
--- a/debian/libxmu-headers.install
+++ b/debian/libxmu-headers.install
@@ -1 +1,2 @@
usr/include/X11/*
+usr/share/doc/libxmu-headers
diff --git a/debian/rules b/debian/rules
index 49e3dcb..fb3545a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ build-stamp: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --docdir=\$${prefix}/share/doc/libxmu-headers \
--with-xmlto --without-fop \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
commit b77936253ee053b0d6513091a74f929002ad5593
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 01:52:13 2010 +0100
Pass --with-xmlto and --without-fop (we want html and txt only).
diff --git a/debian/changelog b/debian/changelog
index 0f56735..289f1f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
+ * Pass --with-xmlto and --without-fop (we want html and txt only).
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/rules b/debian/rules
index 8743212..49e3dcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ build-stamp: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --with-xmlto --without-fop \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
commit 2bf88089e359737a02f5e0067d77f89836aceeba
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 01:51:18 2010 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
diff --git a/debian/changelog b/debian/changelog
index 2e96dbd..0f56735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
+ * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/control b/debian/control
index 0c410b3..02dd8af 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
+# devel-docs:
+ xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
commit 51e0e62a9a35a3f4e8df758e1d33d3def2015eb6
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 01:49:37 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index e37c839..2e96dbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxmu (2:1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
diff --git a/debian/control b/debian/control
index ed950c4..0c410b3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git
commit 2fb8623f404c71273f0074275cc43bd4bfb05919
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 01:49:20 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 78379de..e2de801 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,339 @@
+commit 5d9b0896bfdfe60656a2d806a06e17c7adf335b5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 29 16:52:54 2010 -0700
+
+ libXmu 1.1.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 28f4666ad88ab736f52c1cb16674226f14bc2a15
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 28 12:24:30 2010 -0700
+
+ Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC is handled by XORG_DEFAULT_OPTIONS
+ AC_SUBST of *_LIBS & *_CFLAGS are handled by PKG_CHECK_MODULES
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1ab19053c75b44be9c49700b1190dd5d8da152ce
+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 75a065b9b8145bac20d9080cb5237a25bb3ad190
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Aug 3 13:23:32 2010 -0400
+
+ specs: xsl stylesheet requires abs path to images
+
+ Using abs_builddir requires automake 1.10 or later.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b56c3e61038c7cdb49bdb40455c2b3a12ae35d3c
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:00:53 2010 -0300
+
+ Purge macro NEED_EVENTS
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e721c444a8268db0406e26d65e0a4746c477750f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 25 15:06:39 2010 -0400
+
+ config: use HAVE_XMLTO_TEXT from XORG_WITH_XMLTO
+
+ Skip text format when XMLTO dependencies for text format
+ are missing (lynx, links or w3m)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 449bc79585f324c5695f379def1e57fe9fcec2e6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 25 15:02:59 2010 -0400
+
+ config: use HAVE_STYLESHEET now defined in XORG_CHECK_SGML_DOCTOOLS
+
+ Also use STYLESHEET_SRCDIR XSL_STYLESHEET
+
+ This requires version 1.10 of util-macros
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 167c191895d956831f76ece5f2bdbef8cea4ed45
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 25 14:10:58 2010 -0400
+
+ config: move docs ignore from toplevel .gitignore to /doc
+
+ Also add missing *.css
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2d8fa1b7905bbbc37f42f651ed1f881359ac6a09
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 23 08:02:08 2010 -0700
+
+ Add xorg.css to CLEANFILES to pass make distcheck
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f7e752f3842fddff907901cccb45dde77c297d20
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 15 22:06:15 2010 -0700
+
+ Use shared stylesheets from xorg-sgml-doctools instead of a private copy
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ffef5f4ee489a7f2d228601ee351bc2445436304
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jun 19 22:34:50 2010 -0700
+
+ Add some cross-reference links and an index to the docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0a198dd15c7963f7b9be094370761cac368d9292
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 9 15:48:58 2010 -0700
+
+ Xmu.xml: Compilers that can't handle void are now ancient history
+
+ Plus a bonus it's -> its typo fix
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit dc02453cde3047bce48a8ca23c27c807642b1670
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 9 11:30:17 2010 -0700
+
+ Use _X_ATTRIBUTE_PRINTF from Xfuncproto.h in Xmu headers
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit eb8ed42cc7f40d8dd506aeebb759dd99dac1552e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 9 11:25:12 2010 -0700
+
+ Document which functions are in libXmu vs. libXmuu
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bde1baeddb216b7ab6322646d9bdf3bb629c4c25
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 9 11:04:17 2010 -0700
+
+ Add XmuNCopyISOLatin1Lowered & XmuNCopyISOLatin1Uppered to doc/Xmu.xml
+
+ Also add notes to the originals warning about buffer overflow
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6b98e89515ba0ee755bdc9c4783b84b464d2a10c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 9 10:50:23 2010 -0700
+
+ Update docs to match headers
+
+ - caddr_t is now XPointer
+ - a number of char * arguments are now unsigned char * or constified
+ - XmuLookup* functions are in Lookup.h, so split into new section
+
+ There are still a bunch of headers with undocumented functions/#defines:
+ - CvtCache.h
+ - EditresP.h
+ - ExtAgent.h
+ - Misc.h
+ - WhitePoint.h
+ - Xmu.h
+ - some of the functions in Converters.h
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 13409196c36151e4b5212ae08e6cfda6d7c93696
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 9 10:23:08 2010 -0700
+
+ Add XmuSnprintf to doc/Xmu.xml
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a4a87ddfa4948c3f5c210ab7a472b65569ae0e64
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 21:20:58 2010 -0700
+
+ Show X logo as a figure for XmuDrawLogo
+
+ Because we can.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5e22a1fb7c2bae8d5b393b95b253c865c9eed309
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 16:51:41 2010 -0700
+
+ Fix distcheck (forgot to mark Xmu.xml as dist_*)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f38c2c057ebca8ca4afc2cb8fb835702bdba4fc6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 16:25:49 2010 -0700
+
+ Correct some minor typos in original document
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 70596fce92bd58d46e19de63b6c3faca38cbc181
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 16:19:49 2010 -0700
+
+ Convert Xmu.ms to DocBook/xml
+
+ Bumps xorg-macros requirement to 1.6 for XORG_ENABLE_DOCS & friends
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 868ed2d97150aed414a7fd8f5dc317b8f38b05fd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jun 7 15:51:32 2010 -0700
+
+ Move doc/Xmu.ms from xorg-docs module
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit af962b3bed9d3c42cf81946a5732f0d37d1843e8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed May 26 17:01:57 2010 -0400
+
+ config: add WhitePoint.h to the include headers
+
+ This file was added in commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26
+ because it was missing from the tarball. It was added to
+ EXTRA_DIST so it never got installed in $includedir.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bae14e85d90a4ea040cb1b25ba89c98a0ebe1670
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Apr 5 20:10: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 a6210dd05cfe92d0af2e23358851c3a38c2aaca6
+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 1de26ffbdec68f8ca6aa2448869a323bcceda26d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 27 16:19:35 2010 -0400
+
+ config: remove execute permission on source C file
+
+ Introduced in 85f77401635dfa57d40de89aa2c9f39a344a8d3b
+ "Fix build problems on WIN32 platforms"
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d2702478f3d36fb3053b9796657310750e5e5738
+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 8d5e9bd04c8cc90a262223f8a16c4ac7c0c66c2d
+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 80650c71c06b87e8a5ff0122c1f2bf7798ab2e96
+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 1dba944c770fcc4b276641e0ae01e2e4371dc101
+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 854456de21a1e722edd5e03ba8467107401fd7b6
+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 ab323caeb2b763abc8986fe71531dedb62ec9720
+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 c2c76abe51878f55e22c44c747f1243e56a4344b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 23 17:53:41 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 85c8e93..e37c839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxmu (2:1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 01:49:07 +0100
+
libxmu (2:1.0.5-2) unstable; urgency=high
[ Julien Cristau ]
commit 5d9b0896bfdfe60656a2d806a06e17c7adf335b5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 16:52:54 2010 -0700
libXmu 1.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c75a452..69ea570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
AC_PREREQ([2.60])
AC_INIT([libXmu],
- [1.0.5],
+ [1.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXmu])
commit 28f4666ad88ab736f52c1cb16674226f14bc2a15
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:24:30 2010 -0700
Remove unnecessary calls from configure.ac
AC_PROG_CC is handled by XORG_DEFAULT_OPTIONS
AC_SUBST of *_LIBS & *_CFLAGS are handled by PKG_CHECK_MODULES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5ed4864..c75a452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,16 +30,10 @@ AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_LIBTOOL
-AC_PROG_CC
# Checks for pkg-config packages
PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
-AC_SUBST(XMU_CFLAGS)
-AC_SUBST(XMU_LIBS)
-
PKG_CHECK_MODULES(XMUU, x11)
-AC_SUBST(XMUU_CFLAGS)
-AC_SUBST(XMUU_LIBS)
# CvtStdSel.c needs to know which network transports to build hostname
# conversion routines for
commit 1ab19053c75b44be9c49700b1190dd5d8da152ce
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>
diff --git a/include/X11/Xmu/Atoms.h b/include/X11/Xmu/Atoms.h
index f7b4c8f..3d86910 100644
--- a/include/X11/Xmu/Atoms.h
+++ b/include/X11/Xmu/Atoms.h
@@ -1,5 +1,3 @@
-/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
/*
* The interfaces described by this header file are for miscellaneous utilities
diff --git a/include/X11/Xmu/CharSet.h b/include/X11/Xmu/CharSet.h
index 32cebfe..1ce9166 100644
--- a/include/X11/Xmu/CharSet.h
+++ b/include/X11/Xmu/CharSet.h
@@ -1,5 +1,3 @@
-/* $Xorg: CharSet.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.7 2001/01/17 19:42:53 dawes Exp $ */
-
/*
* The interfaces described by this header file are for miscellaneous utilities
* and are not part of the Xlib standard.
diff --git a/include/X11/Xmu/CloseHook.h b/include/X11/Xmu/CloseHook.h
index 1940a79..2481ebf 100644
--- a/include/X11/Xmu/CloseHook.h
+++ b/include/X11/Xmu/CloseHook.h
@@ -1,5 +1,3 @@
-/* $Xorg: CloseHook.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.6 2001/01/17 19:42:53 dawes Exp $ */
/*
* The interfaces described by this header file are for miscellaneous utilities
diff --git a/include/X11/Xmu/Converters.h b/include/X11/Xmu/Converters.h
index 11055d9..3779750 100644
--- a/include/X11/Xmu/Converters.h
+++ b/include/X11/Xmu/Converters.h
@@ -1,5 +1,3 @@
-/* $Xorg: Converters.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/Converters.h,v 1.5 2001/01/17 19:42:53 dawes Exp $ */
-
/*
* The interfaces described by this header file are for miscellaneous utilities
* and are not part of the Xlib standard.
diff --git a/include/X11/Xmu/CurUtil.h b/include/X11/Xmu/CurUtil.h
index 27ab188..3524d77 100644
--- a/include/X11/Xmu/CurUtil.h
+++ b/include/X11/Xmu/CurUtil.h
@@ -1,5 +1,3 @@
-/* $Xorg: CurUtil.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */
/*
* The interfaces described by this header file are for miscellaneous utilities
diff --git a/include/X11/Xmu/CvtCache.h b/include/X11/Xmu/CvtCache.h
index d9b967a..7441e2f 100644
--- a/include/X11/Xmu/CvtCache.h
+++ b/include/X11/Xmu/CvtCache.h
@@ -1,5 +1,3 @@
-/* $Xorg: CvtCache.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1989, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.6 2001/01/17 19:42:54 dawes Exp $ */
/*
* Public Interfaces
diff --git a/include/X11/Xmu/DisplayQue.h b/include/X11/Xmu/DisplayQue.h
index 9f9013c..b37a581 100644
--- a/include/X11/Xmu/DisplayQue.h
+++ b/include/X11/Xmu/DisplayQue.h
@@ -1,5 +1,3 @@
-/* $Xorg: DisplayQue.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.5 2001/01/17 19:42:54 dawes Exp $ */
#ifndef _XMU_DISPLAYQUE_H_
#define _XMU_DISPLAYQUE_H_
diff --git a/include/X11/Xmu/Drawing.h b/include/X11/Xmu/Drawing.h
index 9ffed3b..91d764b 100644
--- a/include/X11/Xmu/Drawing.h
+++ b/include/X11/Xmu/Drawing.h
@@ -1,5 +1,3 @@
-/* $Xorg: Drawing.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.6 2001/12/14 19:55:42 dawes Exp $ */
/*
* The interfaces described by this header file are for miscellaneous utilities
diff --git a/include/X11/Xmu/Editres.h b/include/X11/Xmu/Editres.h
index 2a3f3e2..0c1ffe0 100644
--- a/include/X11/Xmu/Editres.h
+++ b/include/X11/Xmu/Editres.h
@@ -1,5 +1,3 @@
-/* $Xorg: Editres.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1991, 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/Editres.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
#include <X11/Xfuncproto.h>
diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h
index 886205b..6f7c739 100644
--- a/include/X11/Xmu/EditresP.h
+++ b/include/X11/Xmu/EditresP.h
@@ -1,5 +1,3 @@
-/* $Xorg: EditresP.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1989, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
/*
* Author: Chris D. Peterson, MIT X Consortium
diff --git a/include/X11/Xmu/Error.h b/include/X11/Xmu/Error.h
index f992930..c69bf14 100644
--- a/include/X11/Xmu/Error.h
+++ b/include/X11/Xmu/Error.h
@@ -1,5 +1,3 @@
-/* $Xorg: Error.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/Error.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
/*
* The interfaces described by this header file are for miscellaneous utilities
diff --git a/include/X11/Xmu/ExtAgent.h b/include/X11/Xmu/ExtAgent.h
index b0caf36..b300140 100644
--- a/include/X11/Xmu/ExtAgent.h
+++ b/include/X11/Xmu/ExtAgent.h
@@ -1,5 +1,3 @@
-/* $Xorg: ExtAgent.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1994,1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.5 2001/01/17 19:42:55 dawes Exp $ */
#include <X11/Intrinsic.h>
#include <X11/Xfuncproto.h>
diff --git a/include/X11/Xmu/Initer.h b/include/X11/Xmu/Initer.h
index 5e870af..2ba86e8 100644
--- a/include/X11/Xmu/Initer.h
+++ b/include/X11/Xmu/Initer.h
@@ -1,5 +1,3 @@
-/* $Xorg: Initer.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */
-
/*
Copyright 1988, 1998 The Open Group
Reply to: