Author: branden
Date: 2003-07-30 16:23:28 -0500 (Wed, 30 Jul 2003)
New Revision: 337
Modified:
trunk/debian/changelog
trunk/debian/libdps1-dbg.install
trunk/debian/libxaw6-dbg.install
trunk/debian/libxaw7-dbg.install
trunk/debian/rules
trunk/debian/xlibmesa3-gl-dbg.install
trunk/debian/xlibmesa3-glu-dbg.install
trunk/debian/xlibosmesa3-dbg.install
trunk/debian/xlibs-dbg.install
trunk/debian/xserver-xfree86-dbg.install
Log:
Fix my misunderstanding of how to use dh_install.
- debian/{libdps1-dbg.install,libxaw6-dbg.install,libxaw7-dbg.install,
xlibmesa3-gl-dbg.install,xlibmesa3-glu-dbg.install,
xlibosmesa3-dbg.install,xlibs-dbg.install}: destinations should be
directories, not filenames (Closes: #201586)
- rules: install the XFree86(1x) manpage as XFree86-debug(1x) in the
xserver-xfree86-dbg package
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-07-30 17:46:14 UTC (rev 336)
+++ trunk/debian/changelog 2003-07-30 21:23:28 UTC (rev 337)
@@ -54,8 +54,16 @@
update-alternatives is buggy, easily confused, and prone to wreak random
havoc (based on a patch by Eduard Bloch -- thanks!) (Closes: #164021)
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 30 Jul 2003 12:39:13 -0500
+ * Fix my misunderstanding of how to use dh_install.
+ - debian/{libdps1-dbg.install,libxaw6-dbg.install,libxaw7-dbg.install,
+ xlibmesa3-gl-dbg.install,xlibmesa3-glu-dbg.install,
+ xlibosmesa3-dbg.install,xlibs-dbg.install}: destinations should be
+ directories, not filenames (Closes: #201586)
+ - rules: install the XFree86(1x) manpage as XFree86-debug(1x) in the
+ xserver-xfree86-dbg package
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 30 Jul 2003 16:16:12 -0500
+
xfree86 (4.2.1-9) unstable; urgency=high
* urgency due to xterm security fixes; see below
Modified: trunk/debian/libdps1-dbg.install
==============================================================================
--- trunk/debian/libdps1-dbg.install 2003-07-30 17:46:14 UTC (rev 336)
+++ trunk/debian/libdps1-dbg.install 2003-07-30 21:23:28 UTC (rev 337)
@@ -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: trunk/debian/libxaw6-dbg.install
==============================================================================
--- trunk/debian/libxaw6-dbg.install 2003-07-30 17:46:14 UTC (rev 336)
+++ trunk/debian/libxaw6-dbg.install 2003-07-30 21:23:28 UTC (rev 337)
@@ -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: trunk/debian/libxaw7-dbg.install
==============================================================================
--- trunk/debian/libxaw7-dbg.install 2003-07-30 17:46:14 UTC (rev 336)
+++ trunk/debian/libxaw7-dbg.install 2003-07-30 21:23:28 UTC (rev 337)
@@ -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: trunk/debian/rules
==============================================================================
--- trunk/debian/rules 2003-07-30 17:46:14 UTC (rev 336)
+++ trunk/debian/rules 2003-07-30 21:23:28 UTC (rev 337)
@@ -356,6 +356,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
@@ -486,6 +489,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: trunk/debian/xlibmesa3-gl-dbg.install
==============================================================================
--- trunk/debian/xlibmesa3-gl-dbg.install 2003-07-30 17:46:14 UTC (rev
336)
+++ trunk/debian/xlibmesa3-gl-dbg.install 2003-07-30 21:23:28 UTC (rev
337)
@@ -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: trunk/debian/xlibmesa3-glu-dbg.install
==============================================================================
--- trunk/debian/xlibmesa3-glu-dbg.install 2003-07-30 17:46:14 UTC (rev
336)
+++ trunk/debian/xlibmesa3-glu-dbg.install 2003-07-30 21:23:28 UTC (rev
337)
@@ -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: trunk/debian/xlibosmesa3-dbg.install
==============================================================================
--- trunk/debian/xlibosmesa3-dbg.install 2003-07-30 17:46:14 UTC (rev
336)
+++ trunk/debian/xlibosmesa3-dbg.install 2003-07-30 21:23:28 UTC (rev
337)
@@ -1 +1 @@
-usr/X11R6/lib/libOSMesa.so.3.3 usr/X11R6/lib/debug/libOSMesa.so.3.3
+usr/X11R6/lib/libOSMesa.so.3.3 usr/X11R6/lib/debug
Modified: trunk/debian/xlibs-dbg.install
==============================================================================
--- trunk/debian/xlibs-dbg.install 2003-07-30 17:46:14 UTC (rev 336)
+++ trunk/debian/xlibs-dbg.install 2003-07-30 21:23:28 UTC (rev 337)
@@ -1,22 +1,22 @@
-usr/X11R6/lib/X11/locale/common/ximcp.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/ximcp.so.2
-usr/X11R6/lib/X11/locale/common/xlcDef.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlcDef.so.2
-usr/X11R6/lib/X11/locale/common/xlcUTF8Load.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlcUTF8Load.so.2
-usr/X11R6/lib/X11/locale/common/xlibi18n.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlibi18n.so.2
-usr/X11R6/lib/X11/locale/common/xlocale.so.2
usr/X11R6/lib/debug/X11/locale/lib/common/xlocale.so.2
-usr/X11R6/lib/X11/locale/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.1.0 usr/X11R6/lib/debug/libXrandr.so.1.0
-usr/X11R6/lib/libXrender.so.1.1 usr/X11R6/lib/debug/libXrender.so.1.1
-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/common/ximcp.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/common/xlcDef.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/common/xlcUTF8Load.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/common/xlibi18n.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/common/xlocale.so.2
usr/X11R6/lib/debug/X11/locale/lib/common
+usr/X11R6/lib/X11/locale/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.1.0 usr/X11R6/lib/debug
+usr/X11R6/lib/libXrender.so.1.1 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: trunk/debian/xserver-xfree86-dbg.install
==============================================================================
--- trunk/debian/xserver-xfree86-dbg.install 2003-07-30 17:46:14 UTC (rev
336)
+++ trunk/debian/xserver-xfree86-dbg.install 2003-07-30 21:23:28 UTC (rev
337)
@@ -1,2 +1 @@
usr/X11R6/bin/XFree86-debug
-usr/X11R6/man/man1/XFree86.1x usr/X11R6/man/man1/XFree86-debug.1x
