Author: branden
Date: 2003-07-30 16:32:47 -0500 (Wed, 30 Jul 2003)
New Revision: 338
Modified:
branches/4.3.0/sid/debian/libdps1-dbg.install
branches/4.3.0/sid/debian/libxaw6-dbg.install
branches/4.3.0/sid/debian/libxaw7-dbg.install
branches/4.3.0/sid/debian/rules
branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install
branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install
branches/4.3.0/sid/debian/xlibosmesa4-dbg.install
branches/4.3.0/sid/debian/xlibs-dbg.install
branches/4.3.0/sid/debian/xserver-xfree86-dbg.install
Log:
debian/{libdps1-dbg.install, libxaw6-dbg.install, libxaw7-dbg.install,
rules, xlibmesa-gl-dbg.install, xlibmesa-glu-dbg.install,
xlibosmesa4-dbg.install, xlibs-dbg.install, xserver-xfree86-dbg.install}:
merge (and migrate) revision 337 from trunk
Modified: branches/4.3.0/sid/debian/libdps1-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/libdps1-dbg.install 2003-07-30 21:23:28 UTC
(rev 337)
+++ branches/4.3.0/sid/debian/libdps1-dbg.install 2003-07-30 21:32:47 UTC
(rev 338)
@@ -1,3 +1,3 @@
-usr/X11R6/lib/libdps.so.1.0 usr/X11R6/lib/debug/libdps.so.1.0
-usr/X11R6/lib/libdpstk.so.1.0 usr/X11R6/lib/debug/libdpstk.so.1.0
-usr/X11R6/lib/libpsres.so.1.0 usr/X11R6/lib/debug/libpsres.so.1.0
+usr/X11R6/lib/libdps.so.1.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libdpstk.so.1.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libpsres.so.1.0 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/libxaw6-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/libxaw6-dbg.install 2003-07-30 21:23:28 UTC
(rev 337)
+++ branches/4.3.0/sid/debian/libxaw6-dbg.install 2003-07-30 21:32:47 UTC
(rev 338)
@@ -1 +1 @@
-usr/X11R6/lib/libXaw.so.6.1 usr/X11R6/lib/debug/libXaw.so.6.1
+usr/X11R6/lib/libXaw.so.6.1 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/libxaw7-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/libxaw7-dbg.install 2003-07-30 21:23:28 UTC
(rev 337)
+++ branches/4.3.0/sid/debian/libxaw7-dbg.install 2003-07-30 21:32:47 UTC
(rev 338)
@@ -1 +1 @@
-usr/X11R6/lib/libXaw.so.7.0 usr/X11R6/lib/debug/libXaw.so.7.0
+usr/X11R6/lib/libXaw.so.7.0 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/rules
==============================================================================
--- branches/4.3.0/sid/debian/rules 2003-07-30 21:23:28 UTC (rev 337)
+++ branches/4.3.0/sid/debian/rules 2003-07-30 21:32:47 UTC (rev 338)
@@ -390,6 +390,9 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
+ # special handling
+ install -d 755 debian/xserver-xfree86-dbg/usr/X11R6/man/man1
+ install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x
debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x
dh_installdebconf
dh_installdirs
dh_installdocs
@@ -519,6 +522,9 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
+ # special handling
+ install -d 755 debian/xserver-xfree86-dbg/usr/X11R6/man/man1
+ install -m 644 debian/tmp/usr/X11R6/man/man1/XFree86.1x
debian/xserver-xfree86-dbg/usr/X11R6/man/man1/XFree86-debug.1x
dh_installdebconf
dh_installdirs
dh_installdocs
Modified: branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install 2003-07-30 21:23:28 UTC
(rev 337)
+++ branches/4.3.0/sid/debian/xlibmesa-gl-dbg.install 2003-07-30 21:32:47 UTC
(rev 338)
@@ -1 +1 @@
-usr/X11R6/lib/libGL.so.1.2 usr/X11R6/lib/debug/libGL.so.1.2
+usr/X11R6/lib/libGL.so.1.2 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install 2003-07-30 21:23:28 UTC
(rev 337)
+++ branches/4.3.0/sid/debian/xlibmesa-glu-dbg.install 2003-07-30 21:32:47 UTC
(rev 338)
@@ -1 +1 @@
-usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/debug/libGLU.so.1.3
+usr/X11R6/lib/libGLU.so.1.3 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/xlibosmesa4-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibosmesa4-dbg.install 2003-07-30 21:23:28 UTC
(rev 337)
+++ branches/4.3.0/sid/debian/xlibosmesa4-dbg.install 2003-07-30 21:32:47 UTC
(rev 338)
@@ -1 +1 @@
-usr/X11R6/lib/libOSMesa.so.4.0 usr/X11R6/lib/debug/libOSMesa.so.4.0
+usr/X11R6/lib/libOSMesa.so.4.0 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/xlibs-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dbg.install 2003-07-30 21:23:28 UTC (rev
337)
+++ branches/4.3.0/sid/debian/xlibs-dbg.install 2003-07-30 21:32:47 UTC (rev
338)
@@ -1,21 +1,21 @@
-usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/ximcp.so.2
-usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlcDef.so.2
-usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlcUTF8Load.so.2
-usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlibi18n.so.2
-usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlocale.so.2
-usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xomGeneric.so.2
-usr/X11R6/lib/libICE.so.6.3 usr/X11R6/lib/debug/libICE.so.6.3
-usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/debug/libSM.so.6.0
-usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/debug/libX11.so.6.2
-usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/debug/libXTrap.so.6.4
-usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/debug/libXext.so.6.4
-usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/debug/libXft.so.1.1
-usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/debug/libXi.so.6.0
-usr/X11R6/lib/libXmu.so.6.2 usr/X11R6/lib/debug/libXmu.so.6.2
-usr/X11R6/lib/libXmuu.so.1.0 usr/X11R6/lib/debug/libXmuu.so.1.0
-usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/debug/libXp.so.6.2
-usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/debug/libXpm.so.4.11
-usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/debug/libXrandr.so.2.0
-usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/debug/libXt.so.6.0
-usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/debug/libXtst.so.6.1
-usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/debug/libxrx.so.6.3
+usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/libICE.so.6.3 usr/X11R6/lib/debug
+usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/debug
+usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/debug
+usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/debug
+usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/debug
+usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libXmu.so.6.2 usr/X11R6/lib/debug
+usr/X11R6/lib/libXmuu.so.1.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/debug
+usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/debug
+usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/debug
+usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/debug
Modified: branches/4.3.0/sid/debian/xserver-xfree86-dbg.install
==============================================================================
--- branches/4.3.0/sid/debian/xserver-xfree86-dbg.install 2003-07-30
21:23:28 UTC (rev 337)
+++ branches/4.3.0/sid/debian/xserver-xfree86-dbg.install 2003-07-30
21:32:47 UTC (rev 338)
@@ -1,2 +1 @@
usr/X11R6/bin/XFree86-debug
-usr/X11R6/man/man1/XFree86.1x usr/X11R6/man/man1/XFree86-debug.1x
