libxaw: Changes to 'debian-experimental'
.gitignore | 65
COPYING | 32
ChangeLog | 613 ++++++
Makefile.am | 42
README | 25
configure.ac | 83
debian/README.source | 73
debian/changelog | 76
debian/control | 16
debian/copyright | 145 +
debian/libxaw7-dev.README.Debian | 2
debian/libxaw7-dev.install | 1
debian/patches/01_Xaw_StripChart_fix.diff | 34
debian/rules | 21
debian/watch | 1
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311 ---
include/.gitignore | 2
include/X11/Xaw/AllWidgets.h | 1
include/X11/Xaw/AsciiSink.h | 5
include/X11/Xaw/AsciiSinkP.h | 6
include/X11/Xaw/AsciiSrc.h | 3
include/X11/Xaw/AsciiSrcP.h | 6
include/X11/Xaw/AsciiText.h | 5
include/X11/Xaw/AsciiTextP.h | 5
include/X11/Xaw/Box.h | 6
include/X11/Xaw/BoxP.h | 6
include/X11/Xaw/Cardinals.h | 1
include/X11/Xaw/Command.h | 3
include/X11/Xaw/CommandP.h | 6
include/X11/Xaw/Dialog.h | 3
include/X11/Xaw/DialogP.h | 4
include/X11/Xaw/Form.h | 4
include/X11/Xaw/FormP.h | 3
include/X11/Xaw/Grip.h | 3
include/X11/Xaw/GripP.h | 6
include/X11/Xaw/Label.h | 3
include/X11/Xaw/LabelP.h | 6
include/X11/Xaw/List.h | 3
include/X11/Xaw/ListP.h | 3
include/X11/Xaw/MenuButtoP.h | 3
include/X11/Xaw/MenuButton.h | 2
include/X11/Xaw/MultiSink.h | 3
include/X11/Xaw/MultiSinkP.h | 3
include/X11/Xaw/MultiSrc.h | 3
include/X11/Xaw/MultiSrcP.h | 3
include/X11/Xaw/Paned.h | 6
include/X11/Xaw/PanedP.h | 4
include/X11/Xaw/Panner.h | 2
include/X11/Xaw/PannerP.h | 2
include/X11/Xaw/Porthole.h | 2
include/X11/Xaw/PortholeP.h | 2
include/X11/Xaw/Print.h | 132 -
include/X11/Xaw/PrintSP.h | 135 -
include/X11/Xaw/Repeater.h | 2
include/X11/Xaw/RepeaterP.h | 2
include/X11/Xaw/Reports.h | 1
include/X11/Xaw/Scrollbar.h | 4
include/X11/Xaw/ScrollbarP.h | 6
include/X11/Xaw/Simple.h | 3
include/X11/Xaw/SimpleMenP.h | 2
include/X11/Xaw/SimpleMenu.h | 2
include/X11/Xaw/SimpleP.h | 4
include/X11/Xaw/Sme.h | 2
include/X11/Xaw/SmeBSB.h | 2
include/X11/Xaw/SmeBSBP.h | 2
include/X11/Xaw/SmeLine.h | 2
include/X11/Xaw/SmeLineP.h | 2
include/X11/Xaw/SmeP.h | 2
include/X11/Xaw/StripCharP.h | 6
include/X11/Xaw/StripChart.h | 3
include/X11/Xaw/Template.c | 3
include/X11/Xaw/Template.h | 3
include/X11/Xaw/TemplateP.h | 3
include/X11/Xaw/Text.h | 3
include/X11/Xaw/TextP.h | 8
include/X11/Xaw/TextSink.h | 5
include/X11/Xaw/TextSinkP.h | 6
include/X11/Xaw/TextSrc.h | 5
include/X11/Xaw/TextSrcP.h | 6
include/X11/Xaw/Tip.h | 2
include/X11/Xaw/TipP.h | 2
include/X11/Xaw/Toggle.h | 2
include/X11/Xaw/ToggleP.h | 3
include/X11/Xaw/Tree.h | 3
include/X11/Xaw/TreeP.h | 4
include/X11/Xaw/VendorEP.h | 3
include/X11/Xaw/Viewport.h | 3
include/X11/Xaw/ViewportP.h | 2
include/X11/Xaw/XawImP.h | 3
include/X11/Xaw/XawInit.h | 6
man/.gitignore | 3
man/Makefile.am | 58
man/Xaw.man | 7
specs/.gitignore | 4
specs/AsciiSink.xml | 141 +
specs/AsciiSource.xml | 368 ++++
specs/AsciiText.xml | 450 ++++
specs/Box.xml | 346 +++
specs/CH1.xml | 725 ++++++++
specs/CH2.xml | 1891 +++++++++++++++++++++
specs/CH3.xml | 123 +
specs/CH4.xml | 102 +
specs/CH5.xml | 397 ++++
specs/CH6.xml | 117 +
specs/CH7.xml | 167 +
specs/Command.xml | 525 +++++
specs/Dialog.xml | 692 +++++++
specs/Form.xml | 531 +++++
specs/Grip.xml | 357 +++
specs/Label.xml | 345 +++
specs/List.xml | 872 +++++++++
specs/Makefile.am | 106 +
specs/MenuButton.xml | 567 ++++++
specs/Paned.xml | 1213 +++++++++++++
specs/Panner.xml | 734 ++++++++
specs/Porthole.xml | 306 +++
specs/Repeater.xml | 558 ++++++
specs/Scrollbar.xml | 884 +++++++++
specs/Simple.xml | 252 ++
specs/SimpleMenu.xml | 790 ++++++++
specs/Sme.xml | 207 ++
specs/SmeBSB.xml | 310 +++
specs/SmeLine.xml | 148 +
specs/StripChart.xml | 435 ++++
specs/TPage_Credits.xml | 90
specs/Template.xml | 407 ++++
specs/Template_private_header_file.xml | 87
specs/Template_public_header_file.xml | 112 +
specs/Template_widget_source_file.xml | 208 ++
specs/Text.xml | 326 +++
specs/TextActions.xml | 976 ++++++++++
specs/TextActions_default_translation_bindings.xml | 85
specs/TextActions_text_widget_actions.xml | 891 +++++++++
specs/TextCustom.xml | 123 +
specs/TextFuncs.xml | 856 +++++++++
specs/TextSink.xml | 915 ++++++++++
specs/TextSource.xml | 620 ++++++
specs/Toggle.xml | 773 ++++++++
specs/Tree.xml | 404 ++++
specs/Viewport.xml | 391 ++++
specs/libXaw.xml | 88
src/.gitignore | 6
src/Actions.c | 2
src/AllWidgets.c | 10
src/AsciiSink.c | 3
src/AsciiSrc.c | 20
src/AsciiText.c | 3
src/Box.c | 3
src/Command.c | 7
src/Converters.c | 2
src/Dialog.c | 5
src/DisplayList.c | 4
src/Form.c | 4
src/Grip.c | 3
src/Label.c | 3
src/List.c | 3
src/Makefile.am | 41
src/MenuButton.c | 4
src/MultiSink.c | 3
src/MultiSrc.c | 3
src/OS.c | 13
src/Paned.c | 9
src/Panner.c | 3
src/Pixmap.c | 4
src/Porthole.c | 2
src/Private.h | 2
src/Repeater.c | 2
src/Scrollbar.c | 3
src/Simple.c | 4
src/SimpleMenu.c | 4
src/Sme.c | 3
src/SmeBSB.c | 4
src/SmeLine.c | 3
src/StripChart.c | 3
src/Text.c | 6
src/TextAction.c | 122 -
src/TextPop.c | 4
src/TextSink.c | 2
src/TextSrc.c | 5
src/TextTr.c | 5
src/Tip.c | 5
src/Toggle.c | 3
src/Tree.c | 7
src/Vendor.c | 5
src/Viewport.c | 3
src/XawI18n.c | 3
src/XawI18n.h | 10
src/XawIm.c | 3
src/XawInit.c | 3
src/sharedlib.c | 9
xaw6.pc.in | 4
xaw7.pc.in | 2
194 files changed, 23277 insertions(+), 1305 deletions(-)
New commits:
commit 8f0be7a277206bfc7ad483470833bcd7f5b3ee22
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 04:15:46 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 642dfc2..0308e6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxaw (2:1.0.9-1) UNRELEASED; urgency=low
+libxaw (2:1.0.9-1) experimental; urgency=low
* New upstream release.
* Noticeable change: xaw6.pc now only has xmu in Requires.private, no
longer in Requires. Since it might trigger some FTBFS, target
experimental. Better be safe than sorry.
- -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 04:13:10 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 04:15:35 +0100
libxaw (2:1.0.8-2) unstable; urgency=low
commit 0a29e30a252ddcec0c6382d6d452439ff333f7c3
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 04:15:28 2011 +0100
Warn about xaw6.pc change WRT xmu.
diff --git a/debian/changelog b/debian/changelog
index 33d0cb0..642dfc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
libxaw (2:1.0.9-1) UNRELEASED; urgency=low
* New upstream release.
+ * Noticeable change: xaw6.pc now only has xmu in Requires.private, no
+ longer in Requires. Since it might trigger some FTBFS, target
+ experimental. Better be safe than sorry.
-- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 04:13:10 +0100
commit c030e6d55c688cbb5d098eab1f936297c7f2b825
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jan 12 04:13:19 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 9e4a671..faa2ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,127 @@
+commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jan 11 17:07:08 2011 -0800
+
+ libXaw 1.0.9
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e7a9b0302f7cb84015e8f612e5b65694d785b2d8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Nov 21 09:33:46 2010 -0500
+
+ config: prevent config.status from being generated three times
+
+ AC_OUTPUT with parameters is deprecated, use AC_CONFIG_FILES.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 55fc7aa22197350d9cd1039e0398132a63d3589f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Nov 20 20:10:12 2010 -0800
+
+ Check for getpagesize() with autoconf instead of #ifdef osname
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b2e86875d03e349a4c85135e4cf41b26b99b083e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Nov 20 20:06:04 2010 -0800
+
+ convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 41bf7992c45c6766c5982b3500b03d9c1b1fab87
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Nov 20 19:54:54 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+ Regroup XORG statements under the Xorg macros section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f85d4342cbfbb58764e24e202f3a7c95eaba3d77
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Nov 20 19:52:41 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 394a0c49c849e497cbcb987154ff796eb34f4820
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 11 23:30:22 2010 -0800
+
+ specs/CH6.xml: Remove stray quote in chapter title
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e9da4e6268b2cfbda793435caedc6403b2a918f0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Nov 9 13:04:44 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 fd5ef2fb841903c0a7d59e56f8fe69d0974f964c
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Nov 2 09:52:34 2010 -0700
+
+ xaw6.pc: Only list xmu in Requires.private, not Requires
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+ Based on earlier similar change to xaw7.pc which was:
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5136e2aabb73fec3c1670616bf0ebf828a1a1ca9
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Thu Oct 28 00:29:30 2010 +0200
+
+ Fix missing <X11/Intrinsic.h> in XawInit.h
+
+ Configure scripts/test programs might have troubles detecting libXaw by
+ just including XawInit.h, since it doesn't include <X11/Intrinsic.h>,
+ even though it's needed for the Widget definition.
+
+ X.Org Bugzilla #3526 <https://bugs.freedesktop.org/show_bug.cgi?id=3526>
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7b8196c9f7723b77b5d18fc1cc2070e557a7f767
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Oct 25 12:33:32 2010 -0700
+
+ Move -I CFLAGS to CPPFLAGS
+
+ Previously, setting CPPFLAGS at configure time could result in using the
+ installed headers rather than the ones included in the package.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
commit 46ca2da2e8d29d7f1347c9f4e9fb3794dd99cb7a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 25 10:47:03 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 8905958..33d0cb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxaw (2:1.0.9-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jan 2011 04:13:10 +0100
+
libxaw (2:1.0.8-2) unstable; urgency=low
[ Julien Cristau ]
commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 11 17:07:08 2011 -0800
libXaw 1.0.9
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 687d8e5..9c99e03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.8],
+AC_INIT([libXaw], [1.0.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit e7a9b0302f7cb84015e8f612e5b65694d785b2d8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 09:33:46 2010 -0500
config: prevent config.status from being generated three times
AC_OUTPUT with parameters is deprecated, use AC_CONFIG_FILES.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d8069cb..687d8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,16 +95,18 @@ AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
AC_CHECK_FUNCS([iswalnum getpagesize])
-AC_OUTPUT([Makefile
- include/Makefile
- man/Makefile
- specs/Makefile
- src/Makefile])
+AC_CONFIG_FILES([Makefile
+ include/Makefile
+ man/Makefile
+ specs/Makefile
+ src/Makefile])
if test "x$build_v6" = xyes; then
- AC_OUTPUT(xaw6.pc)
+ AC_CONFIG_FILES(xaw6.pc)
fi
if test "x$build_v7" = xyes; then
- AC_OUTPUT(xaw7.pc)
+ AC_CONFIG_FILES(xaw7.pc)
fi
+
+AC_OUTPUT
commit 55fc7aa22197350d9cd1039e0398132a63d3589f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 20:10:12 2010 -0800
Check for getpagesize() with autoconf instead of #ifdef osname
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 83b20b2..d8069cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
-AC_CHECK_FUNCS([iswalnum])
+AC_CHECK_FUNCS([iswalnum getpagesize])
AC_OUTPUT([Makefile
include/Makefile
diff --git a/src/OS.c b/src/OS.c
index 9c0bb45..8bc23dd 100644
--- a/src/OS.c
+++ b/src/OS.c
@@ -14,18 +14,9 @@
#if defined(linux)
/* kernel header doesn't work with -ansi */
/* #include <asm/page.h> *//* for PAGE_SIZE */
-#define HAS_GETPAGESIZE
#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
#endif
-#if defined(CSRG_BASED)
-#define HAS_GETPAGESIZE
-#endif
-
-#if defined(sun)
-#define HAS_GETPAGESIZE
-#endif
-
int
_XawGetPageSize(void)
{
@@ -45,7 +36,7 @@ _XawGetPageSize(void)
pagesize = sysconf(_SC_PAGE_SIZE);
#endif
-#ifdef HAS_GETPAGESIZE
+#ifdef HAVE_GETPAGESIZE
if (pagesize == -1)
pagesize = getpagesize();
#endif
commit b2e86875d03e349a4c85135e4cf41b26b99b083e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 20:06:04 2010 -0800
convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d793ea9..83b20b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,15 +90,7 @@ AM_CONDITIONAL(BUILD_XAW7, [test x$build_v7 = xyes])
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADER(wctype.h,
- AC_DEFINE([HAS_WCTYPE_H],1,
- [Define to 1 if you have the <wctype.h> header file.]))
-AC_CHECK_HEADER(wchar.h,
- AC_DEFINE([HAS_WCHAR_H],1,
- [Define to 1 if you have the <wchar.h> header file.]))
-AC_CHECK_HEADER(widec.h, [],
- AC_DEFINE([NO_WIDEC_H],1,
- [Define to 1 if you DO NOT have the <widec.h> header file.]))
+AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
AC_CHECK_FUNCS([iswalnum])
diff --git a/src/XawI18n.h b/src/XawI18n.h
index 09ab51b..d50171c 100644
--- a/src/XawI18n.h
+++ b/src/XawI18n.h
@@ -24,9 +24,9 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-#ifdef HAS_WCTYPE_H
+#ifdef HAVE_WCTYPE_H
#include <wctype.h>
-#ifndef NO_WIDEC_H
+#ifdef HAVE_WIDEC_H
#include <widec.h>
#define wcslen(c) wslen(c)
#define wcscpy(d, s) wscpy(d, s)
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif
-#ifdef HAS_WCHAR_H
+#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
commit 41bf7992c45c6766c5982b3500b03d9c1b1fab87
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 19:54:54 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Regroup XORG statements under the Xorg macros section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index e9bb45b..d793ea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,25 @@
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
+AC_INIT([libXaw], [1.0.8],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
-AC_INIT([libXaw],
- [1.0.8],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXaw)
-
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
# Check for progs
AC_PROG_LIBTOOL
@@ -25,12 +30,6 @@ AM_PROG_CC_C_O
# is in an if statement, and later calls would break if it's skipped.
PKG_PROG_PKG_CONFIG
-XORG_DEFAULT_OPTIONS
-XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
-
#
# fix libtool to set SONAME to libXaw.so.$major
#
commit f85d4342cbfbb58764e24e202f3a7c95eaba3d77
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 19:52:41 2010 -0800
config: Remove unnecessary calls from configure.ac
AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 8779b36..e9bb45b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.10)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_AWK
AM_PROG_CC_C_O
@@ -73,8 +72,6 @@ AC_ARG_ENABLE(xaw6, AC_HELP_STRING([--disable-xaw6],
if test "x$build_v6" = xyes; then
PKG_CHECK_MODULES(XAW6, xproto x11 xext xextproto xt xmu)
- AC_SUBST(XAW6_CFLAGS)
- AC_SUBST(XAW6_LIBS)
fi
@@ -86,8 +83,6 @@ AC_ARG_ENABLE(xaw7, AC_HELP_STRING([--disable-xaw7],
if test "x$build_v7" = xyes; then
PKG_CHECK_MODULES(XAW7, xproto x11 xext xextproto xt xmu xpm)
- AC_SUBST(XAW7_CFLAGS)
- AC_SUBST(XAW7_LIBS)
fi
commit 0aa59d6dfc5fa03842ffb3b67c21339e3812d007
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 18 15:10:38 2010 +0100
Mention upstream git URL in a comment.
diff --git a/debian/watch b/debian/watch
index 03ab381..a79aa6b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/lib/libXaw
version=3
http://xorg.freedesktop.org/releases/individual/lib/ libXaw-(.*)\.tar\.gz
commit 394a0c49c849e497cbcb987154ff796eb34f4820
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 11 23:30:22 2010 -0800
specs/CH6.xml: Remove stray quote in chapter title
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/CH6.xml b/specs/CH6.xml
index 3f9d518..e8009af 100644
--- a/specs/CH6.xml
+++ b/specs/CH6.xml
@@ -1,5 +1,5 @@
<chapter id="composite_and_constraint_widgets">
-<title>"Composite and Constraint Widgets</title>
+<title>Composite and Constraint Widgets</title>
<para>
These widgets may contain arbitrary widget children. They implement a
policy for the size and location of their children.
commit e9da4e6268b2cfbda793435caedc6403b2a918f0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 9 13:04:44 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>
diff --git a/specs/.gitignore b/specs/.gitignore
index 12fe512..6fa5c31 100644
--- a/specs/.gitignore
+++ b/specs/.gitignore
@@ -1,6 +1,4 @@
-# Add & Override for this directory and it's subdirectories
*.html
*.ps
*.pdf
*.txt
-*.css
diff --git a/specs/Makefile.am b/specs/Makefile.am
index bb34170..ebdbd72 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -82,11 +82,8 @@ doc_DATA += $(doc_sources:.xml=.txt)
endif
if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+XMLTO_FLAGS = -m $(XSL_STYLESHEET) \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
endif
CLEANFILES = $(doc_DATA)
commit 55e991a6e540cf79359f6bef316d8576ad212c77
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 17:29:48 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 3e504ef..8905958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-libxaw (2:1.0.8-2) UNRELEASED; urgency=low
+libxaw (2:1.0.8-2) unstable; urgency=low
+ [ Julien Cristau ]
* Revert addition of libXaw.so to libxaw7.install, done by mistake in the
previous revision. That file belongs in the -dev package and is already
in libxaw7-dev.links (closes: #602620). Delete the link in debian/rules
install instead, to avoid dh_install complaints.
- -- Julien Cristau <jcristau@debian.org> Sat, 06 Nov 2010 17:13:23 +0100
+ [ Cyril Brulebois ]
+ * Lose the git push race, thank Alex Goebel for the report, and upload.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 06 Nov 2010 17:28:44 +0100
libxaw (2:1.0.8-1) unstable; urgency=low
commit 698131e8ae160eeb9a5183937ef15c4f8b848c87
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 6 17:23:19 2010 +0100
Revert addition of libXaw.so to libxaw7.install
This was done by mistake in the previous revision. That file belongs in
the -dev package and is already in libxaw7-dev.links (closes: #602620).
Delete the link in debian/rules install instead, to avoid dh_install
complaints.
diff --git a/debian/changelog b/debian/changelog
index 5eba961..3e504ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxaw (2:1.0.8-2) UNRELEASED; urgency=low
+
+ * Revert addition of libXaw.so to libxaw7.install, done by mistake in the
+ previous revision. That file belongs in the -dev package and is already
+ in libxaw7-dev.links (closes: #602620). Delete the link in debian/rules
+ install instead, to avoid dh_install complaints.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 06 Nov 2010 17:13:23 +0100
+
libxaw (2:1.0.8-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/libxaw7.install b/debian/libxaw7.install
index 3adb2f7..fd8df61 100644
--- a/debian/libxaw7.install
+++ b/debian/libxaw7.install
@@ -1,3 +1,2 @@
usr/lib/libXaw7.so.7*
usr/lib/libXaw.so.7
-usr/lib/libXaw.so
diff --git a/debian/rules b/debian/rules
index dd5b7d7..3051e27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,7 @@ install: build
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
# Build architecture-dependent files here.
binary-arch: build install
commit b2431b21852c4b3411e06a01160c9cac7ad2c5a4
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 13:01:50 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index bed0360..5eba961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxaw (2:1.0.8-1) UNRELEASED; urgency=low
+libxaw (2:1.0.8-1) unstable; urgency=low
[ Julien Cristau ]
* Update debian/copyright from upstream COPYING.
@@ -20,7 +20,7 @@ libxaw (2:1.0.8-1) UNRELEASED; urgency=low
otherwise.
* Refresh patch.
- -- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 16:52:09 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 06 Nov 2010 13:01:42 +0100
libxaw (2:1.0.7-1) unstable; urgency=low
commit 103f39ff3da211dd8c06dd15b2c3cc33aa419fda
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 13:01:33 2010 +0100
Refresh patch.
diff --git a/debian/changelog b/debian/changelog
index f49969e..bed0360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ libxaw (2:1.0.8-1) UNRELEASED; urgency=low
* Switch from --list-missing to --fail-missing for additional safety.
* Add usr/lib/libXaw.so to libxaw7-dev.install, it wouldn't be installed
otherwise.
+ * Refresh patch.
-- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 16:52:09 +0100
diff --git a/debian/patches/01_Xaw_StripChart_fix.diff b/debian/patches/01_Xaw_StripChart_fix.diff
index a58b289..3a50a31 100644
--- a/debian/patches/01_Xaw_StripChart_fix.diff
+++ b/debian/patches/01_Xaw_StripChart_fix.diff
@@ -16,11 +16,9 @@ This patch makes part heights differ no more than by 1 pixel.
Debian bug#167448 <http://bugs.debian.org/167448>
-Index: libXaw-X11R7.0-1.0.1/src/StripChart.c
-===================================================================
---- libXaw-X11R7.0-1.0.1.orig/src/StripChart.c 2005-12-30 14:50:24.000000000 -0500
-+++ libXaw-X11R7.0-1.0.1/src/StripChart.c 2006-02-26 19:09:07.000000000 -0500
-@@ -373,12 +373,12 @@
+--- a/src/StripChart.c
++++ b/src/StripChart.c
+@@ -370,12 +370,12 @@ draw_it(XtPointer client_data, XtInterva
* the returned value is identical to the initial value of next and data is
* unchanged. Otherwise keeps half a window's worth of data. If data is
* changed, then w->strip_chart.max_value is updated to reflect the
@@ -36,7 +34,7 @@ Index: libXaw-X11R7.0-1.0.1/src/StripChart.c
int next = w->strip_chart.interval;
int scale = w->strip_chart.scale;
int scalewidth = 0;
-@@ -423,8 +423,10 @@
+@@ -420,8 +420,10 @@ repaint_window(StripChartWidget w, int l
}
/* Draw graph reference lines */
@@ -48,7 +46,7 @@ Index: libXaw-X11R7.0-1.0.1/src/StripChart.c
XDrawLine(dpy, win, w->strip_chart.hiGC, left, j, scalewidth, j);
}
}
-@@ -446,7 +448,7 @@
+@@ -443,7 +445,7 @@ static void
MoveChart(StripChartWidget w, Bool blit)
{
double old_max;
@@ -57,7 +55,7 @@ Index: libXaw-X11R7.0-1.0.1/src/StripChart.c
int next = w->strip_chart.interval;
if (!XtIsRealized((Widget)w))
-@@ -495,8 +497,10 @@
+@@ -492,8 +494,10 @@ MoveChart(StripChartWidget w, Bool blit)
/* Draw graph reference lines */
left = j;
@@ -69,7 +67,7 @@ Index: libXaw-X11R7.0-1.0.1/src/StripChart.c
XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w),
w->strip_chart.hiGC, left, j, XtWidth(w), j);
}
-@@ -557,23 +561,26 @@
+@@ -554,23 +558,26 @@ XawStripChartResize(Widget widget)
StripChartWidget w = (StripChartWidget)widget;
XPoint *points;
Cardinal size;
commit 6d7ce926f221552dfe29c6f88f65c4b9ef834637
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 13:00:35 2010 +0100
Add usr/lib/libXaw.so to libxaw7-dev.install, it wouldn't be installed otherwise.
diff --git a/debian/changelog b/debian/changelog
index 26f94d7..f49969e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ libxaw (2:1.0.8-1) UNRELEASED; urgency=low
html and txt only).
* Kill *.xml in the doc directory, no point in shipping them.
* Switch from --list-missing to --fail-missing for additional safety.
+ * Add usr/lib/libXaw.so to libxaw7-dev.install, it wouldn't be installed
+ otherwise.
-- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 16:52:09 +0100
diff --git a/debian/libxaw7.install b/debian/libxaw7.install
index fd8df61..3adb2f7 100644
--- a/debian/libxaw7.install
+++ b/debian/libxaw7.install
@@ -1,2 +1,3 @@
usr/lib/libXaw7.so.7*
usr/lib/libXaw.so.7
+usr/lib/libXaw.so
commit 407fab61f8810d99db9c4fe33501c2509cddc5ff
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 12:33:36 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index c0a56ac..26f94d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libxaw (2:1.0.8-1) UNRELEASED; urgency=low
* Replace --enable-docs with --with-xmlto and --without-fop (we want
html and txt only).
* Kill *.xml in the doc directory, no point in shipping them.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 16:52:09 +0100
diff --git a/debian/rules b/debian/rules
index 4625183..dd5b7d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=.la
dh_installman
dh_installchangelogs ChangeLog
dh_link
commit 057cac657164f7796bbe4a688e7c28cce36b5807
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 6 11:11:32 2010 +0100
Reply to: