[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxaw: Changes to 'debian-unstable'



 COPYING                                   |    8 
 ChangeLog                                 |  307 ++++++++++++++++++++++++++++++
 Makefile.am                               |    2 
 configure.ac                              |   29 +-
 debian/changelog                          |   11 +
 debian/control                            |   14 +
 debian/libxaw-doc.install                 |    1 
 debian/libxaw7-dev.install                |    1 
 debian/patches/01_Xaw_StripChart_fix.diff |    4 
 debian/rules                              |   75 ++++---
 docbook.am                                |  105 ++++++++++
 include/X11/Xaw/AsciiSink.h               |    8 
 include/X11/Xaw/AsciiSinkP.h              |   12 -
 include/X11/Xaw/AsciiSrc.h                |    4 
 include/X11/Xaw/AsciiSrcP.h               |   18 -
 include/X11/Xaw/AsciiText.h               |   12 -
 include/X11/Xaw/AsciiTextP.h              |   12 -
 include/X11/Xaw/Box.h                     |   14 -
 include/X11/Xaw/BoxP.h                    |   10 
 include/X11/Xaw/Command.h                 |    8 
 include/X11/Xaw/CommandP.h                |   20 -
 include/X11/Xaw/Dialog.h                  |    8 
 include/X11/Xaw/DialogP.h                 |    8 
 include/X11/Xaw/Form.h                    |   12 -
 include/X11/Xaw/FormP.h                   |    8 
 include/X11/Xaw/Grip.h                    |    8 
 include/X11/Xaw/GripP.h                   |    8 
 include/X11/Xaw/Label.h                   |    8 
 include/X11/Xaw/LabelP.h                  |   12 -
 include/X11/Xaw/List.h                    |   26 +-
 include/X11/Xaw/ListP.h                   |    4 
 include/X11/Xaw/MenuButtoP.h              |    2 
 include/X11/Xaw/MenuButton.h              |    2 
 include/X11/Xaw/MultiSink.h               |    8 
 include/X11/Xaw/MultiSinkP.h              |   12 -
 include/X11/Xaw/MultiSrc.h                |    2 
 include/X11/Xaw/MultiSrcP.h               |   18 -
 include/X11/Xaw/Paned.h                   |   14 -
 include/X11/Xaw/PanedP.h                  |   16 -
 include/X11/Xaw/Panner.h                  |   12 -
 include/X11/Xaw/Porthole.h                |   14 -
 include/X11/Xaw/Repeater.h                |   12 -
 include/X11/Xaw/Scrollbar.h               |   10 
 include/X11/Xaw/ScrollbarP.h              |    8 
 include/X11/Xaw/Simple.h                  |    8 
 include/X11/Xaw/SimpleMenP.h              |    4 
 include/X11/Xaw/SimpleMenu.h              |    2 
 include/X11/Xaw/SimpleP.h                 |    8 
 include/X11/Xaw/Sme.h                     |    4 
 include/X11/Xaw/SmeBSB.h                  |    2 
 include/X11/Xaw/SmeLine.h                 |    4 
 include/X11/Xaw/SmeP.h                    |    4 
 include/X11/Xaw/StripCharP.h              |   10 
 include/X11/Xaw/StripChart.h              |   12 -
 include/X11/Xaw/Text.h                    |   10 
 include/X11/Xaw/TextP.h                   |   16 -
 include/X11/Xaw/TextSink.h                |   14 -
 include/X11/Xaw/TextSinkP.h               |    8 
 include/X11/Xaw/TextSrc.h                 |   12 -
 include/X11/Xaw/TextSrcP.h                |    8 
 include/X11/Xaw/Toggle.h                  |    4 
 include/X11/Xaw/ToggleP.h                 |    4 
 include/X11/Xaw/Tree.h                    |   30 +-
 include/X11/Xaw/TreeP.h                   |    8 
 include/X11/Xaw/VendorEP.h                |    4 
 include/X11/Xaw/Viewport.h                |    8 
 include/X11/Xaw/ViewportP.h               |    8 
 include/X11/Xaw/XawImP.h                  |    4 
 man/Xaw.man                               |    2 
 old-doc/CHANGES                           |   20 -
 old-doc/Changelog                         |   28 +-
 specs/.gitignore                          |    1 
 specs/AsciiSink.xml                       |    2 
 specs/AsciiSource.xml                     |   48 ++--
 specs/AsciiText.xml                       |    4 
 specs/Box.xml                             |    2 
 specs/CH1.xml                             |   10 
 specs/CH2.xml                             |   91 ++++----
 specs/CH3.xml                             |    2 
 specs/CH4.xml                             |    2 
 specs/CH5.xml                             |    6 
 specs/CH6.xml                             |    4 
 specs/CH7.xml                             |    8 
 specs/Dialog.xml                          |   32 +--
 specs/Form.xml                            |   28 +-
 specs/Grip.xml                            |    2 
 specs/Label.xml                           |    2 
 specs/List.xml                            |   18 -
 specs/Makefile.am                         |   65 ------
 specs/MenuButton.xml                      |    4 
 specs/Paned.xml                           |   26 +-
 specs/Panner.xml                          |    4 
 specs/Porthole.xml                        |   12 -
 specs/Repeater.xml                        |    2 
 specs/Scrollbar.xml                       |   10 
 specs/Simple.xml                          |    2 
 specs/SimpleMenu.xml                      |   16 -
 specs/Sme.xml                             |    4 
 specs/SmeBSB.xml                          |    4 
 specs/SmeLine.xml                         |    2 
 specs/StripChart.xml                      |    2 
 specs/Template.xml                        |    2 
 specs/Template_public_header_file.xml     |    2 
 specs/Text.xml                            |    4 
 specs/TextActions.xml                     |    4 
 specs/TextActions_text_widget_actions.xml |    4 
 specs/TextFuncs.xml                       |   84 ++++----
 specs/TextSink.xml                        |   50 ++--
 specs/TextSource.xml                      |   34 +--
 specs/Toggle.xml                          |   40 +--
 specs/Tree.xml                            |   12 -
 specs/Viewport.xml                        |    6 
 specs/libXaw.xml                          |   71 +++---
 src/Actions.c                             |   65 +++---
 src/AllWidgets.c                          |   67 ++----
 src/AsciiSink.c                           |   16 -
 src/AsciiSrc.c                            |   30 +-
 src/AsciiText.c                           |   16 -
 src/Box.c                                 |   31 +--
 src/Command.c                             |   58 ++---
 src/Converters.c                          |   37 +--
 src/Dialog.c                              |   16 -
 src/DisplayList.c                         |   26 +-
 src/Form.c                                |    8 
 src/Grip.c                                |    8 
 src/Label.c                               |   24 +-
 src/List.c                                |   62 +++---
 src/Makefile.am                           |    1 
 src/MenuButton.c                          |   23 +-
 src/MultiSink.c                           |   10 
 src/MultiSrc.c                            |   90 ++++----
 src/Paned.c                               |  161 +++++++--------
 src/Panner.c                              |    6 
 src/Pixmap.c                              |    6 
 src/Porthole.c                            |    6 
 src/Private.h                             |    2 
 src/Repeater.c                            |    6 
 src/Scrollbar.c                           |   22 +-
 src/Simple.c                              |   27 +-
 src/SimpleMenu.c                          |   99 ++++-----
 src/Sme.c                                 |   14 -
 src/SmeBSB.c                              |   49 ++--
 src/SmeLine.c                             |   18 -
 src/StripChart.c                          |   48 ++--
 src/Text.c                                |   35 +--
 src/TextAction.c                          |   34 +--
 src/TextPop.c                             |  117 +++++------
 src/TextSink.c                            |   57 ++---
 src/TextSrc.c                             |   34 +--
 src/Tip.c                                 |    4 
 src/Toggle.c                              |   37 +--
 src/Tree.c                                |  100 ++++-----
 src/Vendor.c                              |   28 +-
 src/Viewport.c                            |   40 +--
 src/XawI18n.c                             |    4 
 src/XawIm.c                               |   28 +-
 src/XawInit.c                             |   12 -
 157 files changed, 1929 insertions(+), 1534 deletions(-)

New commits:
commit be98a2a49b70d7b4a741c8a7389853a906cfa0f9
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 11 21:51:24 2012 +0200

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2fe535e..51d7f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxaw (2:1.0.10-1) UNRELEASED; urgency=low
+libxaw (2:1.0.10-1) unstable; urgency=low
 
   * New upstream release.
     - Build fix for -Werror=pointer-to-int-cast (closes: #664934)
@@ -7,7 +7,7 @@ libxaw (2:1.0.10-1) UNRELEASED; urgency=low
   * Don't require (fake)root for debian/rules clean.
   * libxaw7-dev is now m-a: same, libxaw-doc m-a: foreign.
 
- -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 18:45:32 +0200
+ -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 21:51:17 +0200
 
 libxaw (2:1.0.9-3) unstable; urgency=low
 

commit 97bbf4eb72c466b550346674b8952c0313adafe8
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 11 21:51:14 2012 +0200

    libxaw7-dev is now m-a: same, libxaw-doc m-a: foreign.

diff --git a/debian/changelog b/debian/changelog
index 38f07c8..2fe535e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxaw (2:1.0.10-1) UNRELEASED; urgency=low
   * Split documentation to a new libxaw-doc package.
   * Fix up 01_Xaw_StripChart_fix.diff for new version.
   * Don't require (fake)root for debian/rules clean.
+  * libxaw7-dev is now m-a: same, libxaw-doc m-a: foreign.
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 18:45:32 +0200
 
diff --git a/debian/control b/debian/control
index 00d5a55..0748ab8 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,7 @@ Description: X11 Athena Widget library (debug package)
 Package: libxaw7-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -105,6 +106,7 @@ Description: X11 Athena Widget library (development headers)
 Package: libxaw-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Description: X11 Athena Widget library (documentation)

commit 231e6141871bbe14c2e0acfa54b7b8ac8ee46099
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 11 21:48:40 2012 +0200

    Don't require (fake)root for debian/rules clean.

diff --git a/debian/changelog b/debian/changelog
index 6d10090..38f07c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxaw (2:1.0.10-1) UNRELEASED; urgency=low
     - Build fix for -Werror=pointer-to-int-cast (closes: #664934)
   * Split documentation to a new libxaw-doc package.
   * Fix up 01_Xaw_StripChart_fix.diff for new version.
+  * Don't require (fake)root for debian/rules clean.
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 18:45:32 +0200
 
diff --git a/debian/rules b/debian/rules
index f5efd74..6b2676b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,6 @@ 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

commit c5d31136d10020435862522bfaac9bb852801510
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 11 20:57:39 2012 +0200

    Fix up 01_Xaw_StripChart_fix.diff for new version.

diff --git a/debian/changelog b/debian/changelog
index 05267c4..6d10090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxaw (2:1.0.10-1) UNRELEASED; urgency=low
   * New upstream release.
     - Build fix for -Werror=pointer-to-int-cast (closes: #664934)
   * Split documentation to a new libxaw-doc package.
+  * Fix up 01_Xaw_StripChart_fix.diff for new version.
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 18:45:32 +0200
 
diff --git a/debian/patches/01_Xaw_StripChart_fix.diff b/debian/patches/01_Xaw_StripChart_fix.diff
index 3a50a31..b80339d 100644
--- a/debian/patches/01_Xaw_StripChart_fix.diff
+++ b/debian/patches/01_Xaw_StripChart_fix.diff
@@ -25,7 +25,7 @@ Debian bug#167448 <http://bugs.debian.org/167448>
 - * largest data point
 + * largest data point.
   */
--static int 
+-static int
 +static int
  repaint_window(StripChartWidget w, int left, int width)
  {
@@ -79,7 +79,7 @@ Debian bug#167448 <http://bugs.debian.org/167448>
  	w->strip_chart.points = NULL;
  	return;
      }
--    
+-
 +
      size = sizeof(XPoint) * (w->strip_chart.scale - 1);
  

commit acecfe51ce23e2f98f7e2b2472b41b6ade7f42e4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 11 20:33:04 2012 +0200

    Split documentation to a new libxaw-doc package.

diff --git a/debian/changelog b/debian/changelog
index 5903a76..05267c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxaw (2:1.0.10-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Build fix for -Werror=pointer-to-int-cast (closes: #664934)
+  * Split documentation to a new libxaw-doc package.
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 18:45:32 +0200
 
diff --git a/debian/control b/debian/control
index 281c45b..00d5a55 100644
--- a/debian/control
+++ b/debian/control
@@ -84,6 +84,8 @@ Depends:
  libxmu-dev,
  libxpm-dev,
  x11proto-core-dev,
+Suggests:
+ libxaw-doc,
 Description: X11 Athena Widget library (development headers)
  libXaw7 provides the second version of Xaw, the Athena Widgets tookit,
  which is largely used by legacy X applications.  This version is the
@@ -99,3 +101,13 @@ Description: X11 Athena Widget library (development headers)
  .
  This module can be found at
  git://anongit.freedesktop.org/git/xorg/lib/libXaw
+
+Package: libxaw-doc
+Section: doc
+Architecture: all
+Depends:
+ ${misc:Depends},
+Description: X11 Athena Widget library (documentation)
+ Xaw, the Athena Widgets tookit, is largely used by legacy X applications.
+ .
+ This package contains the documentation for the Xaw library.
diff --git a/debian/libxaw-doc.install b/debian/libxaw-doc.install
new file mode 100644
index 0000000..7b9009d
--- /dev/null
+++ b/debian/libxaw-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libxaw7-dev
diff --git a/debian/libxaw7-dev.install b/debian/libxaw7-dev.install
index 95eea7f..a555532 100644
--- a/debian/libxaw7-dev.install
+++ b/debian/libxaw7-dev.install
@@ -4,4 +4,3 @@ usr/lib/*/libXaw.so
 usr/lib/*/pkgconfig/xaw7.pc
 usr/include/X11/*
 usr/share/man/man3/*
-usr/share/doc/libXaw/* usr/share/doc/libxaw7-dev
diff --git a/debian/rules b/debian/rules
index 38ae1b0..f5efd74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,75 +34,89 @@ endif
 configure: $(STAMP_DIR)/patch
 	autoreconf -vfi
 
-build/config.status: configure
+build: build-indep
+build-indep: docflags = --enable-specs
+build-indep: build-stamp
+build-arch: docflags = --disable-specs
+build-arch: build-stamp
+
+build-stamp: configure
+	dh_testdir
 	mkdir -p build
 	cd build && \
 	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             --infodir=\$${prefix}/share/info $(confflags) \
+		     --docdir=\$${datadir}/doc/libxaw7-dev \
 	             --disable-xaw6 \
 	             --with-xmlto --without-fop \
+		     $(docflags) \
 	             CFLAGS="$(CFLAGS)"
 
-build: build-stamp
-build-stamp: build/config.status
-	dh_testdir
-
 	cd build && $(MAKE)
-
-	touch build-stamp
+	>$@
 
 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*
 	rm -rf autom4te.cache */autom4te.cache
 	rm -rf build
-	rm -f $$(find -name Makefile.in)
+	find -name Makefile.in -delete
 	rm -f compile config.guess config.sub configure depcomp install-sh
 	rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs config.h.in
-
 	dh_clean
 
-install: build
+install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
 	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	find debian/tmp/usr/share/doc/libXaw -name '*.xml' -delete
 	rm -f debian/tmp/usr/lib/*/libXaw.so
 	ln -s libXaw7.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXaw.so
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
-
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp --fail-missing --exclude=.la
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip -Nlibxaw7
+	dh_installdocs -s
+	dh_install -s --sourcedir=debian/tmp --fail-missing --exclude=.la
+	dh_installman -s
+	dh_installchangelogs -s ChangeLog
+	dh_link -s
+	dh_strip -s -Nlibxaw7
 	dh_strip -plibxaw7 --dbg-package=libxaw7-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s
+	dh_shlibdeps -s
+	dh_installdeb -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
+	dh_testdir
+	dh_testroot
+	dh_installdocs -i
+	dh_install -i --sourcedir=debian/tmp --fail-missing --exclude=.la
+	dh_installman -i
+	dh_installchangelogs -i ChangeLog
+	dh_link -i
+	dh_compress -i -X.xml
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 # Nothing to do
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-indep build-arch
+.PHONY: clean binary-indep binary-arch binary install

commit 63b46dc82f7dfbd1ba6adfe59e23ca9e704f54d5
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Apr 11 18:50:25 2012 +0200

    Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index faa2ba5..acd1ca6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,310 @@
+commit b16cc35e551860a0bff54c47b33317536ddeae52
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Mar 22 19:51:33 2012 -0700
+
+    libXaw 1.0.10
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8a78d3aef0f6f1f51997468daf5f67231f4a3ecd
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Wed Feb 1 13:44:05 2012 -0500
+
+    Include headers instead of using extern definitions
+    
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 49c0a2441946f0d70fbd2612f193c95b84dde102
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Tue Nov 1 20:47:34 2011 -0700
+
+    Build fix for -Werror=pointer-to-int-cast
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit fe00db0ecafd95f6e1353b1d5f11ee6012a9b64c
+Author: Matt Dew <marcoz@osource.org>
+Date:   Wed Oct 5 22:33:05 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 c8e8838702ba8ae0a8100c7f1bd94ce9932339de
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Sep 19 16:25:43 2011 -0400
+
+    specs: refactor multi license legal text
+    
+    Also restore lost information.
+    There was no version number for this spec as in many of the docs.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 37ffe69b10ae29e8f91de6ef647d06804b9d159b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Sep 16 22:13:37 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 6c628c605e4f58be3a84edc5273a0dd88363a770
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Sep 13 17:12:59 2011 -0400
+
+    specs: fix orphan author affiliation.
+    
+    It belongs to Chris Peterson formerly of MIT
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e07f1d83079eb90ea91e3ff120ad747b1cc78bfb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Sep 12 16:54:45 2011 -0400
+
+    docs: use the &fullrelvers; entity to set X11 release information
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5b1f776e84108bce397cc6721ee176c3bb5592ad
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Sep 11 19:49:53 2011 -0400
+
+    docs: remove <productnumber> which is not used by default
+    
+    This element is not rendered by default on the title. A template
+    customization is required to display it.
+    X Window System does not have a product number.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 038802c68090dd3a75405178516017d80a51ecdf
+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 e24d546c5da599f63cc2ff40626b58c1183ed27a
+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 a6c814b6d02e3f28f1d015678bd3d944ff8dfb10
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Sep 1 14:01:02 2011 -0400
+
+    Remove include directive to <X11/Xaw>
+    
+    The -I directive to include/X11/Xaw is removed which will alert
+    developers not to include header files with quotes unless they are in
+    the /src directory.
+    
+    Currently no offending includes were found.
+    
+    Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 86444aeda526e957e1d7adc90625f24e263aa7ea
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Jun 18 10:22:19 2011 -0400
+
+    man page: replace hard coded section number with __libmansuffix__
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 66e450fdbb58b77641351e3c11631fdde86bf205
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Jun 12 18:38:44 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 f3d7c3c5d9f142149d3217682667b32c3d0ded8d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sun Jun 5 16:27:36 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 39ffb88b3a6523e9258bc6e4f3948a09e63b269f
+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 f5823ff8ed5bd280e7858116c3cec5d97184b175
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat May 28 08:48:10 2011 -0700
+
+    Correct path to examples in X11R5 contrib archive
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7d01dd4176b8ae1664218da8e197ef49d1efd05a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri May 27 20:35:28 2011 -0700
+
+    Bug 37536: Documentation refers to invalid contrib/examples/mit/Xaw
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=37536
+    
+    Update text to point to the latest distributed copy I found, in the
+    X11R5 contrib archives.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit cfa8e377352d5b9d5dbddc75de8314a509f51224
+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 a1c8ddc087715876cce1c86f837f7b13b49696aa
+Author: Glenn Burkhardt <gbburkhardt@verizon.net>
+Date:   Fri Dec 3 17:22:42 2010 -0500
+
+    fix potential infinte loop in XawBoxQueryGeometry() (bug 11569)
+    
+    Originally sent to xorg@ back in July 2007.
+    http://lists.x.org/archives/xorg/2007-July/025997.html
+
+commit 38dce0209303b48054c884508633b4ce0d52a819
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Jan 27 22:40:02 2011 -0800
+
+    Convert XmuSnprintf calls to just plain snprintf
+    
+    All supported platforms have native snprintf
+    
+    Remove #include <X11/Xmu/SysUtil.h> since it only defines XmuSnprintf
+    and the unused XmuGethostname
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 83e4910b379cb9b9d69a0438eba3322470afda24
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Jan 27 22:35:46 2011 -0800
+
+    Typo fix: sintax error -> syntax error
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bd78cc3b4afec713fcef114b5f12186d749fdb17
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Feb 2 11:43:41 2011 -0500
+
+    config: comment, minor upgrade and layout configure.ac
+    
+    Group statements per section as per Autoconf standard layout
+    Autoconf recommends not using dnl instead of # for comments
+    No functional configuration changes
+    
+    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 449ab92d83a972ba28ffda0ae198a6c8e4b00e78
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jan 28 16:07:07 2011 -0500
+
+    config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+    
+    This silences an Automake warning.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b73a5ea91d0b3bb61ee8e7aa26ff178fd5b72209
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Fri Jan 28 14:59:04 2011 -0500
+
+    config: remove unrequired AC_HEADER_STDC
+    
+    Autoconf says:
+    "This macro is obsolescent, as current systems have conforming
+    header files. New programs need not use this macro".
+
+commit 03457873474dfc90e5f2322facbd6032a1312086
+Author: Roberto Branciforti <rbbrnc@gmail.com>
+Date:   Wed Jan 12 22:36:06 2011 +0100
+
+    Removing trailing white spaces
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jan 11 17:07:08 2011 -0800
diff --git a/debian/changelog b/debian/changelog
index d4fe706..5903a76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxaw (2:1.0.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Build fix for -Werror=pointer-to-int-cast (closes: #664934)
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 11 Apr 2012 18:45:32 +0200
+
 libxaw (2:1.0.9-3) unstable; urgency=low
 
   * Build for multiarch.

commit b16cc35e551860a0bff54c47b33317536ddeae52
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Thu Mar 22 19:51:33 2012 -0700

    libXaw 1.0.10
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

diff --git a/configure.ac b/configure.ac
index 5b52876..2423263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.9],
+AC_INIT([libXaw], [1.0.10],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit 8a78d3aef0f6f1f51997468daf5f67231f4a3ecd
Author: Matt Turner <mattst88@gmail.com>
Date:   Wed Feb 1 13:44:05 2012 -0500

    Include headers instead of using extern definitions
    
    Signed-off-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/AllWidgets.c b/src/AllWidgets.c
index 27be437..3b13438 100644
--- a/src/AllWidgets.c
+++ b/src/AllWidgets.c
@@ -28,46 +28,37 @@ in this Software without prior written authorization from The Open Group.
 #include <config.h>
 #endif
 #include <X11/IntrinsicP.h>
-#include <X11/Xmu/WidgetNode.h>
 #include <X11/Xaw/AllWidgets.h>
 
-extern WidgetClass applicationShellWidgetClass;
-extern WidgetClass asciiSinkObjectClass;
-extern WidgetClass asciiSrcObjectClass;
-extern WidgetClass asciiTextWidgetClass;
-extern WidgetClass boxWidgetClass;
-extern WidgetClass commandWidgetClass;
-extern WidgetClass dialogWidgetClass;
-extern WidgetClass formWidgetClass;
-extern WidgetClass gripWidgetClass;
-extern WidgetClass labelWidgetClass;
-extern WidgetClass listWidgetClass;
-extern WidgetClass menuButtonWidgetClass;
-extern WidgetClass multiSinkObjectClass;
-extern WidgetClass multiSrcObjectClass;
-extern WidgetClass overrideShellWidgetClass;
-extern WidgetClass panedWidgetClass;
-extern WidgetClass pannerWidgetClass;
-extern WidgetClass portholeWidgetClass;
-extern WidgetClass repeaterWidgetClass;
-extern WidgetClass scrollbarWidgetClass;
-extern WidgetClass shellWidgetClass;
-extern WidgetClass simpleMenuWidgetClass;
-extern WidgetClass simpleWidgetClass;
-extern WidgetClass smeBSBObjectClass;
-extern WidgetClass smeLineObjectClass;
-extern WidgetClass smeObjectClass;
-extern WidgetClass stripChartWidgetClass;
-extern WidgetClass textSinkObjectClass;
-extern WidgetClass textSrcObjectClass;
-extern WidgetClass textWidgetClass;
-extern WidgetClass toggleWidgetClass;
-extern WidgetClass topLevelShellWidgetClass;
-extern WidgetClass transientShellWidgetClass;
-extern WidgetClass treeWidgetClass;
-extern WidgetClass vendorShellWidgetClass;
-extern WidgetClass viewportWidgetClass;
-extern WidgetClass wmShellWidgetClass;
+#include <X11/Composite.h>
+#include <X11/Constraint.h>
+#include <X11/Core.h>
+#include <X11/Object.h>
+#include <X11/RectObj.h>
+#include <X11/Shell.h>
+#include <X11/Vendor.h>
+#include <X11/Xaw/AsciiSink.h>
+#include <X11/Xaw/AsciiText.h>
+#include <X11/Xaw/Box.h>
+#include <X11/Xaw/Dialog.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Grip.h>
+#include <X11/Xaw/List.h>
+#include <X11/Xaw/MenuButton.h>
+#include <X11/Xaw/MultiSink.h>
+#include <X11/Xaw/Paned.h>
+#include <X11/Xaw/Panner.h>
+#include <X11/Xaw/Porthole.h>
+#include <X11/Xaw/Repeater.h>
+#include <X11/Xaw/Scrollbar.h>
+#include <X11/Xaw/SimpleMenu.h>
+#include <X11/Xaw/Sme.h>
+#include <X11/Xaw/SmeBSB.h>
+#include <X11/Xaw/SmeLine.h>
+#include <X11/Xaw/StripChart.h>
+#include <X11/Xaw/Toggle.h>
+#include <X11/Xaw/Tree.h>
+#include <X11/Xaw/Viewport.h>
 
 XmuWidgetNode XawWidgetArray[] = {
 { "applicationShell", &applicationShellWidgetClass },

commit 49c0a2441946f0d70fbd2612f193c95b84dde102
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date:   Tue Nov 1 20:47:34 2011 -0700

    Build fix for -Werror=pointer-to-int-cast
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

diff --git a/src/XawIm.c b/src/XawIm.c
index d1da5ae..7a7152f 100644
--- a/src/XawIm.c
+++ b/src/XawIm.c
@@ -184,14 +184,14 @@ static VendorShellWidget SearchVendorShell(Widget w)
     return(NULL);
 }
 
-static XContext extContext = (XContext)NULL;
+static XContext extContext = (XContext)0;
 
 static XawVendorShellExtPart *
 SetExtPart(VendorShellWidget w, XawVendorShellExtWidget vew)
 {
     contextDataRec *contextData;
 
-    if (extContext == (XContext)NULL) extContext = XUniqueContext();
+    if (extContext == (XContext)0) extContext = XUniqueContext();
 
     contextData = XtNew(contextDataRec);
     contextData->parent = (Widget)w;
@@ -296,13 +296,13 @@ ConfigureCB(Widget w, XtPointer closure, XEvent *event, Boolean *unused)
     }
 }
 
-static XContext errContext = (XContext)NULL;
+static XContext errContext = (XContext)0;
 
 static Widget SetErrCnxt(Widget w, XIM xim)
 {
     contextErrDataRec *contextErrData;
 
-    if (errContext == (XContext)NULL) errContext = XUniqueContext();
+    if (errContext == (XContext)0) errContext = XUniqueContext();
 
     contextErrData = XtNew(contextErrDataRec);
     contextErrData->widget = w;
@@ -1407,12 +1407,12 @@ Destroy(Widget w, XawVendorShellExtPart *ve)
 	return;
     XtFree( (char*) ve->im.resources );
 
-    if (extContext != (XContext)NULL &&
+    if (extContext != (XContext)0 &&
 	!XFindContext (XtDisplay (w), (Window)w,
 		       extContext, (XPointer*)&contextData))
         XtFree( (char*) contextData );
 
-    if (errContext != (XContext)NULL &&
+    if (errContext != (XContext)0 &&
 	!XFindContext (XDisplayOfIM( ve->im.xim ), (Window) ve->im.xim,
 		       errContext, (XPointer*) &contextErrData))
         XtFree( (char*) contextErrData );

commit fe00db0ecafd95f6e1353b1d5f11ee6012a9b64c
Author: Matt Dew <marcoz@osource.org>
Date:   Wed Oct 5 22:33:05 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.


Reply to: