Tags 377652 +patch +pending
thanks
I'm providing a patch (output of the interdiff for the NMU) and I'm going
to upload an NMU to the 7-day delayed queue.
The patch fixed the problem with the rgb file, and also includes the demo
files and the run_demos script.
--
Besos,
Maggie.
diff -u xball-3.0/xball.c xball-3.0/xball.c
--- xball-3.0/xball.c
+++ xball-3.0/xball.c
@@ -72,7 +72,7 @@
puts(" -perpetual perpetual Balls do not die if
specified");
puts(" -haltSim haltSim Starts w/simulation
halted if specified");
puts(" -demoFile demoFile A demo file to run at
startup");
- puts(" -rgbTxt /usr/lib/X11/rgb.txt Path to rgb file)");
+ puts(" -rgbTxt /etc/X11/rgb.txt Path to rgb file");
exit(0);
}
diff -u xball-3.0/xball.man xball-3.0/xball.man
--- xball-3.0/xball.man
+++ xball-3.0/xball.man
@@ -63,10 +63,10 @@
.TP 3
\fBXBall.rgbTxt\fR
Specified the file to load for the colors. The default file is
-/usr/lib/X11/app-defaults/rgb.txt
+/etc/X11/rgb.txt
.SH FILES
.TP
-/usr/lib/X11/rgb.txt X11 color names and values.
+/etc/X11/rgb.txt X11 color names and values.
.sp
.SH AUTHOR
.PP
diff -u xball-3.0/debian/changelog xball-3.0/debian/changelog
--- xball-3.0/debian/changelog
+++ xball-3.0/debian/changelog
@@ -1,3 +1,11 @@
+xball (3.0-16.1) unstable; urgency=low
+
+ * NMU to fix RGB_TXT and all other references to point to /etc/X11/rgb.txt,
+ as it is in x11-common. (Closes: #377652).
+ * Added the demo files to the documentation.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Thu, 13 Jul 2006 19:32:23 -0300
+
xball (3.0-16) unstable; urgency=high
* Update to add patch in "NMU" 3.0-15.1 (closes: #303337)
diff -u xball-3.0/debian/rules xball-3.0/debian/rules
--- xball-3.0/debian/rules
+++ xball-3.0/debian/rules
@@ -55,14 +55,15 @@
dh_testdir
dh_testroot
dh_installdocs
- dh_installexamples
+ mkdir -p debian/xball/usr/share/doc/xball/demos
+ cp -p demo[0-9]* *.xbm run_demos
debian/xball/usr/share/doc/xball/demos/
dh_installmenu
dh_installman xball.man
dh_installchangelogs
dh_link
dh_strip
- dh_compress
- dh_fixperms
+ dh_compress -X demos
+ dh_fixperms -X demos/run_demos
dh_installdeb
dh_shlibdeps
dh_gencontrol
only in patch2:
unchanged:
--- xball-3.0.orig/item.c
+++ xball-3.0/item.c
@@ -31,7 +31,7 @@
#define ITEM_WIDTH 10 /* The item's default size */
#define ITEM_HEIGHT 10
#ifndef RGB_TXT
-#define RGB_TXT "/usr/lib/X11/rgb.txt"
+#define RGB_TXT "/etc/X11/rgb.txt"
#endif
/* put_pixmap - Draws the item's pixmap to the specified location */
