[now also sending to the right bug...]
Hi Sam, as discussed on irc I've created a patch for rcalc. As I had to modify the menu entries anyway, I've also fixed #446749. Cheers, Bernd -- Bernd Zeimetz <[EMAIL PROTECTED]> <http://bzed.de/>
diff -Nuwr rcalc-0.5.0/debian/changelog rcalc-0.5.0.patched/debian/changelog --- rcalc-0.5.0/debian/changelog 2007-10-17 11:14:49.000000000 +0200 +++ rcalc-0.5.0.patched/debian/changelog 2007-10-17 10:58:53.000000000 +0200 @@ -1,3 +1,14 @@ +rcalc (0.5.0-1.2) unstable; urgency=low + + * Non Maintainer Upload + * Renaming the rcalc binaries to grcalc to avoid a name clash with the rcalc + tool from the radiance package. (Closes: #446725) + * Updating the menu file to reflect the name change, also fixing the text + mode entry as grcalc doesn't support -t anymore, using grcalc-term instead. + (Closes: #446749) + + -- Bernd Zeimetz <[EMAIL PROTECTED]> Wed, 17 Oct 2007 10:54:33 +0200 + rcalc (0.5.0-1.1) unstable; urgency=medium * NMU. diff -Nuwr rcalc-0.5.0/debian/grcalc.1 rcalc-0.5.0.patched/debian/grcalc.1 --- rcalc-0.5.0/debian/grcalc.1 1970-01-01 01:00:00.000000000 +0100 +++ rcalc-0.5.0.patched/debian/grcalc.1 2007-10-17 11:06:26.000000000 +0200 @@ -0,0 +1,39 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH RCALC 1 "December 8, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +grcalc \- symbolic calculator for GNOME +.SH SYNOPSIS +.B grcalc +.RI [ OPTIONS ]... +.SH DESCRIPTION +This manual page documents briefly +.B grcalc +, a fast, simple, symbolic calculator for GNOME. +.SH OPTIONS +.B grcalc +accepts the standard GNOME application options. Try `grcalc --help' to +get more information about these options. +.TP +.B \-g, \-\-gnome +use the graphical user interface +.TP +.B \-t, \-\-text +use the text interface +.SH AUTHOR +This manual page was written by Sam Hocevar <[EMAIL PROTECTED]> +for the Debian GNU/Linux system (but may be used by others). diff -Nuwr rcalc-0.5.0/debian/menu rcalc-0.5.0.patched/debian/menu --- rcalc-0.5.0/debian/menu 2007-10-17 11:14:49.000000000 +0200 +++ rcalc-0.5.0.patched/debian/menu 2007-10-17 11:12:58.000000000 +0200 @@ -1,4 +1,4 @@ -?package(rcalc):needs="X11" section="Apps/Math"\ - hints="Calculators" title="rCalc" command="/usr/bin/rcalc" -?package(rcalc):needs="text" section="Apps/Math"\ - hints="Calculators" title="rCalc (text)" command="/usr/bin/rcalc -t" +?package(rcalc):needs="X11" section="Applications/Science/Mathematics"\ + hints="Calculators" title="rCalc" command="/usr/bin/grcalc" +?package(rcalc):needs="X11" section="Applications/Science/Mathematics"\ + hints="Calculators" title="rCalc (text)" command="/usr/bin/grcalc-term" diff -Nuwr rcalc-0.5.0/debian/rcalc.1 rcalc-0.5.0.patched/debian/rcalc.1 --- rcalc-0.5.0/debian/rcalc.1 2007-10-17 11:14:49.000000000 +0200 +++ rcalc-0.5.0.patched/debian/rcalc.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH RCALC 1 "December 8, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -rcalc \- symbolic calculator for GNOME -.SH SYNOPSIS -.B rcalc -.RI [ OPTIONS ]... -.SH DESCRIPTION -This manual page documents briefly -.B rcalc -, a fast, simple, symbolic calculator for GNOME. -.SH OPTIONS -.B rcalc -accepts the standard GNOME application options. Try `rcalc --help' to -get more information about these options. -.TP -.B \-g, \-\-gnome -use the graphical user interface -.TP -.B \-t, \-\-text -use the text interface -.SH AUTHOR -This manual page was written by Sam Hocevar <[EMAIL PROTECTED]> -for the Debian GNU/Linux system (but may be used by others). diff -Nuwr rcalc-0.5.0/debian/rules rcalc-0.5.0.patched/debian/rules --- rcalc-0.5.0/debian/rules 2007-10-17 11:14:49.000000000 +0200 +++ rcalc-0.5.0.patched/debian/rules 2007-10-17 11:07:35.000000000 +0200 @@ -26,7 +26,7 @@ && touch configure \ && touch config.h.in \ && touch `find . -name Makefile.in` - ./configure $(confflags) --enable-applet --enable-term-ui + ./configure $(confflags) --enable-applet --enable-term-ui --program-prefix=g touch configure-stamp build: configure-stamp build-stamp @@ -67,8 +67,8 @@ # dh_installpam # dh_installinit dh_installcron - dh_installman debian/rcalc.1 - ln -s rcalc.1.gz debian/rcalc/usr/share/man/man1/rcalc-term.1.gz + dh_installman debian/grcalc.1 + ln -s grcalc.1.gz debian/rcalc/usr/share/man/man1/grcalc-term.1.gz dh_installinfo # dh_undocumented dh_installchangelogs NEWS