X Strike Force Xrender SVN commit: r86 - trunk/debian
Author: branden
Date: 2004-02-16 15:33:48 -0500 (Mon, 16 Feb 2004)
New Revision: 86
Removed:
trunk/debian/libxrender-dev.postrm
trunk/debian/libxrender1-dbg.postrm
trunk/debian/libxrender1.postrm
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/libxrender-dev.preinst
trunk/debian/libxrender1-dbg.preinst
trunk/debian/libxrender1.preinst
Log:
Merge changes from branches/post-xfree86-4.3.0-reorg.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/changelog 2004-02-16 20:33:48 UTC (rev 86)
@@ -1,9 +1,20 @@
xrender (0.8.3-6) unstable; urgency=low
- * Dummy entry because I changed the 0.8.3-5 changelog. Replace this entry
- with the first real change to 0.8.3-6.
+ * Make package compatible with the XFree86 4.3.0 package reorganization.
+ - debian/control:
+ + package build-depends on x-dev and libx11-dev instead of xlibs-dev
+ + libxrender-dev depends on x-dev and libx11-dev instead of xlibs-dev
+ + increased versioned conflict of libxrender1 on xlibs to (<< 4.3.0)
+ due to (now undiverted) file overlaps
+ + increased versioned conflict of libxrender1-dbg on xlibs-dbg to (<<
+ 4.3.0) due to (now undiverted) file overlaps
+ + increased versioned conflict of libxrender-dev on xlibs-dev to (<<
+ 4.3.0) due to (now undiverted) file overlaps
+ - debian/{libxrender1,libxrender1-dbg,libxrender-dev}.preinst: remove
+ diversions made by previous versions of package if present
+ - debian/{libxrender1,libxrender1-dbg,libxrender-dev}.postrm: deleted
- -- Branden Robinson <branden@debian.org> Fri, 5 Dec 2003 01:34:34 -0500
+ -- Branden Robinson <branden@debian.org> Tue, 9 Dec 2003 04:54:10 -0500
xrender (0.8.3-5) unstable; urgency=high
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/control 2004-02-16 20:33:48 UTC (rev 86)
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <branden@debian.org>
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), pkg-config, xlibs-dev, render-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), pkg-config, libx11-dev, render-dev, x-dev
Standards-Version: 3.6.1
Package: libxrender1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: xlibs (<< 4.2.1)
+Conflicts: xlibs (<< 4.3.0)
Description: X Rendering Extension client library
The X Rendering Extension (Render) introduces digital image composition as
the foundation of a new rendering model within the X Window System.
@@ -24,7 +24,7 @@
Priority: extra
Architecture: any
Depends: libxrender1 (= ${Source-Version}), ${shlibs:Depends}
-Conflicts: xlibs-dbg (<< 4.2.1)
+Conflicts: xlibs-dbg (<< 4.3.0)
Description: X Rendering Extension client library (unstripped)
The X Rendering Extension (Render) introduces digital image composition as
the foundation of a new rendering model within the X Window System.
@@ -44,8 +44,8 @@
Package: libxrender-dev
Section: libdevel
Architecture: any
-Depends: libxrender1 (= ${Source-Version}), libc6-dev | libc-dev, xlibs-dev, render-dev
-Conflicts: xlibs-dev (<< 4.2.1)
+Depends: libxrender1 (= ${Source-Version}), libc6-dev | libc-dev, libx11-dev, render-dev, x-dev
+Conflicts: xlibs-dev (<< 4.3.0)
Description: X Rendering Extension client library (development files)
The X Rendering Extension (Render) introduces digital image composition as
the foundation of a new rendering model within the X Window System.
Deleted: trunk/debian/libxrender-dev.postrm
===================================================================
--- trunk/debian/libxrender-dev.postrm 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/libxrender-dev.postrm 2004-02-16 20:33:48 UTC (rev 86)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-set -e
-
-if [ "$1" = "remove" ]; then
- dpkg-divert --package libxrender-dev --remove --rename \
- --divert /usr/X11R6/lib/libXrender-1.1.a /usr/X11R6/lib/libXrender.a
- dpkg-divert --package libxrender-dev --remove --rename \
- --divert /usr/X11R6/lib/libXrender-1.1.so /usr/X11R6/lib/libXrender.so
- dpkg-divert --package libxrender-dev --remove --rename \
- --divert /usr/X11R6/include/X11/extensions/Xrender-1.1.h /usr/X11R6/include/X11/extensions/Xrender.h
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=4 sw=4 tw=0:
Modified: trunk/debian/libxrender-dev.preinst
===================================================================
--- trunk/debian/libxrender-dev.preinst 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/libxrender-dev.preinst 2004-02-16 20:33:48 UTC (rev 86)
@@ -5,12 +5,29 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- dpkg-divert --package libxrender-dev --add --rename \
- --divert /usr/X11R6/lib/libXrender-1.1.a /usr/X11R6/lib/libXrender.a
- dpkg-divert --package libxrender-dev --add --rename \
- --divert /usr/X11R6/lib/libXrender-1.1.so /usr/X11R6/lib/libXrender.so
- dpkg-divert --package libxrender-dev --add --rename \
- --divert /usr/X11R6/include/X11/extensions/Xrender-1.1.h /usr/X11R6/include/X11/extensions/Xrender.h
+ # Eliminate diversions created by libxrender-dev (<= 0.8.3-5).
+ # "dpkg-divert --list" does not have a useful exit status, so we have to
+ # compare its output to the null string.
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.a)" != \
+ "" ]; then
+ dpkg-divert --package libxrender-dev --remove --rename \
+ --divert /usr/X11R6/lib/libXrender-1.1.a \
+ /usr/X11R6/lib/libXrender.a
+ fi
+
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.so)" != \
+ "" ]; then
+ dpkg-divert --package libxrender-dev --remove --rename \
+ --divert /usr/X11R6/lib/libXrender-1.1.so \
+ /usr/X11R6/lib/libXrender.so
+ fi
+
+ if [ "$(dpkg-divert --list \
+ /usr/X11R6/include/X11/extensions/Xrender.h)" != "" ]; then
+ dpkg-divert --package libxrender-dev --remove --rename \
+ --divert /usr/X11R6/include/X11/extensions/Xrender-1.1.h \
+ /usr/X11R6/include/X11/extensions/Xrender.h
+ fi
fi
#DEBHELPER#
Deleted: trunk/debian/libxrender1-dbg.postrm
===================================================================
--- trunk/debian/libxrender1-dbg.postrm 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/libxrender1-dbg.postrm 2004-02-16 20:33:48 UTC (rev 86)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-set -e
-
-if [ "$1" = "remove" ]; then
- dpkg-divert --package libxrender1-dbg --remove --rename \
- --divert /usr/X11R6/lib/debug/libXrender-1.1.so.1 /usr/X11R6/lib/debug/libXrender.so.1
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=4 sw=4 tw=0:
Modified: trunk/debian/libxrender1-dbg.preinst
===================================================================
--- trunk/debian/libxrender1-dbg.preinst 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/libxrender1-dbg.preinst 2004-02-16 20:33:48 UTC (rev 86)
@@ -5,8 +5,15 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- dpkg-divert --package libxrender1-dbg --add --rename \
- --divert /usr/X11R6/lib/debug/libXrender-1.1.so.1 /usr/X11R6/lib/debug/libXrender.so.1
+ # Eliminate diversions created by libxrender1-dbg (<= 0.8.3-5).
+ # "dpkg-divert --list" does not have a useful exit status, so we have to
+ # compare its output to the null string.
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/debug/libXrender.so.1)" != \
+ "" ]; then
+ dpkg-divert --package libxrender1-dbg --remove --rename \
+ --divert /usr/X11R6/lib/debug/libXrender-1.1.so.1 \
+ /usr/X11R6/lib/debug/libXrender.so.1
+ fi
fi
#DEBHELPER#
Deleted: trunk/debian/libxrender1.postrm
===================================================================
--- trunk/debian/libxrender1.postrm 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/libxrender1.postrm 2004-02-16 20:33:48 UTC (rev 86)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-set -e
-
-if [ "$1" = "remove" ]; then
- dpkg-divert --package libxrender1 --remove --rename \
- --divert /usr/X11R6/lib/xlibs.libXrender-1.1.so.1.1 /usr/X11R6/lib/libXrender.so.1.1
- dpkg-divert --package libxrender1 --remove --rename \
- --divert /usr/X11R6/lib/libXrender-1.1.so.1 /usr/X11R6/lib/libXrender.so.1
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=4 sw=4 tw=0:
Modified: trunk/debian/libxrender1.preinst
===================================================================
--- trunk/debian/libxrender1.preinst 2003-12-10 00:27:42 UTC (rev 85)
+++ trunk/debian/libxrender1.preinst 2004-02-16 20:33:48 UTC (rev 86)
@@ -5,10 +5,22 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- dpkg-divert --package libxrender1 --add --rename \
- --divert /usr/X11R6/lib/xlibs.libXrender-1.1.so.1.1 /usr/X11R6/lib/libXrender.so.1.1
- dpkg-divert --package libxrender1 --add --rename \
- --divert /usr/X11R6/lib/libXrender-1.1.so.1 /usr/X11R6/lib/libXrender.so.1
+ # Eliminate diversions created by libxrender1 (<= 0.8.3-5). "dpkg-divert
+ # --list" does not have a useful exit status, so we have to compare its
+ # output to the null string.
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.so.1.1)" != \
+ "" ]; then
+ dpkg-divert --package libxrender1 --remove --rename \
+ --divert /usr/X11R6/lib/xlibs.libXrender-1.1.so.1.1 \
+ /usr/X11R6/lib/libXrender.so.1.1
+ fi
+
+ if [ "$(dpkg-divert --list /usr/X11R6/lib/libXrender.so.1)" != \
+ "" ]; then
+ dpkg-divert --package libxrender1 --remove --rename \
+ --divert /usr/X11R6/lib/libXrender-1.1.so.1 \
+ /usr/X11R6/lib/libXrender.so.1
+ fi
fi
#DEBHELPER#
Reply to: