tags 578967 + patch
tags 578967 + pending
thanks
Dear maintainer,
I've prepared an NMU for xball (versioned as 3.0.1-1.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru xball-3.0.1/debian/changelog xball-3.0.1/debian/changelog
--- xball-3.0.1/debian/changelog 2010-05-10 21:42:02.000000000 -0700
+++ xball-3.0.1/debian/changelog 2010-05-08 12:56:30.000000000 -0700
@@ -1,3 +1,27 @@
+xball (3.0.1-1.1) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)".
+ * debian/compat
+ - Update to 7.
+ * debian/control
+ - (Build-Depends): update obsolete xutils to xutils-dev
+ (important; Closes: #578967).
+ Update to debhelper 7.1. Add autotools-dev.
+ - (Depends): add ${misc:Depends}.
+ - (Standards-Version): Update to 3.8.4.
+ - (xball::Section): Remove duplicate section.
+ * debian/patches
+ - (Number 10): Fix spelling errors.
+ * debian/rules
+ - (configure-stamp): use newest config.* files.
+ - (install): Change dh_clean to dh_prep.
+ * debian/source/format
+ - New file
+
+ -- Jari Aalto <[email protected]> Sat, 08 May 2010 22:50:10 +0300
+
xball (3.0.1-1) unstable; urgency=low
* New upstream release, consolidates all 3.0 patches
diff -Nru xball-3.0.1/debian/compat xball-3.0.1/debian/compat
--- xball-3.0.1/debian/compat 2007-12-10 15:32:34.000000000 -0800
+++ xball-3.0.1/debian/compat 2010-05-04 04:49:18.000000000 -0700
@@ -1 +1 @@
-5
+7
diff -Nru xball-3.0.1/debian/control xball-3.0.1/debian/control
--- xball-3.0.1/debian/control 2010-05-10 21:42:02.000000000 -0700
+++ xball-3.0.1/debian/control 2010-05-04 04:58:02.000000000 -0700
@@ -2,13 +2,12 @@
Section: games
Priority: optional
Maintainer: Stephen Birch <[email protected]>
-Build-Depends: debhelper (>= 5), lesstif2-dev, xutils, libxmu-dev, libxt-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7.1), lesstif2-dev, xutils-dev, libxmu-dev,
libxt-dev, autotools-dev
+Standards-Version: 3.8.4
Package: xball
Architecture: any
-Section: games
-Depends: ${shlibs:Depends}, menu
+Depends: ${misc:Depends}, ${shlibs:Depends}, menu
Description: Simulate bouncing balls in a window
A simple educational game that simulates bouncing balls in a window. Gravity,
elasticity, and ability to collide can all be adjusted.
diff -Nru xball-3.0.1/debian/patches/10-fix-spelling.patch
xball-3.0.1/debian/patches/10-fix-spelling.patch
--- xball-3.0.1/debian/patches/10-fix-spelling.patch 1969-12-31
16:00:00.000000000 -0800
+++ xball-3.0.1/debian/patches/10-fix-spelling.patch 2010-05-08
12:57:49.000000000 -0700
@@ -0,0 +1,100 @@
+From 2dcce9520511cdecc93dec2566b8b2152c09eb9c Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Sat, 8 May 2010 22:56:08 +0300
+Subject: [PATCH] Fix spelling
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ XBall.ad | 2 +-
+ fallback.h | 4 ++--
+ item.c | 2 +-
+ menu.c | 4 ++--
+ xball_sys.c | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/XBall.ad b/XBall.ad
+index 9f94518..6f15368 100644
+--- a/XBall.ad
++++ b/XBall.ad
+@@ -390,7 +390,7 @@ provided \"as is\" without express or implied warranty. \
+ ! ToggleButton - Push it and toggle the state
+ ! Separator - A line in the menu
+ !
+-! Avaliable menuCallbackNames avaliable (none take optional parameters):
++! Avaliable menuCallbackNames available (none take optional parameters):
+ ! runDemo - Lets user select a demo and run the demo
+ ! loadBitmap - Lets user load a bitmap file
+ ! quit - quits xball program
+diff --git a/fallback.h b/fallback.h
+index 0865792..dc68590 100644
+--- a/fallback.h
++++ b/fallback.h
+@@ -385,12 +385,12 @@ provided \"as is\" without express or implied warranty. \
+ "! Note that the pulldownName of 'help' is automatically used as the help ",
+ "! pulldown.",
+ "!",
+-"! Avaliable WidgetClasses are:",
++"! Available WidgetClasses are:",
+ "! PushButton - push it and cause the action",
+ "! ToggleButton - Push it and toggle the state",
+ "! Separator - A line in the menu",
+ "!",
+-"! Avaliable menuCallbackNames avaliable (none take optional parameters):",
++"! Available menuCallbackNames available (none take optional parameters):",
+ "! runDemo - Lets user select a demo and run the demo",
+ "! loadBitmap - Lets user load a bitmap file",
+ "! quit - quits xball program",
+diff --git a/item.c b/item.c
+index 07125c9..c721e52 100644
+--- a/item.c
++++ b/item.c
+@@ -98,7 +98,7 @@ int y_vel;
+ item->display = static_data->display;
+ item->window = static_data->window;
+
+- /* Draw with the next avaliable pixmap image (color) */
++ /* Draw with the next available pixmap image (color) */
+ static_data->curr_pixmap =
+ (static_data->curr_pixmap + 1) % static_data->num_colors;
+
+diff --git a/menu.c b/menu.c
+index 996159d..b1f66f6 100644
+--- a/menu.c
++++ b/menu.c
+@@ -132,7 +132,7 @@ menu_type menu;
+ }
+
+
+-/* Registers an avaliable callback. This callback can then be
++/* Registers an available callback. This callback can then be
+ referenced by the menu definition resource. If the callback is
+ referenced, the menuCallbackProc is invoked. */
+ void menu__add_callback( menu, action_name, menu_callback_proc, user_data)
+@@ -141,7 +141,7 @@ char *action_name;
+ menuCallbackProc menu_callback_proc;
+ caddr_t user_data;
+ {
+- /* Store avaliable callback into table */
++ /* Store available callback into table */
+ menuCallback *menu_node = XtNew( menuCallback);
+
+
+diff --git a/xball_sys.c b/xball_sys.c
+index 70fd1ae..ee2e4a4 100644
+--- a/xball_sys.c
++++ b/xball_sys.c
+@@ -128,7 +128,7 @@ Widget w;
+ scrollbar__set_value( xball_system->elasticity_bar, res_data.elasticity);
+
+
+- /* Register avaliable menu callbacks */
++ /* Register available menu callbacks */
+
+ menu__add_callback(menu, "runDemo", demo__run_mcb, demo);
+ menu__add_callback(menu, "stopDemo", demo__stop_mcb, demo);
+--
+1.7.0
+
diff -Nru xball-3.0.1/debian/patches/20-xball.man.patch
xball-3.0.1/debian/patches/20-xball.man.patch
--- xball-3.0.1/debian/patches/20-xball.man.patch 1969-12-31
16:00:00.000000000 -0800
+++ xball-3.0.1/debian/patches/20-xball.man.patch 2010-05-08
13:02:46.000000000 -0700
@@ -0,0 +1,62 @@
+From a2df291bafedaf7f5b99677ef3e3b827f5843e32 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <[email protected]>
+Date: Sat, 8 May 2010 23:00:54 +0300
+Subject: [PATCH] xball.man: Misc fixes
+Organization: Private
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jari Aalto <[email protected]>
+---
+ xball.man | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/xball.man b/xball.man
+index 0dea7eb..866c4b6 100644
+--- a/xball.man
++++ b/xball.man
+@@ -3,19 +3,19 @@
+ xball \- bounce balls on the screen
+ .SH SYNOPSIS
+ .B xball
+-[ -help -delay
++[ \-help \-delay
+ .I delay
+--gravity
++\-gravity
+ .I percent-gravity
+--elasticity
++\-elasticity
+ .I percent-elasticity
+--itemWidth
++\-itemWidth
+ .I ball-width
+--itemHeight
++\-itemHeight
+ .I ball-height
+--collide -perpetual -haltSim -demoFile
++\-collide \-perpetual \-haltSim \-demoFile
+ .I demo-file
+--rgbTxt
++\-rgbTxt
+ .I rgb.txt-file
+ ]
+ [XToolkit options]
+@@ -28,12 +28,12 @@ run demo which create and manipulate the balls in various
ways.
+ Documentation is included on-line via the Help menu and is not
+ reproduced here.
+ .SH OPTIONS
+-Run xball -help for a decription of the command line options
++Run xball \-help for a decription of the command line options
+ .SH DEMOS
+ Several demo files are included with the distribution. To run all the
+ demos, run 'run_demos'.
+ .SH RESOURCES
+-Most resources are avaliable for user modification. See the XBall
++Most resources are available for user modification. See the XBall
+ app-defaults file for a complete listing of widgets,
+ .sp
+ Following is a list of the most useful resources:
+--
+1.7.0
+
diff -Nru xball-3.0.1/debian/patches/series xball-3.0.1/debian/patches/series
--- xball-3.0.1/debian/patches/series 1969-12-31 16:00:00.000000000 -0800
+++ xball-3.0.1/debian/patches/series 2010-05-08 13:02:44.000000000 -0700
@@ -0,0 +1,2 @@
+10-fix-spelling.patch
+20-xball.man.patch
diff -Nru xball-3.0.1/debian/rules xball-3.0.1/debian/rules
--- xball-3.0.1/debian/rules 2007-12-10 15:32:34.000000000 -0800
+++ xball-3.0.1/debian/rules 2010-05-04 04:50:29.000000000 -0700
@@ -37,7 +37,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install
cd debian && mv xball/usr/bin xball/usr/games
diff -Nru xball-3.0.1/debian/source/format xball-3.0.1/debian/source/format
--- xball-3.0.1/debian/source/format 1969-12-31 16:00:00.000000000 -0800
+++ xball-3.0.1/debian/source/format 2010-05-08 12:41:47.000000000 -0700
@@ -0,0 +1 @@
+3.0 (quilt)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
