Author: dnusinow Date: 2006-08-28 21:11:38 -0400 (Mon, 28 Aug 2006) New Revision: 3107
Removed: trunk/util/xutils-dev/debian/patches/06_linux_manpage_suffixes.diff Modified: trunk/util/xutils-dev/debian/changelog trunk/util/xutils-dev/debian/patches/series trunk/util/xutils-dev/util-macros/ChangeLog trunk/util/xutils-dev/util-macros/Makefile.am trunk/util/xutils-dev/util-macros/Makefile.in trunk/util/xutils-dev/util-macros/configure trunk/util/xutils-dev/util-macros/configure.ac trunk/util/xutils-dev/util-macros/xorg-macros.m4 trunk/util/xutils-dev/util-macros/xorg-macros.m4.in Log: * New upstream release of util-macros (1.1.1). This makes our manpage section patch obsolete. Modified: trunk/util/xutils-dev/debian/changelog =================================================================== --- trunk/util/xutils-dev/debian/changelog 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/debian/changelog 2006-08-29 01:11:38 UTC (rev 3107) @@ -1,3 +1,10 @@ +xutils-dev (1:7.1.ds-3) unstable; urgency=low + + * New upstream release of util-macros (1.1.1). This makes our manpage + section patch obsolete. + + -- David Nusinow <[EMAIL PROTECTED]> Mon, 28 Aug 2006 21:10:13 +0000 + xutils-dev (1:7.1.ds-2) unstable; urgency=low * Upload to unstable Deleted: trunk/util/xutils-dev/debian/patches/06_linux_manpage_suffixes.diff =================================================================== --- trunk/util/xutils-dev/debian/patches/06_linux_manpage_suffixes.diff 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/debian/patches/06_linux_manpage_suffixes.diff 2006-08-29 01:11:38 UTC (rev 3107) @@ -1,80 +0,0 @@ -Index: xutils-dev/util-macros/xorg-macros.m4.in -=================================================================== ---- xutils-dev.orig/util-macros/xorg-macros.m4.in 2006-07-02 00:43:47.000000000 -0400 -+++ xutils-dev/util-macros/xorg-macros.m4.in 2006-07-05 22:03:11.000000000 -0400 -@@ -79,40 +79,37 @@ - - if test x$APP_MAN_SUFFIX = x ; then - case $host_os in -- linux* | gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; -+ gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; - *) APP_MAN_SUFFIX=1 ;; - esac - fi - if test x$APP_MAN_DIR = x ; then - case $host_os in -- linux* | gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; -+ gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; - *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; - esac - fi - - if test x$LIB_MAN_SUFFIX = x ; then - case $host_os in -- linux* | gnu* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;; - *) LIB_MAN_SUFFIX=3 ;; - esac - fi - if test x$LIB_MAN_DIR = x ; then - case $host_os in -- linux* | gnu* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;; - *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;; - esac - fi - - if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in -- linux* | gnu* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;; - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; - esac - fi - if test x$FILE_MAN_DIR = x ; then - case $host_os in -- linux* | gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; -+ gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; - *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; - esac - fi -@@ -121,14 +118,12 @@ - # LinuxDebian, not other Linuxes, so we leave it unchanged here - if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in --# linux* | gnu* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;; - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac - fi - if test x$MISC_MAN_DIR = x ; then - case $host_os in --# linux* | gnu* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;; - *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;; - esac - fi -@@ -137,14 +132,14 @@ - # LinuxDebian, not other Linuxes, so we leave it unchanged here - if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in --# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;; -+# gnu* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;; - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; - esac - fi - if test x$DRIVER_MAN_DIR = x ; then - case $host_os in --# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;; -+# gnu* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;; - *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;; - esac - fi Modified: trunk/util/xutils-dev/debian/patches/series =================================================================== --- trunk/util/xutils-dev/debian/patches/series 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/debian/patches/series 2006-08-29 01:11:38 UTC (rev 3107) @@ -3,4 +3,3 @@ 03_xutils-dev-FHS.diff -p1 04_xutils-dev-debian.diff 05_xaw_without_xp.diff -06_linux_manpage_suffixes.diff Modified: trunk/util/xutils-dev/util-macros/ChangeLog =================================================================== --- trunk/util/xutils-dev/util-macros/ChangeLog 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/ChangeLog 2006-08-29 01:11:38 UTC (rev 3107) @@ -1,3 +1,17 @@ +commit de2a4b2880117f1de38c9f870024cfb8a9f3ba8d +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sun Aug 27 12:59:25 2006 +0300 + + make ChangeLog hook distcheck-safe + +commit d9062e4077ebfd0985baf8418f3d0f111b9ddbba +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sun Aug 27 12:50:20 2006 +0300 + + xorg-macros: remove GNU-userland special case; bump to 1.1.1 + Remove special-casing of man page suffices for GNU-userland systems (Linux, + Hurd, GNU/kFreeBSD). Bump to version 1.1.1. + commit 28d7a6d80abb2d8d1a670b09394a5fc5458dd98e Author: Alan Coopersmith <[EMAIL PROTECTED]> Date: Thu Jul 20 18:13:50 2006 -0700 @@ -204,4 +218,3 @@ - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version - Modified: trunk/util/xutils-dev/util-macros/Makefile.am =================================================================== --- trunk/util/xutils-dev/util-macros/Makefile.am 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/Makefile.am 2006-08-29 01:11:38 UTC (rev 3107) @@ -31,3 +31,4 @@ dist-hook: ChangeLog +DISTCLEANFILES = ChangeLog Modified: trunk/util/xutils-dev/util-macros/Makefile.in =================================================================== --- trunk/util/xutils-dev/util-macros/Makefile.in 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/Makefile.in 2006-08-29 01:11:38 UTC (rev 3107) @@ -152,6 +152,7 @@ aclocaldir = $(datadir)/aclocal aclocal_DATA = xorgversion.m4 xorg-macros.m4 EXTRA_DIST = $(aclocal_DATA) ChangeLog +DISTCLEANFILES = ChangeLog all: all-am .SUFFIXES: @@ -372,6 +373,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" Modified: trunk/util/xutils-dev/util-macros/configure =================================================================== --- trunk/util/xutils-dev/util-macros/configure 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/configure 2006-08-29 01:11:38 UTC (rev 3107) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for util-macros 1.1.0. +# Generated by GNU Autoconf 2.60 for util-macros 1.1.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='util-macros 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='util-macros 1.1.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -1129,7 +1129,7 @@ # 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.1.0 to adapt to many kinds of systems. +\`configure' configures util-macros 1.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1195,7 +1195,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.1.0:";; + short | recursive ) echo "Configuration of util-macros 1.1.1:";; esac cat <<\_ACEOF @@ -1267,7 +1267,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.1.0 +util-macros configure 1.1.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1281,7 +1281,7 @@ 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.1.0, which was +It was created by util-macros $as_me 1.1.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1951,7 +1951,7 @@ # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -2531,7 +2531,7 @@ # 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.1.0, which was +This file was extended by util-macros $as_me 1.1.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2574,7 +2574,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -util-macros config.status 1.1.0 +util-macros config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Modified: trunk/util/xutils-dev/util-macros/configure.ac =================================================================== --- trunk/util/xutils-dev/util-macros/configure.ac 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/configure.ac 2006-08-29 01:11:38 UTC (rev 3107) @@ -23,7 +23,7 @@ AC_PREREQ([2.57]) AC_INIT([util-macros], - [1.1.0], + [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) Modified: trunk/util/xutils-dev/util-macros/xorg-macros.m4 =================================================================== --- trunk/util/xutils-dev/util-macros/xorg-macros.m4 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/xorg-macros.m4 2006-08-29 01:11:38 UTC (rev 3107) @@ -45,7 +45,7 @@ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.0 + [XORG_MACROS_version=1.1.1 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -114,75 +114,47 @@ AC_REQUIRE([AC_CANONICAL_HOST]) if test x$APP_MAN_SUFFIX = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; - *) APP_MAN_SUFFIX=1 ;; - esac + APP_MAN_SUFFIX=1 fi if test x$APP_MAN_DIR = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; - *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; - esac + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' fi if test x$LIB_MAN_SUFFIX = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;; - *) LIB_MAN_SUFFIX=3 ;; - esac + LIB_MAN_SUFFIX=3 fi if test x$LIB_MAN_DIR = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;; - *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;; - esac + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' fi if test x$FILE_MAN_SUFFIX = x ; then case $host_os in - linux* | gnu* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;; solaris*) FILE_MAN_SUFFIX=4 ;; *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; - *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; - esac + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' fi -# In Imake's linux.cf, the misc man suffix & dir was only changed for -# LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$MISC_MAN_SUFFIX = x ; then case $host_os in -# linux* | gnu* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;; solaris*) MISC_MAN_SUFFIX=5 ;; *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then - case $host_os in -# linux* | gnu* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;; - *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;; - esac + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' fi -# In Imake's linux.cf, the driver man suffix & dir was only changed for -# LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$DRIVER_MAN_SUFFIX = x ; then case $host_os in -# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;; solaris*) DRIVER_MAN_SUFFIX=7 ;; *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then - case $host_os in -# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;; - *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;; - esac + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' fi if test x$ADMIN_MAN_SUFFIX = x ; then Modified: trunk/util/xutils-dev/util-macros/xorg-macros.m4.in =================================================================== --- trunk/util/xutils-dev/util-macros/xorg-macros.m4.in 2006-08-29 01:07:04 UTC (rev 3106) +++ trunk/util/xutils-dev/util-macros/xorg-macros.m4.in 2006-08-29 01:11:38 UTC (rev 3107) @@ -114,75 +114,47 @@ AC_REQUIRE([AC_CANONICAL_HOST]) if test x$APP_MAN_SUFFIX = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) APP_MAN_SUFFIX=1x ;; - *) APP_MAN_SUFFIX=1 ;; - esac + APP_MAN_SUFFIX=1 fi if test x$APP_MAN_DIR = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) APP_MAN_DIR='$(mandir)/man1' ;; - *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; - esac + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' fi if test x$LIB_MAN_SUFFIX = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) LIB_MAN_SUFFIX=3x ;; - *) LIB_MAN_SUFFIX=3 ;; - esac + LIB_MAN_SUFFIX=3 fi if test x$LIB_MAN_DIR = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) LIB_MAN_DIR='$(mandir)/man3' ;; - *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;; - esac + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' fi if test x$FILE_MAN_SUFFIX = x ; then case $host_os in - linux* | gnu* | k*bsd*-gnu) FILE_MAN_SUFFIX=5x ;; solaris*) FILE_MAN_SUFFIX=4 ;; *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) FILE_MAN_DIR='$(mandir)/man5' ;; - *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; - esac + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' fi -# In Imake's linux.cf, the misc man suffix & dir was only changed for -# LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$MISC_MAN_SUFFIX = x ; then case $host_os in -# linux* | gnu* | k*bsd*-gnu) MISC_MAN_SUFFIX=7x ;; solaris*) MISC_MAN_SUFFIX=5 ;; *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then - case $host_os in -# linux* | gnu* | k*bsd*-gnu) MISC_MAN_DIR='$(mandir)/man7' ;; - *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;; - esac + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' fi -# In Imake's linux.cf, the driver man suffix & dir was only changed for -# LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$DRIVER_MAN_SUFFIX = x ; then case $host_os in -# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_SUFFIX=4x ;; solaris*) DRIVER_MAN_SUFFIX=7 ;; *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then - case $host_os in -# linux* | gnu* | k*bsd*-gnu) DRIVER_MAN_DIR='$(mandir)/man4' ;; - *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;; - esac + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' fi if test x$ADMIN_MAN_SUFFIX = x ; then -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]