util-macros 1.10.1.

6 files changed, 42 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index fb74a0e..516e46d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xutils-dev (1:7.5+5) UNRELEASED; urgency=low
 
   * lndir 1.0.2.
+  * util-macros 1.10.1.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Oct 2010 22:27:22 +0200
 
diff --git a/util-macros/COPYING b/util-macros/COPYING
index 10c1359..5d07981 100644
--- a/util-macros/COPYING
+++ b/util-macros/COPYING
@@ -21,7 +21,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ----------------------------------------------------------------------------
 
-Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
+Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index 6a20723..dc59ea5 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,30 @@
+commit aeebb46766dada64de246fd9fe72e3c523c4e70e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Sep 23 15:00:20 2010 -0400
+
+    Version bump: 1.10.1
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1905f89998cb26410872150679501fde506a03c7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Sep 3 22:47:02 2010 -0700
+
+    Sun's copyrights are now owned by Oracle
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 808d547902fad81901db94e6344838350d0eeb52
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Aug 14 15:43:38 2010 -0400
+
+    XORG_MANPAGE_SECTIONS: add substitution for apploaddir
+    
+    This represents the location of the app-defaults directory
+    Used in app/bitmap/man for example.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
 commit fbe66aedcf2165e43388894d3b2ee2f38e889f93
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Thu Jun 24 17:36:33 2010 -0400
diff --git a/util-macros/configure b/util-macros/configure
index 44e9186..58e060e 100755
--- a/util-macros/configure
+++ b/util-macros/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for util-macros 1.10.0.
+# Generated by GNU Autoconf 2.63 for util-macros 1.10.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='util-macros'
 PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.10.0'
-PACKAGE_STRING='util-macros 1.10.0'
+PACKAGE_VERSION='1.10.1'
+PACKAGE_STRING='util-macros 1.10.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1227,7 +1227,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures util-macros 1.10.0 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.10.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of util-macros 1.10.0:";;
+     short | recursive ) echo "Configuration of util-macros 1.10.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1367,7 +1367,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-util-macros configure 1.10.0
+util-macros configure 1.10.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1381,7 +1381,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by util-macros $as_me 1.10.0, which was
+It was created by util-macros $as_me 1.10.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2098,7 +2098,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='util-macros'
- VERSION='1.10.0'
+ VERSION='1.10.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2875,7 +2875,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by util-macros $as_me 1.10.0, which was
+This file was extended by util-macros $as_me 1.10.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2925,7 +2925,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-util-macros config.status 1.10.0
+util-macros config.status 1.10.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/util-macros/configure.ac b/util-macros/configure.ac
index 66dd89a..c1241a0 100644
--- a/util-macros/configure.ac
+++ b/util-macros/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
 AC_INIT([util-macros],
-        [1.10.0],
+        [1.10.1],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [util-macros])
 AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/util-macros/xorg-macros.m4.in b/util-macros/xorg-macros.m4.in
index 0e84d5b..9f8f7dc 100644
--- a/util-macros/xorg-macros.m4.in
+++ b/util-macros/xorg-macros.m4.in
@@ -1,6 +1,6 @@
 dnl @configure_input@
 dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 dnl 
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -188,6 +188,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \