libxmu: Changes to 'debian-unstable'
COPYING | 8
ChangeLog | 285 ++++++++++
configure.ac | 71 --
debian/changelog | 19
debian/control | 15
debian/rules | 9
doc/.gitignore | 3
doc/Makefile.am | 62 --
doc/Xmu.xml | 189 +++---
docbook.am | 105 +++
include/X11/Xmu/Atoms.h | 2
include/X11/Xmu/CharSet.h | 2
include/X11/Xmu/CloseHook.h | 2
include/X11/Xmu/Converters.h | 2
include/X11/Xmu/CurUtil.h | 2
include/X11/Xmu/CvtCache.h | 4
include/X11/Xmu/DisplayQue.h | 22
include/X11/Xmu/Drawing.h | 2
include/X11/Xmu/EditresP.h | 54 -
include/X11/Xmu/Error.h | 2
include/X11/Xmu/Initer.h | 2
include/X11/Xmu/Misc.h | 8
include/X11/Xmu/StdCmap.h | 2
include/X11/Xmu/StdSel.h | 2
include/X11/Xmu/WinUtil.h | 2
include/X11/Xmu/Xmu.h | 8
src/AllCmap.c | 20
src/Atoms.c | 14
src/ClientWin.c | 4
src/Clip.c | 2
src/CloseHook.c | 18
src/CmapAlloc.c | 26
src/CrCmap.c | 42 -
src/CursorName.c | 4
src/CvtCache.c | 6
src/CvtStdSel.c | 4
src/DefErrMsg.c | 14
src/DelCmap.c | 4
src/DisplayQue.c | 4
src/DrawLogo.c | 16
src/EditresCom.c | 1176 +++++++++++++++++++++----------------------
src/ExtAgent.c | 2
src/FToCback.c | 4
src/GrayPixmap.c | 10
src/Initer.c | 14
src/LocBitmap.c | 18
src/Lookup.c | 4
src/LookupCmap.c | 32 -
src/Lower.c | 11
src/Makefile.am | 4
src/RdBitF.c | 18
src/ShapeWidg.c | 6
src/StdCmap.c | 14
src/StrToBS.c | 4
src/StrToBmap.c | 10
src/StrToCurs.c | 46 -
src/StrToGrav.c | 6
src/StrToJust.c | 4
src/StrToLong.c | 2
src/StrToOrnt.c | 4
src/StrToShap.c | 4
src/UpdMapHint.c | 2
src/VisCmap.c | 6
src/WidgetNode.c | 6
src/Xct.c | 4
src/sharedlib.c | 6
66 files changed, 1402 insertions(+), 1077 deletions(-)
New commits:
commit eeb79d43bd71f760137207f90c6280fd354f209d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:58:13 2012 +0200
Add ${misc:Depends} to libxmu-headers.
diff --git a/debian/changelog b/debian/changelog
index b37cdaa..69be14d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxmu (2:1.1.1-2) UNRELEASED; urgency=low
+
+ * Add ${misc:Depends} to libxmu-headers.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:58:02 +0200
+
libxmu (2:1.1.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 3688f7c..054ff51 100644
--- a/debian/control
+++ b/debian/control
@@ -138,7 +138,10 @@ Package: libxmu-headers
Section: libdevel
Architecture: all
Multi-Arch: foreign
-Depends: libx11-dev, x11proto-core-dev
+Depends:
+ libx11-dev,
+ x11proto-core-dev,
+ ${misc:Depends},
Description: X11 miscellaneous utility library headers
libXmu and libXmuu are miscellaneous utility libraries for X library
developers to abstract some common functions. This package provides the
commit 3ec379c9ea4b64c4ed0025c1361d6634e878b69d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:50:22 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 3e3d15e..b37cdaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxmu (2:1.1.1-1) UNRELEASED; urgency=low
+libxmu (2:1.1.1-1) unstable; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
@@ -9,7 +9,7 @@ libxmu (2:1.1.1-1) UNRELEASED; urgency=low
* Remove David Nusinow from Uploaders.
* Bump debhelper build-dep for ${misc:Pre-Depends} usage.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:28:13 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:50:11 +0200
libxmu (2:1.1.0-3) unstable; urgency=low
commit 80ca71373e70939dea3446fbdadd5b0e0d171dbf
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:50:06 2012 +0200
Bump debhelper build-dep for ${misc:Pre-Depends} usage.
diff --git a/debian/changelog b/debian/changelog
index 99550bc..3e3d15e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libxmu (2:1.1.1-1) UNRELEASED; urgency=low
* Xmu.html no longer hardcodes the full path to xlogo.svg, drop sed call
from debian/rules.
* Remove David Nusinow from Uploaders.
+ * Bump debhelper build-dep for ${misc:Pre-Depends} usage.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:28:13 +0200
diff --git a/debian/control b/debian/control
index c3b8c7a..3688f7c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
dpkg-dev (>= 1.16.0),
libx11-dev (>= 1:0.99.2),
libxt-dev (>= 1:0.99.1),
commit 1beb79dfc7d49c07c8f121cde006b80a61620623
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:49:32 2012 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 806abc4..99550bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxmu (2:1.1.1-1) UNRELEASED; urgency=low
configure.ac.
* Xmu.html no longer hardcodes the full path to xlogo.svg, drop sed call
from debian/rules.
+ * Remove David Nusinow from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:28:13 +0200
diff --git a/debian/control b/debian/control
index f243013..c3b8c7a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxmu
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
dpkg-dev (>= 1.16.0),
commit 5c7b31e65b987935d054943ed48639958cb10844
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:44:11 2012 +0200
Stop calling sed on Xmu.html to change the xlogo.svg path
Xmu.html no longer hardcodes the full path to xlogo.svg, drop sed call
from debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 3faac3c..806abc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libxmu (2:1.1.1-1) UNRELEASED; urgency=low
* Don't require (fake)root for debian/rules clean.
* Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per
configure.ac.
+ * Xmu.html no longer hardcodes the full path to xlogo.svg, drop sed call
+ from debian/rules.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:28:13 +0200
diff --git a/debian/rules b/debian/rules
index f2e42ec..5f8fae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,10 +70,6 @@ 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
# No need to keep '*.xml' around:
find debian/tmp/usr/share/doc/libxmu-headers -name '*.xml' -delete
commit 469a92a31d066f92a74a8d5bdb7140cff2f11973
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:37:02 2012 +0200
Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per configure.ac.
diff --git a/debian/changelog b/debian/changelog
index ca38073..3faac3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libxmu (2:1.1.1-1) UNRELEASED; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
+ * Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per
+ configure.ac.
-- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:28:13 +0200
diff --git a/debian/control b/debian/control
index 4c145c8..f243013 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,11 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.5+4),
+ xutils-dev (>= 1:7.6+2),
# devel-docs:
- xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
+ xmlto (>= 0.0.22),
+ xorg-sgml-doctools (>= 1:1.8),
+ 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 347a36f3ef3db8e8fabf460661cb2fe9416b88a7
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:28:29 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index e2de801..0c62aa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,288 @@
+commit 6437d834cd66621e4e9f4decf7341b6d7ff45556
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Mar 5 23:00:10 2012 -0800
+
+ libXmu 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ccd9e64515d6fc7b5367d6d98ecd3abf5b084026
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 10 20:34:03 2011 -0800
+
+ Fix gcc -Wwrite-strings warnings (some, not all)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 72ac4c4a464b3aec21cdbe367c9d465cbe0f3ff1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 10 09:55:07 2011 -0800
+
+ Drop support for pre-ANSI-C89 preprocessors
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 004d535c707251bd4fb47426f90712c195c6dfc7
+Author: Matt Dew <marcoz@osource.org>
+Date: Tue Oct 4 20:51:48 2011 -0600
+
+ Cleanup IDs and links in doc
+
+ 1 - fix the capitalization of the ID attributes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit d7d2ad7dde7b2653aa1e08e9339674bc40f1560a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Sep 24 17:00:09 2011 -0700
+
+ Fix build with -DDEBUG
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=1069
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 66492163cb244fbe22c67bebb14c0918dd11eab6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 22:46:25 2011 -0700
+
+ Strip trailing whitespace
+
+ Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6ffa7e4bb1e7efdad4dd987e1fe27cdee96f7063
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 14:33:24 2011 -0400
+
+ docs: use appropriate markup for copyright statement
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7b2589d66d672d2585d3df4074ce64443f7e4b71
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 11:01:19 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 46cc8a399aa16d145a9141d2fa8172282e4b7211
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 01d2a55b4fd8e3743b1f396f81be6a06f6345ac5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 888135ef815766f0421438430ca40809e4f7e411
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Aug 7 21:20:26 2011 -0400
+
+ docbook pdf: add xsl parameter to locate images
+
+ Unlike html, pdf/ps requires a full path name to find images,
+ but only needs it to make an internal copy of it at build time.
+ The image can later be removed and the image still shows up in the pdf doc.
+ This allows us to use the absolute builddir.
+
+ This parameter must not be used for html which loads the image from disk
+ at user read time. The image is removed from builddir after build is done,
+ and we do not know where the image will be installed by the distro.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5ba82aec6547513ea182cbc6cb95b472bbfb9dc5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Aug 7 20:30:58 2011 -0400
+
+ Xmu.xml: Change layout of the X Logo figure
+
+ The floating does not come up right, the figure caption is in the way.
+ Move the figure out of the paragraph and below the text.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 08fb51c1db9c9693125f4c093d07abc94d6ce0f6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 12 18:39:46 2011 -0400
+
+ Install xml versions of specs even if HAVE_XMLTO is false
+
+ DocBook/XML input source is also a usefull output format that can be viewed
+ with an XML viewer or editor and by some O/S help system.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a70bedc470f5482dc64b947057e5120c2f322177
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 5 16:27:37 2011 -0400
+
+ Install target dbs alongside generated documents
+
+ This matches a change in xorg-sgml-docs whereby the masterdb will look for
+ the target dbs into the same location as the generated documents.
+
+ The target dbs are now installed alongside the generated documents.
+ Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
+ has the potential of installing outside the package prefix and cause
+ distcheck to fail when user does not have write permission in this package.
+
+ Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
+
+commit 3f3c9a60381371f60a174497ea6d5d90abea4261
+Author: Matt Dew <marcoz@osource.org>
+Date: Tue May 31 20:03:23 2011 -0600
+
+ Add id attributes to funcsynopsis to allow other docs to olink to them.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4000666e864e477e712caa0f0c0a5d09006c7752
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Feb 27 15:06:18 2011 -0500
+
+ Documentation: add Docbook external references support
+
+ When writing technical documentation, it is often necessary to cross
+ reference to other information. When that other information is not in the
+ current document, additional support is needed, namely <olink>.
+
+ A new feature with version 1.7 of xorg-sgml-doctools adds references to
+ other documents within or outside this package.
+
+ This patch adds technical support for this feature but does not change
+ the content of the documentation as seen by the end user.
+
+ Each book or article must generate a database containing the href
+ of sections that can be referred to from another document. This database
+ is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
+ the value of DATAROOTDIR for xorg-sgml-doctools and for the package
+ documentation is the same. This forms a virtual document tree.
+
+ This database is consulted by other documents while they are being generated
+ in order to fulfill the missing information for linking.
+ Refer to the xorg-sgml-doctools for further technical information.
+
+ Co-authored-by: Matt Dew <marcoz@osource.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 6ab92082d5f6c842b578a9fe1f9888ed3339336a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Feb 10 22:06:52 2011 -0800
+
+ Make EditresCom.c identation a lot less random
+
+ 2 spaces! No 4! 2! 3! No, Blue! Red! Aughughurglrgll...
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 70ca0ef2cc0ec84308792a7b184e90c5cb358278
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 19:51:54 2011 -0500
+
+ config: remove config test for snprintf
+
+ The macro HAS_SNPRINTF is hard coded to always be defined.
+ If it were not defined, Lower.c would include snprintf.c
+ which does not exist. Seems to be relics from IMakefile
+
+ Other modules are using snprintf unconditionally.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9f57096dd0881651de3b710b182db59091e6f421
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:43 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1be35fb51871f314bef673975c2be94e5e427696
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9bd47f1db85b0c997389609ad26a2766f5aeeff5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 16:34:14 2011 -0500
+
+ config: remove unrequired AC_CONFIG_AUX_DIR
+
+ The default location for the generation of configuation files is the current
+ package root directory. These files are config.* and friends.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2f00ed22d17592b963fabd925dba90f2a003d801
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Dec 5 00:13:25 2010 -0800
+
+ XmuCvtStringToCursor: sprintf -> snprintf & check for XtMalloc failure
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 813ee0dcecc89d3f334d8747b171c71e34a7671e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Nov 9 13:04:57 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 5d9b0896bfdfe60656a2d806a06e17c7adf335b5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 16:52:54 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 123d1c4..ca38073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libxmu (2:1.1.0-4) UNRELEASED; urgency=low
+libxmu (2:1.1.1-1) UNRELEASED; urgency=low
+ * New upstream release.
* Don't require (fake)root for debian/rules clean.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:26:53 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:28:13 +0200
libxmu (2:1.1.0-3) unstable; urgency=low
commit a62cecdfdaccd017e286d4f381797c532a41eb93
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 21 10:27:02 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index b533395..123d1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxmu (2:1.1.0-4) UNRELEASED; urgency=low
+
+ * Don't require (fake)root for debian/rules clean.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2012 10:26:53 +0200
+
libxmu (2:1.1.0-3) unstable; urgency=low
* Build for multiarch.
diff --git a/debian/rules b/debian/rules
index 8294e9b..f2e42ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,9 +52,7 @@ build-stamp: configure
clean: xsfclean
dh_testdir
- dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -62,8 +60,7 @@ clean: xsfclean
rm -rf build
rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
- rm -f $$(find -name Makefile.in)
-
+ find -name Makefile.in -delete
dh_clean
install: build
commit 6437d834cd66621e4e9f4decf7341b6d7ff45556
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Mar 5 23:00:10 2012 -0800
libXmu 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 932a5c2..17fff03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXmu], [1.1.0],
+AC_INIT([libXmu], [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit ccd9e64515d6fc7b5367d6d98ecd3abf5b084026
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 20:34:03 2011 -0800
Fix gcc -Wwrite-strings warnings (some, not all)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h
index 61ec51d..ed9dd41 100644
--- a/include/X11/Xmu/EditresP.h
+++ b/include/X11/Xmu/EditresP.h
@@ -335,7 +335,7 @@ _XFUNCPROTOBEGIN
void _XEditResPutString8
(
ProtocolStream *stream,
- char *str
+ _Xconst char *str
);
void _XEditResPut8
diff --git a/src/Atoms.c b/src/Atoms.c
index 6cc91a2..6f0ca64 100644
--- a/src/Atoms.c
+++ b/src/Atoms.c
@@ -50,7 +50,7 @@ typedef struct _DisplayRec {
} DisplayRec;
struct _AtomRec {
- char *name;
+ _Xconst char *name;
DisplayRec* head;
};
@@ -99,7 +99,7 @@ AtomPtr
XmuMakeAtom(_Xconst char *name)
{
AtomPtr ptr = XtNew(struct _AtomRec);
- ptr->name = (char *) name;
+ ptr->name = name;
ptr->head = NULL;
return ptr;
}
@@ -107,7 +107,7 @@ XmuMakeAtom(_Xconst char *name)
char *
XmuNameOfAtom(AtomPtr atom_ptr)
{
- return atom_ptr->name;
+ return (char *) atom_ptr->name;
}
diff --git a/src/DefErrMsg.c b/src/DefErrMsg.c
index 091d2c4..3cb914a 100644
--- a/src/DefErrMsg.c
+++ b/src/DefErrMsg.c
@@ -43,7 +43,7 @@ XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
char buffer[BUFSIZ];
char mesg[BUFSIZ];
char number[32];
- char *mtype = "XlibMessage";
+ _Xconst char *mtype = "XlibMessage";
register _XExtension *ext = (_XExtension *)NULL;
_XExtension *bext = (_XExtension *)NULL;
XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
diff --git a/src/EditresCom.c b/src/EditresCom.c
index b4554e1..716a2b3 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -142,13 +142,13 @@ static Boolean CvtStringToBlock(Display*, XrmValue*, Cardinal*,
XrmValue*, XrmValue*, XtPointer*);
static EditresEvent *BuildEvent(Widget, Atom, XtPointer, ResIdent,
unsigned long);
-static char *DoFindChild(Widget, EditresEvent*, ProtocolStream*);
-static char *DoGetGeometry(Widget, EditresEvent*, ProtocolStream*);
-static char *DoGetResources(Widget, EditresEvent*, ProtocolStream*);
-static char *DoSetValues(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoFindChild(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoGetGeometry(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoGetResources(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DoSetValues(Widget, EditresEvent*, ProtocolStream*);
static void DumpChildren(Widget, ProtocolStream*, unsigned short*);
-static char *DumpValues(Widget, EditresEvent*, ProtocolStream*);
-static char *DumpWidgets(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DumpValues(Widget, EditresEvent*, ProtocolStream*);
+static _Xconst char *DumpWidgets(Widget, EditresEvent*, ProtocolStream*);
static void ExecuteCommand(Widget, Atom, ResIdent, EditresEvent*);
static void ExecuteGetGeometry(Widget, ProtocolStream*);
static void ExecuteGetResources(Widget w, ProtocolStream *stream);
@@ -167,8 +167,8 @@ static Bool PositionInChild(Widget, int, int);
static int qcmp_widget_list(register _Xconst void*, register _Xconst void*);
static void SendCommand(Widget, Atom, ResIdent, EditResError,
ProtocolStream*);
-static void SendFailure(Widget, Atom, ResIdent, char*);
-static char *VerifyWidget(Widget, WidgetInfo*);
+static void SendFailure(Widget, Atom, ResIdent, _Xconst char*);
+static _Xconst char *VerifyWidget(Widget, WidgetInfo*);
/*
* External
@@ -215,13 +215,13 @@ _XEditResCheckMessages(Widget w, XtPointer data, XEvent *event, Boolean *cont)
if (!first_time)
{
Atom atoms[4];
- static char *names[] = {
+ static _Xconst char *names[] = {
EDITRES_NAME, EDITRES_COMMAND_ATOM,
EDITRES_PROTOCOL_ATOM, EDITRES_CLIENT_VALUE
};
first_time = True;
- XInternAtoms(dpy, names, 4, False, atoms);
+ XInternAtoms(dpy, (char **) names, 4, False, atoms);
res_editor = atoms[0];
res_editor_command = atoms[1];
res_editor_protocol = atoms[2];
@@ -479,8 +479,8 @@ GetCommand(Widget w, XtPointer data, Atom *selection, Atom *type,
static void
ExecuteCommand(Widget w, Atom sel, ResIdent ident, EditresEvent *event)
{
- char *(*func)(Widget, EditresEvent*, ProtocolStream*);
- char *str;
+ _Xconst char *(*func)(Widget, EditresEvent*, ProtocolStream*);
+ _Xconst char *str;
if (globals.block == BlockAll)
{
@@ -609,7 +609,7 @@ CommandDone(Widget widget, Atom *selection, Atom *target)
* Sends a failure message
*/
static void
-SendFailure(Widget w, Atom sel, ResIdent ident, char *str)
+SendFailure(Widget w, Atom sel, ResIdent ident, _Xconst char *str)
{
_XEditResResetStream(&globals.stream);
_XEditResPutString8(&globals.stream, str);
@@ -889,7 +889,7 @@ IsChild(Widget top, Widget parent, Widget child)
* Description:
* Makes sure all the widgets still exist
*/
-static char *
+static _Xconst char *
VerifyWidget(Widget w, WidgetInfo *info)
{
Widget top;
@@ -938,10 +938,10 @@ VerifyWidget(Widget w, WidgetInfo *info)
* Returns:
* NULL
*/
-static char *
+static _Xconst char *
DoSetValues(Widget w, EditresEvent *event, ProtocolStream *stream)
{
- char *str;
+ _Xconst char *str;
register unsigned i;
unsigned short count = 0;
SetValuesEvent *sv_event = (SetValuesEvent *)event;
@@ -1078,7 +1078,7 @@ ExecuteSetValues(Widget w, SetValuesEvent *sv_event, WidgetInfo *entry,
*/
#define TOOLKIT_TYPE ("Xt")
/*ARGSUSED*/
-static char *
+static _Xconst char *
DumpWidgets(Widget w, EditresEvent *event, ProtocolStream *stream)
{
unsigned short count = 0;
@@ -1201,11 +1201,11 @@ DumpChildren(Widget w, ProtocolStream *stream, unsigned short *count)
* Returns:
* NULL
*/
-static char *
+static _Xconst char *
DoGetGeometry(Widget w, EditresEvent *event, ProtocolStream *stream)
{
unsigned i;
- char *str;
+ _Xconst char *str;
GetGeomEvent *geom_event = (GetGeomEvent *)event;
_XEditResPut16(stream, geom_event->num_entries);
@@ -1414,10 +1414,10 @@ _FindChild(Widget parent, int x, int y)
* An allocated error message if something went horribly wrong and
* no set values were performed, else NULL.
*/
-static char *
+static _Xconst char *
DoFindChild(Widget w, EditresEvent *event, ProtocolStream *stream)
{
- char *str;
+ _Xconst char *str;
Widget parent, child;
Position parent_x, parent_y;
FindChildEvent *find_event = (FindChildEvent *)event;
@@ -1456,11 +1456,11 @@ DoFindChild(Widget w, EditresEvent *event, ProtocolStream *stream)
* Returns:
* NULL
*/
-static char *
+static _Xconst char *
DoGetResources(Widget w, EditresEvent *event, ProtocolStream *stream)
{
unsigned int i;
- char *str;
+ _Xconst char *str;
GetResEvent *res_event = (GetResEvent *)event;
_XEditResPut16(stream, res_event->num_entries); /* number of replys */
@@ -1558,12 +1558,12 @@ ExecuteGetResources(Widget w, ProtocolStream *stream)
* NULL
*/
/*ARGSUSED*/
-static char *
+static _Xconst char *
DumpValues(Widget w, EditresEvent* event, ProtocolStream* stream)
{
- char *str;
+ _Xconst char *str;
Arg warg[1];
- String res_value = NULL;
+ _Xconst _XtString res_value = NULL;
GetValuesEvent *gv_event = (GetValuesEvent *)event;
/* put the count in the stream */
@@ -1645,7 +1645,7 @@ InsertWidget(ProtocolStream *stream, Widget w)
* Inserts a string into the protocol stream.
*/
void
-_XEditResPutString8(ProtocolStream *stream, char *str)
+_XEditResPutString8(ProtocolStream *stream, _Xconst char *str)
{
int i, len = strlen(str);
diff --git a/src/StrToGrav.c b/src/StrToGrav.c
index 44cc13b..ca8bb53 100644
--- a/src/StrToGrav.c
+++ b/src/StrToGrav.c
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
*/
static struct _namepair {
XrmQuark quark;
- char *name;
+ _Xconst char *name;
XtGravity gravity;
} names[] = {
{ NULLQUARK, XtEForget, ForgetGravity },
commit 72ac4c4a464b3aec21cdbe367c9d465cbe0f3ff1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 10 09:55:07 2011 -0800
Drop support for pre-ANSI-C89 preprocessors
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Atoms.c b/src/Atoms.c
index 412f399..6cc91a2 100644
--- a/src/Atoms.c
+++ b/src/Atoms.c
@@ -60,15 +60,9 @@ struct _AtomRec {
#define STATIC static
#endif
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define DeclareAtom(atom,text) \
STATIC struct _AtomRec __##atom = { text, NULL }; \
AtomPtr _##atom = &__##atom;
-#else
-#define DeclareAtom(atom,text) \
-STATIC struct _AtomRec __/**/atom = { text, NULL }; \
-AtomPtr _/**/atom = &__/**/atom;
-#endif
DeclareAtom(XA_ATOM_PAIR, "ATOM_PAIR" )
DeclareAtom(XA_CHARACTER_POSITION, "CHARACTER_POSITION" )
diff --git a/src/sharedlib.c b/src/sharedlib.c
index 4bb8c3b..b47213d 100644
--- a/src/sharedlib.c
+++ b/src/sharedlib.c
@@ -36,15 +36,9 @@ struct _AtomRec {
struct _DisplayRec* head;
};
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define DeclareAtom(atom) \
extern struct _AtomRec __##atom; \
AtomPtr _##atom = &__##atom;
-#else
-#define DeclareAtom(atom) \
-extern struct _AtomRec __/**/atom; \
-AtomPtr _/**/atom = &__/**/atom;
-#endif
DeclareAtom(XA_ATOM_PAIR)
DeclareAtom(XA_CHARACTER_POSITION)
commit 004d535c707251bd4fb47426f90712c195c6dfc7
Author: Matt Dew <marcoz@osource.org>
Date: Tue Oct 4 20:51:48 2011 -0600
Cleanup IDs and links in doc
1 - fix the capitalization of the ID attributes to match either the
<title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
will become an olink.
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/doc/Xmu.xml b/doc/Xmu.xml
index 43d8047..2d363a9 100644
--- a/doc/Xmu.xml
+++ b/doc/Xmu.xml
@@ -49,8 +49,8 @@ is a trademark of The Open Group.
</legalnotice>
</articleinfo>
- <sect1 id='introduction'>
- <title>Introduction</title>
+ <sect1 id='Introduction'>
+<title>Introduction</title>
<para>
The Xmu Library is a collection of miscellaneous (some might say random)
@@ -81,8 +81,8 @@ cc -o xapplication xapplication.o `pkg-config --libs xmu`
</sect1>
- <sect1 id='atom_functions'>
- <title>Atom Functions</title>
+ <sect1 id='Atom_Functions'>
+<title>Atom Functions</title>
<para>
To use the functions and macros defined in this section, you should include
@@ -203,11 +203,11 @@ value is cached, such that subsequent requests do not cause
another round-trip to the server.
</para>
- <para id="XmuMakeAtom">
+ <para>
<indexterm zone="XmuMakeAtom">
- <primary><function>XmuMakeAtom</function></primary>
+ <primary><xref linkend='XmuMakeAtom' xrefstyle='select: title'/></primary>
Reply to: