X Strike Force Render SVN commit: r37 - trunk/debian
Author: branden
Date: 2004-02-16 13:35:18 -0500 (Mon, 16 Feb 2004)
New Revision: 37
Removed:
trunk/debian/render-dev.postrm
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/debian/render-dev.preinst
Log:
Merge changes from branches/post-xfree86-4.3.0-reorg.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-12-10 00:26:53 UTC (rev 36)
+++ trunk/debian/changelog 2004-02-16 18:35:18 UTC (rev 37)
@@ -1,3 +1,16 @@
+render (0.8-4) unstable; urgency=low
+
+ * Make package compatible with the XFree86 4.3.0 package reorganization.
+ - debian/control:
+ + render-dev depends on x-dev for X protocol headers
+ + render-dev conflicts with xlibs-dev (<< 4.3.0) due to (now undiverted)
+ file overlaps
+ - debian/render-dev.preinst: remove diversions made by previous versions
+ of render-dev if present
+ - debian/render-dev.postrm: deleted
+
+ -- Branden Robinson <branden@debian.org> Mon, 8 Dec 2003 17:07:04 -0500
+
render (0.8-3) unstable; urgency=low
* Correct installation location of render.pc file (thanks, Aaron M. Ucko!)
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2003-12-10 00:26:53 UTC (rev 36)
+++ trunk/debian/control 2004-02-16 18:35:18 UTC (rev 37)
@@ -9,7 +9,8 @@
Package: render-dev
Section: libdevel
Architecture: all
-Depends: xlibs-dev
+Depends: x-dev
+Conflicts: xlibs-dev (<< 4.3.0)
Description: X Rendering Extension header files and documentation
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/render-dev.postrm
===================================================================
--- trunk/debian/render-dev.postrm 2003-12-10 00:26:53 UTC (rev 36)
+++ trunk/debian/render-dev.postrm 2004-02-16 18:35:18 UTC (rev 37)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-set -e
-
-if [ "$1" = "remove" ]; then
- dpkg-divert --package render-dev --remove --rename \
- --divert /usr/X11R6/include/X11/extensions/render-0.2.h /usr/X11R6/include/X11/extensions/render.h
- dpkg-divert --package render-dev --remove --rename \
- --divert /usr/X11R6/include/X11/extensions/renderproto-0.2.h /usr/X11R6/include/X11/extensions/renderproto.h
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=4 sw=4 tw=0:
Modified: trunk/debian/render-dev.preinst
===================================================================
--- trunk/debian/render-dev.preinst 2003-12-10 00:26:53 UTC (rev 36)
+++ trunk/debian/render-dev.preinst 2004-02-16 18:35:18 UTC (rev 37)
@@ -5,10 +5,22 @@
set -e
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
- dpkg-divert --package render-dev --add --rename \
- --divert /usr/X11R6/include/X11/extensions/render-0.2.h /usr/X11R6/include/X11/extensions/render.h
- dpkg-divert --package render-dev --add --rename \
- --divert /usr/X11R6/include/X11/extensions/renderproto-0.2.h /usr/X11R6/include/X11/extensions/renderproto.h
+ # Eliminate diversions created by render-dev (<= 0.8-3). "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/include/X11/extensions/render.h)" != \
+ "" ]; then
+ dpkg-divert --package render-dev --remove --rename \
+ --divert /usr/X11R6/include/X11/extensions/render-0.2.h \
+ /usr/X11R6/include/X11/extensions/render.h
+ fi
+
+ if [ "$(dpkg-divert --list \
+ /usr/X11R6/include/X11/extensions/renderproto.h)" != "" ]; then
+ dpkg-divert --package render-dev --remove --rename \
+ --divert /usr/X11R6/include/X11/extensions/renderproto-0.2.h \
+ /usr/X11R6/include/X11/extensions/renderproto.h
+ fi
fi
#DEBHELPER#
Reply to: