Re: gnokii 0.6.22

[Leo \"costela\" Antunes]

Hey,

FYI: the new version was uploaded to Debian, but will probably take a
few days to be available due to some changes I made.

I did quite a big rewrite on the Debian package, for quality and ease of
maintenance, during which I ran into some minor issues that I thought
perhaps could interest you guys, and also some annoying questions. Hope
it's not a problem.

Firstly, these files don't have copyrights, and should perhaps have it
added:
- win32/mingw-cross/mingw-cross.sh
- packaging/Slackware/doinst.sh
- packaging/Slackware/doinst-xgnokii.sh
- common/gnvcal.c (though this seems to be automatically generated bu
the Makefile, so I don't think it's a problem)
- autogen.sh

Further, the variable 'xmandir' in the build system was being set to the
XGNOKIIDIR root plus /man/man1, which made it impossible to set it
manually like the normal non-X man path (via --mandir or equivalent).
I made a small patch to remove this setting and use the normal manpath
for everything, which is attached. My question is: was there a reason
for a separate xmandir? or was it just leftover?

Also, it there a reason for the internal gettext and getopt implementations?

Finally: I think there's a stray COPYING file being installed inside the
english xgnokii help (to usr/share/xgnokii/help/en_US/COPYING).

Feel free to bash me in the head if I'm acting too clueless about anything.
Cheers

-- 
Leo "costela" Antunes
[insert a witty retort here]

#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_build_system_corrections.dpatch by Leo "costela" Antunes <address@hidden>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix a few issues with the build system

@DPATCH@

diff -urNx debian -x autom4te.cache -x po gnokii-0.6.22.dfsg/Docs/Makefile 
gnokii-0.6.22/Docs/Makefile
--- gnokii-0.6.22.dfsg/Docs/Makefile    2007-11-24 12:31:01.000000000 +0100
+++ gnokii-0.6.22/Docs/Makefile 2007-11-26 01:08:24.000000000 +0100
@@ -83,8 +83,8 @@
        $(INSTALL_DATA) $(GNOKII1_MAN) $(DESTDIR)$(man1dir)
        $(INSTALL_DATA) $(GNOKII8_MAN) $(DESTDIR)$(man8dir)
        if [ "x$(HAVE_XGNOKII)" = "xyes" ]; then \
-               $(INSTALL) -d $(DESTDIR)$(xmandir); \
-               $(INSTALL_DATA) $(XGNOKII_MAN) $(DESTDIR)$(xmandir); \
+               $(INSTALL) -d $(DESTDIR)$(man1dir); \
+               $(INSTALL_DATA) $(XGNOKII_MAN) $(DESTDIR)$(man1dir); \
        fi
        @echo "done"
 
diff -urNx debian -x autom4te.cache -x po gnokii-0.6.22.dfsg/Makefile.global.in 
gnokii-0.6.22/Makefile.global.in
--- gnokii-0.6.22.dfsg/Makefile.global.in       2007-11-24 12:31:01.000000000 
+0100
+++ gnokii-0.6.22/Makefile.global.in    2007-11-26 01:07:26.000000000 +0100
@@ -28,7 +28,6 @@
 mandir         = @mandir@
 man1dir        = ${mandir}/man1/
 man8dir        = ${mandir}/man8/
-xmandir        = @XGNOKIIDIR@/man/man1/
 datarootdir    = @datarootdir@
 docdir         = @docdir@
 datadir        = @datadir@
diff -urNx debian -x autom4te.cache -x po gnokii-0.6.22.dfsg/utils/Makefile 
gnokii-0.6.22/utils/Makefile
--- gnokii-0.6.22.dfsg/utils/Makefile   2007-11-24 12:31:01.000000000 +0100
+++ gnokii-0.6.22/utils/Makefile        2007-11-26 01:04:12.000000000 +0100
@@ -23,7 +23,7 @@
 install-generic:
        $(INSTALL) -d $(DESTDIR)$(sbindir)
        $(INSTALL) -d $(DESTDIR)$(bindir)
-       $(INSTALL) -m 755 sendsms $(DESTDIR)$(bindir)
+       $(INSTALL) -m $(BIN_MODE) sendsms $(DESTDIR)$(bindir)
        @if [ -f gnapplet.sis ]; then \
                $(INSTALL) -d $(DESTDIR)$(docdir); \
                $(INSTALL_DATA) gnapplet.sis $(DESTDIR)$(docdir); \

signature.asc
Description: OpenPGP digital signature