Author: dilinger
Date: 2006-07-17 04:32:34 -0400 (Mon, 17 Jul 2006)
New Revision: 2472
Modified:
branches/7.1/proto/fixesproto/aclocal.m4
branches/7.1/proto/fixesproto/configure
branches/7.1/proto/fixesproto/debian/changelog
branches/7.1/proto/fixesproto/debian/control
Log:
+ * Ack NMU.
+ * Bump standards version to 3.7.2.0.
+ * Drop duplicate x11-common dep for x11proto-fixes-dev.
+ * Version x11-common pre-dep in x11proto-fixes-dev to 1:7.0.0 to match
+ the rest of Debian.
And autoreconf w/ xutils-dev installed this time; oops!
Modified: branches/7.1/proto/fixesproto/aclocal.m4
===================================================================
--- branches/7.1/proto/fixesproto/aclocal.m4 2006-07-17 08:18:42 UTC (rev
2471)
+++ branches/7.1/proto/fixesproto/aclocal.m4 2006-07-17 08:32:34 UTC (rev
2472)
@@ -11,6 +11,50 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+dnl Copyright 2005 Red Hat, Inc
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl
+
+# XORG_RELEASE_VERSION
+# --------------------
+# Adds --with/without-release-string and changes the PACKAGE and
+# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+
+AC_DEFUN([XORG_RELEASE_VERSION],[
+ AC_ARG_WITH(release-version,
+ AC_HELP_STRING([--with-release-version=STRING],
+ [Use release version string in package name]),
+ [RELEASE_VERSION="$withval"],
+ [RELEASE_VERSION=""])
+ if test "x$RELEASE_VERSION" != "x"; then
+ PACKAGE="$PACKAGE-$RELEASE_VERSION"
+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+ AC_MSG_NOTICE([Building with package name set to $PACKAGE])
+ fi
+])
+
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
Modified: branches/7.1/proto/fixesproto/configure
===================================================================
--- branches/7.1/proto/fixesproto/configure 2006-07-17 08:18:42 UTC (rev
2471)
+++ branches/7.1/proto/fixesproto/configure 2006-07-17 08:32:34 UTC (rev
2472)
@@ -1199,6 +1199,12 @@
esac
cat <<\_ACEOF
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-release-version=STRING
+ Use release version string in package name
+
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
_ACEOF
ac_status=$?
@@ -2091,8 +2097,23 @@
-XORG_RELEASE_VERSION
+
+# Check whether --with-release-version was given.
+if test "${with_release_version+set}" = set; then
+ withval=$with_release_version; RELEASE_VERSION="$withval"
+else
+ RELEASE_VERSION=""
+fi
+
+ if test "x$RELEASE_VERSION" != "x"; then
+ PACKAGE="$PACKAGE-$RELEASE_VERSION"
+ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
+ { echo "$as_me:$LINENO: Building with package name set to
$PACKAGE" >&5
+echo "$as_me: Building with package name set to $PACKAGE" >&6;}
+ fi
+
+
ac_config_files="$ac_config_files Makefile fixesproto.pc"
cat >confcache <<\_ACEOF
Modified: branches/7.1/proto/fixesproto/debian/changelog
===================================================================
--- branches/7.1/proto/fixesproto/debian/changelog 2006-07-17 08:18:42 UTC
(rev 2471)
+++ branches/7.1/proto/fixesproto/debian/changelog 2006-07-17 08:32:34 UTC
(rev 2472)
@@ -3,6 +3,11 @@
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
* Run dh_install w/ --list-missing.
+ * Ack NMU.
+ * Bump standards version to 3.7.2.0.
+ * Drop duplicate x11-common dep for x11proto-fixes-dev.
+ * Version x11-common pre-dep in x11proto-fixes-dev to 1:7.0.0 to match
+ the rest of Debian.
-- Andres Salomon <[EMAIL PROTECTED]> Mon, 17 Jul 2006 01:23:31 -0400
Modified: branches/7.1/proto/fixesproto/debian/control
===================================================================
--- branches/7.1/proto/fixesproto/debian/control 2006-07-17 08:18:42 UTC
(rev 2471)
+++ branches/7.1/proto/fixesproto/debian/control 2006-07-17 08:32:34 UTC
(rev 2472)
@@ -4,14 +4,14 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2.0
Package: x11proto-fixes-dev
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, x11proto-core-dev,
x11proto-xext-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev,
x11proto-xext-dev
Conflicts: libxfixes-dev (<< 6.8.2-16)
Replaces: libxfixes-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1:1.0)
+Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Fixes extension wire protocol
This package provides the wire protocol for the Fixes extension, which
contains
a few small extensions to the X protocol, including a Region type.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
