- updated to 1.03

Changed files:
    diction-DESTDIR.patch -> 1.2
    diction-texi.patch -> 1.2

diff --git a/diction-DESTDIR.patch b/diction-DESTDIR.patch
index 3fc71d37456a39ada2a2eaa8778852de51e0e531..9275b2f73574bed3405c67ead72b0a857e99b132 100644 (file)
--- a/diction-DESTDIR.patch
+++ b/diction-DESTDIR.patch
@@ -1,35 +1,36 @@
---- diction-1.02/Makefile.in   Mon Aug  6 19:09:54 2001
-+++ diction-1.02-/Makefile.in  Tue Aug 27 18:21:37 2002
-@@ -28,20 +28,20 @@
+diff -urN diction-1.03.orig/Makefile.in diction-1.03/Makefile.in
+--- diction-1.03.orig/Makefile.in      2003-04-08 23:28:58.000000000 +0200
++++ diction-1.03/Makefile.in   2003-08-09 20:20:38.000000000 +0200
+@@ -35,21 +35,21 @@
                getopt.o getopt1.o $(LIBM) $(LIBS)
  
  install:      all
--              @INSTALL@ -m 755 -d @bindir@
+-              [ -d @bindir@ ] || @INSTALL@ -m 755 -d @bindir@
 -              @INSTALL@ diction @bindir@/diction
 -              @INSTALL@ style @bindir@/style
 -              @INSTALL@ -m 755 -d @datadir@/diction
 -              @INSTALL@ -m 644 de @datadir@/diction/de
 -              @INSTALL@ -m 644 en @datadir@/diction/en
 -              (cd @datadir@/diction; rm -f C; ln en C)
--              @INSTALL@ -m 755 -d @mandir@/man1
+-              [ -d @mandir@/man1 ] || @INSTALL@ -m 755 -d @mandir@/man1
 -              @INSTALL@ -m 644 diction.1 @mandir@/man1/diction.1
 -              @INSTALL@ -m 644 style.1 @mandir@/man1/style.1
-+              @INSTALL@ -m 755 -d $(DESTDIR)@bindir@
++              [ -d $(DESTDIR)@bindir@ ] || @INSTALL@ -m 755 -d $(DESTDIR)@bindir@
 +              @INSTALL@ diction $(DESTDIR)@bindir@/diction
 +              @INSTALL@ style $(DESTDIR)@bindir@/style
 +              @INSTALL@ -m 755 -d $(DESTDIR)@datadir@/diction
 +              @INSTALL@ -m 644 de $(DESTDIR)@datadir@/diction/de
 +              @INSTALL@ -m 644 en $(DESTDIR)@datadir@/diction/en
-+              (cd $(DESTDIR)@datadir@/diction; rm -f C; ln -s en C)
-+              @INSTALL@ -m 755 -d $(DESTDIR)@mandir@/man1
++              (cd $(DESTDIR)@datadir@/diction; rm -f C; ln en C)
++              [ -d $(DESTDIR)@mandir@/man1 ] || @INSTALL@ -m 755 -d $(DESTDIR)@mandir@/man1
 +              @INSTALL@ -m 644 diction.1 $(DESTDIR)@mandir@/man1/diction.1
 +              @INSTALL@ -m 644 style.1 $(DESTDIR)@mandir@/man1/style.1
- 
- install.msg:
--              gencat -o @datadir@/locale/en_US/LC_MESSAGES/diction.cat diction-en.msg sent-en.msg
--              gencat -o @datadir@/locale/en_US/LC_MESSAGES/style.cat style-en.msg sent-en.msg
-+              gencat -o $(DESTDIR)@datadir@/locale/en_US/LC_MESSAGES/diction.cat diction-en.msg sent-en.msg
-+              gencat -o $(DESTDIR)@datadir@/locale/en_US/LC_MESSAGES/style.cat style-en.msg sent-en.msg
- 
- .c.o:
-               $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+               make install-po-@USE_NLS@
+ install-po-no:
+ install-po-yes:       $(CATALOGS)
+               for cat in $(CATALOGS); do \
+-                dir=$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \
++                dir=$(DESTDIR)$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \
+                 [ -d $$dir ] || @INSTALL@ -m 755 -d $$dir; \
+                 @INSTALL@ -m 644 $$cat $$dir/diction.mo; \
+               done

diff --git a/diction-texi.patch b/diction-texi.patch
index d4ac80cf0ee4e9be80be404895e4642e8d216614..c70ff692383282d4be91d0f7a795b515b9e97794 100644 (file)
--- a/diction-texi.patch
+++ b/diction-texi.patch
@@ -1,6 +1,7 @@
---- diction-1.02/diction.texi.in       Mon Aug  6 19:09:54 2001
-+++ diction-1.02-/diction.texi.in      Tue Aug 27 18:25:55 2002
-@@ -87,6 +87,7 @@
+diff -urN diction-1.03.orig/diction.texi.in diction-1.03/diction.texi.in
+--- diction-1.03.orig/diction.texi.in  2003-03-05 23:00:48.000000000 +0100
++++ diction-1.03/diction.texi.in       2003-08-09 20:21:46.000000000 +0200
+@@ -88,6 +88,7 @@
  * Introduction::                Introduction.
  * Invoking::                    Invoking @command{diction}; description of options.
  * Diagnostics::                 Exit status returned by @command{diction}.
@@ -8,16 +9,3 @@
  * Reporting Bugs::              Reporting Bugs.
  * Concept Index::               A menu with all the topics in this manual.
  * Index::                       A menu with all @command{diction} commands
-@@ -226,10 +227,10 @@
- @chapter Author
- 
- This program is GNU software, copyright 1997, 1998, 1999, 2000 Michael Haardt
--<michael@moria.de>.
-+<michael@@moria.de>.
- 
- The english phrase file contains contributions by Greg Lindahl
--<lindahl@pbm.com>, Wil Baden, Gary D. Kline, Kimberly Hanks and
-+<lindahl@@pbm.com>, Wil Baden, Gary D. Kline, Kimberly Hanks and
- Beth Morris.
- 
- This program is free software; you can redistribute it and/or modify