[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1922 - trunk/debian



Author: branden
Date: 2004-10-08 00:00:09 -0500 (Fri, 08 Oct 2004)
New Revision: 1922

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/rules
Log:
Install xlibs's bug script in the binary-indep rule, not binary-arch,
since xlibs is an architecture "all" package.  Now the script will
actually be shipped.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-10-08 04:57:10 UTC (rev 1921)
+++ trunk/debian/CHANGESETS	2004-10-08 05:00:09 UTC (rev 1922)
@@ -36,4 +36,9 @@
 (Closes: #250333, #231837, #80140, #250331)
     1921
 
+Install xlibs's bug script in the binary-indep rule, not binary-arch,
+since xlibs is an architecture "all" package.  Now the script will
+actually be shipped.
+    1922
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-10-08 04:57:10 UTC (rev 1921)
+++ trunk/debian/changelog	2004-10-08 05:00:09 UTC (rev 1922)
@@ -11,6 +11,10 @@
   * Apply patch from Jan Wilhelm Stumpel to correct miscoded Unicode Plane 1
     characters in en_US.UTF-8 compose map.  (Closes: #267321)
 
+  * Install xlibs's bug script in the binary-indep rule, not binary-arch,
+    since xlibs is an architecture "all" package.  Now the script will
+    actually be shipped.
+
   Changes by Denis Barbier and Fabio M. Di Nitto:
 
   * Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -30,7 +34,7 @@
     + Add patch 036_wacom_update_to_0.6.4.diff
     (Closes: #250333, #231837, #80140, #250331)
 
- -- Branden Robinson <branden@debian.org>  Thu,  7 Oct 2004 17:09:12 -0500
+ -- Branden Robinson <branden@debian.org>  Thu,  7 Oct 2004 23:58:53 -0500
 
 xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2004-10-08 04:57:10 UTC (rev 1921)
+++ trunk/debian/rules	2004-10-08 05:00:09 UTC (rev 1922)
@@ -409,6 +409,9 @@
 	egrep -v 'iso8859-(8|15)$$' $(DEBTREEDIR)/usr/X11R6/lib/X11/fonts/misc/fonts.alias > debian/xfonts-base/etc/X11/fonts/misc/xfonts-base.alias
 	cp -f $(DEBTREEDIR)/usr/X11R6/lib/X11/fonts/Speedo/fonts.scale debian/xfonts-scalable/etc/X11/fonts/Speedo/xfonts-scalable.scale
 	cp -f $(DEBTREEDIR)/usr/X11R6/lib/X11/fonts/Type1/fonts.scale debian/xfonts-scalable/etc/X11/fonts/Type1/xfonts-scalable.scale
+	# install bug report assistance script
+	install -m 755 -d debian/xlibs/usr/share/bug
+	install -m 755 debian/xlibs.bug debian/xlibs/usr/share/bug/xlibs
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
@@ -454,8 +457,6 @@
 	install -m 755 -d debian/xlibmesa-dri/usr/share/bug
 	install -m 755 debian/xlibmesa-dri.bug debian/xlibmesa-dri/usr/share/bug/xlibmesa-dri
 endif
-	install -m 755 -d debian/xlibs/usr/share/bug
-	install -m 755 debian/xlibs.bug debian/xlibs/usr/share/bug/xlibs
 	dh_installexamples
 	dh_installmenu
 	dh_installpam



Reply to: