- updated for 0.14

Changed files:
    plptools-ac_am_fixes.patch -> 1.2

diff --git a/plptools-ac_am_fixes.patch b/plptools-ac_am_fixes.patch
index f716c8961e2ddc50dfd997ff291fe51e65261b8d..a441ec13b9e3027403025863767fd4bf4c7a2e4a 100644 (file)
--- a/plptools-ac_am_fixes.patch
+++ b/plptools-ac_am_fixes.patch
@@ -1,15 +1,7 @@
-diff -Nur plptools-0.12.orig/conf/configure.in.in plptools-0.12/conf/configure.in.in
---- plptools-0.12.orig/conf/configure.in.in    2003-02-03 01:29:35.000000000 +0100
-+++ plptools-0.12/conf/configure.in.in 2004-09-29 19:59:53.496794864 +0200
-@@ -51,7 +51,6 @@
-   AC_MSG_RESULT(yes)
-   AC_CHECK_LIB(bsd, hostname)
-   EXTRA_OBJS=mount_aix.o
--  AC_DEFINE(_ALL_SOURCE)
- else
-   AC_MSG_RESULT(no)
- fi
-@@ -317,46 +316,10 @@
+diff -Nur plptools-0.14.orig/conf/configure.in.in plptools-0.14/conf/configure.in.in
+--- plptools-0.14.orig/conf/configure.in.in    2005-08-28 22:46:43.000000000 +0000
++++ plptools-0.14/conf/configure.in.in 2005-09-10 01:05:22.000000000 +0000
+@@ -291,45 +291,10 @@
        AM_CONDITIONAL(BUILD_KDE, true)
  fi
  
@@ -17,7 +9,6 @@ diff -Nur plptools-0.12.orig/conf/configure.in.in plptools-0.12/conf/configure.i
 -      Makefile
 -      intl/Makefile
 -      po/Makefile.in
--      po/Makefile
 -      lib/Makefile
 -      ncpd/Makefile
 -      plpftp/Makefile
@@ -63,21 +54,9 @@ diff -Nur plptools-0.12.orig/conf/configure.in.in plptools-0.12/conf/configure.i
 +AC_CONFIG_FILES([ doc/sisinstall.man ])
 +AC_CONFIG_FILES([ doc/plpprintd.man ])
 +AC_CONFIG_FILES([ doc/plpbackup.man ])
-diff -Nur plptools-0.12.orig/conf/m4/plptools/PLP_HELP_MESSAGE.m4 plptools-0.12/conf/m4/plptools/PLP_HELP_MESSAGE.m4
---- plptools-0.12.orig/conf/m4/plptools/PLP_HELP_MESSAGE.m4    2001-01-27 05:02:27.000000000 +0100
-+++ plptools-0.12/conf/m4/plptools/PLP_HELP_MESSAGE.m4 2004-09-29 19:49:02.401776352 +0200
-@@ -2,7 +2,7 @@
- dnl Insert a custom line into the output of configure --help
- dnl
- AC_DEFUN(PLP_HELP_MSG,[
--      AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-+      AC_DIVERT_PUSH(0)dnl
-       ac_help="$ac_help
- [$1]"
-       AC_DIVERT_POP()dnl
-diff -Nur plptools-0.12.orig/kde2/doc/kioslave/de/Makefile.am plptools-0.12/kde2/doc/kioslave/de/Makefile.am
---- plptools-0.12.orig/kde2/doc/kioslave/de/Makefile.am        2002-08-10 21:13:41.000000000 +0200
-+++ plptools-0.12/kde2/doc/kioslave/de/Makefile.am     2004-09-29 20:13:16.068785376 +0200
+diff -Nur plptools-0.14.orig/kde2/doc/kioslave/de/Makefile.am plptools-0.14/kde2/doc/kioslave/de/Makefile.am
+--- plptools-0.14.orig/kde2/doc/kioslave/de/Makefile.am        2004-05-31 13:37:20.000000000 +0000
++++ plptools-0.14/kde2/doc/kioslave/de/Makefile.am     2005-09-10 01:05:22.000000000 +0000
 @@ -1,7 +1,2 @@
  KDE_LANG = de
 -kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
@@ -87,9 +66,9 @@ diff -Nur plptools-0.12.orig/kde2/doc/kioslave/de/Makefile.am plptools-0.12/kde2
 -maintainer-clean-local:
 -      rm -f Makefile.in
 +KDE_DOCS = kioslave
-diff -Nur plptools-0.12.orig/kde2/doc/kioslave/en/Makefile.am plptools-0.12/kde2/doc/kioslave/en/Makefile.am
---- plptools-0.12.orig/kde2/doc/kioslave/en/Makefile.am        2002-08-10 21:13:47.000000000 +0200
-+++ plptools-0.12/kde2/doc/kioslave/en/Makefile.am     2004-09-29 20:13:22.881749648 +0200
+diff -Nur plptools-0.14.orig/kde2/doc/kioslave/en/Makefile.am plptools-0.14/kde2/doc/kioslave/en/Makefile.am
+--- plptools-0.14.orig/kde2/doc/kioslave/en/Makefile.am        2004-05-31 13:37:20.000000000 +0000
++++ plptools-0.14/kde2/doc/kioslave/en/Makefile.am     2005-09-10 01:05:22.000000000 +0000
 @@ -1,7 +1,2 @@
  KDE_LANG = en
 -kiodocdir = $(kde_libs_htmldir)/$(KDE_LANG)/kioslave
@@ -99,9 +78,9 @@ diff -Nur plptools-0.12.orig/kde2/doc/kioslave/en/Makefile.am plptools-0.12/kde2
 -maintainer-clean-local:
 -      rm -f Makefile.in
 +KDE_DOCS = kioslave
-diff -Nur plptools-0.12.orig/kde2/kioslave/Makefile.am plptools-0.12/kde2/kioslave/Makefile.am
---- plptools-0.12.orig/kde2/kioslave/Makefile.am       2003-02-03 15:34:06.000000000 +0100
-+++ plptools-0.12/kde2/kioslave/Makefile.am    2004-09-29 19:51:03.432376904 +0200
+diff -Nur plptools-0.14.orig/kde2/kioslave/Makefile.am plptools-0.14/kde2/kioslave/Makefile.am
+--- plptools-0.14.orig/kde2/kioslave/Makefile.am       2004-05-31 13:37:15.000000000 +0000
++++ plptools-0.14/kde2/kioslave/Makefile.am    2005-09-10 01:05:22.000000000 +0000
 @@ -3,7 +3,7 @@
  maintainer-clean-local:
        rm -f Makefile.in *.closure
@@ -111,30 +90,30 @@ diff -Nur plptools-0.12.orig/kde2/kioslave/Makefile.am plptools-0.12/kde2/kiosla
  
  kdemoduledir = $(kde_moduledir)
  kdemodule_LTLIBRARIES = kio_plp.la
-diff -Nur plptools-0.12.orig/kde2/klipsi/Makefile.am plptools-0.12/kde2/klipsi/Makefile.am
---- plptools-0.12.orig/kde2/klipsi/Makefile.am 2002-08-11 07:26:27.000000000 +0200
-+++ plptools-0.12/kde2/klipsi/Makefile.am      2004-09-29 20:02:21.439304184 +0200
-@@ -1,15 +1,13 @@
+diff -Nur plptools-0.14.orig/kde2/klipsi/Makefile.am plptools-0.14/kde2/klipsi/Makefile.am
+--- plptools-0.14.orig/kde2/klipsi/Makefile.am 2004-05-31 13:37:15.000000000 +0000
++++ plptools-0.14/kde2/klipsi/Makefile.am      2005-09-10 01:05:22.000000000 +0000
+@@ -1,15 +1,11 @@
 -libdir=$(kde_libraries)
-  
+-
 -bindir=$(kde_bindir)
-   
+-
  maintainer-clean-local:
        rm -f Makefile.in
-          
+ 
 -METASOURCES = AUTO
 +klipsi_METASOURCES = AUTO
-           
+ 
  KDE_ICON = AUTO
-            
+ 
 -INCLUDES = $(all_includes) -I$(top_srcdir)/lib
 +INCLUDES = $(all_includes) -I$(top_srcdir)/lib -I$(top_srcdir)/include
-             
+ 
  DISTCLEANFILES = $(klipsi_METASOURCES) ./.deps/* ./.deps/.P
  
-diff -Nur plptools-0.12.orig/kde2/kpsion/Makefile.am plptools-0.12/kde2/kpsion/Makefile.am
---- plptools-0.12.orig/kde2/kpsion/Makefile.am 2002-08-11 10:55:31.000000000 +0200
-+++ plptools-0.12/kde2/kpsion/Makefile.am      2004-09-29 20:02:11.878757608 +0200
+diff -Nur plptools-0.14.orig/kde2/kpsion/Makefile.am plptools-0.14/kde2/kpsion/Makefile.am
+--- plptools-0.14.orig/kde2/kpsion/Makefile.am 2005-08-28 22:37:14.000000000 +0000
++++ plptools-0.14/kde2/kpsion/Makefile.am      2005-09-10 01:05:22.000000000 +0000
 @@ -1,17 +1,15 @@
  # $Id$
  
@@ -155,9 +134,9 @@ diff -Nur plptools-0.12.orig/kde2/kpsion/Makefile.am plptools-0.12/kde2/kpsion/M
  
  DISTCLEANFILES = $(kpsion_METASOURCES) ./.deps/* ./.deps/.P
  
-diff -Nur plptools-0.12.orig/kde2/plugins/Makefile.am plptools-0.12/kde2/plugins/Makefile.am
---- plptools-0.12.orig/kde2/plugins/Makefile.am        2002-08-11 07:27:13.000000000 +0200
-+++ plptools-0.12/kde2/plugins/Makefile.am     2004-09-29 19:51:03.453373712 +0200
+diff -Nur plptools-0.14.orig/kde2/plugins/Makefile.am plptools-0.14/kde2/plugins/Makefile.am
+--- plptools-0.14.orig/kde2/plugins/Makefile.am        2004-05-31 13:37:15.000000000 +0000
++++ plptools-0.14/kde2/plugins/Makefile.am     2005-09-10 01:05:22.000000000 +0000
 @@ -1,5 +1,5 @@
  
 -INCLUDES = $(all_includes) -I$(top_srcdir)/lib
@@ -165,9 +144,9 @@ diff -Nur plptools-0.12.orig/kde2/plugins/Makefile.am plptools-0.12/kde2/plugins
  
  kdemoduledir = $(kde_moduledir)
  kdemodule_LTLIBRARIES = libplpprops.la
-diff -Nur plptools-0.12.orig/lib/Makefile.am plptools-0.12/lib/Makefile.am
---- plptools-0.12.orig/lib/Makefile.am 2002-07-16 09:38:20.000000000 +0200
-+++ plptools-0.12/lib/Makefile.am      2004-09-29 19:53:22.767194792 +0200
+diff -Nur plptools-0.14.orig/lib/Makefile.am plptools-0.14/lib/Makefile.am
+--- plptools-0.14.orig/lib/Makefile.am 2004-05-31 13:37:08.000000000 +0000
++++ plptools-0.14/lib/Makefile.am      2005-09-10 01:05:22.000000000 +0000
 @@ -1,8 +1,6 @@
  # $Id$
  #
@@ -178,9 +157,9 @@ diff -Nur plptools-0.12.orig/lib/Makefile.am plptools-0.12/lib/Makefile.am
  
  lib_LTLIBRARIES = libplp.la
  
-diff -Nur plptools-0.12.orig/ncpd/Makefile.am plptools-0.12/ncpd/Makefile.am
---- plptools-0.12.orig/ncpd/Makefile.am        2002-08-11 10:55:31.000000000 +0200
-+++ plptools-0.12/ncpd/Makefile.am     2004-09-29 19:53:22.773193880 +0200
+diff -Nur plptools-0.14.orig/ncpd/Makefile.am plptools-0.14/ncpd/Makefile.am
+--- plptools-0.14.orig/ncpd/Makefile.am        2005-08-26 21:33:04.000000000 +0000
++++ plptools-0.14/ncpd/Makefile.am     2005-09-10 01:05:22.000000000 +0000
 @@ -1,8 +1,6 @@
  # $Id$
  #
@@ -191,9 +170,9 @@ diff -Nur plptools-0.12.orig/ncpd/Makefile.am plptools-0.12/ncpd/Makefile.am
  
  sbin_PROGRAMS = ncpd
  
-diff -Nur plptools-0.12.orig/plpbackup/Makefile.am plptools-0.12/plpbackup/Makefile.am
---- plptools-0.12.orig/plpbackup/Makefile.am   2002-08-11 10:55:31.000000000 +0200
-+++ plptools-0.12/plpbackup/Makefile.am        2004-09-29 19:51:03.464372040 +0200
+diff -Nur plptools-0.14.orig/plpbackup/Makefile.am plptools-0.14/plpbackup/Makefile.am
+--- plptools-0.14.orig/plpbackup/Makefile.am   2004-10-04 15:40:14.000000000 +0000
++++ plptools-0.14/plpbackup/Makefile.am        2005-09-10 01:05:22.000000000 +0000
 @@ -1,6 +1,6 @@
  # $Id$
  #
@@ -201,10 +180,10 @@ diff -Nur plptools-0.12.orig/plpbackup/Makefile.am plptools-0.12/plpbackup/Makef
 +INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
  
  bin_PROGRAMS = plpbackup
- plpbackup_LDADD = $(LIB_PLP)
-diff -Nur plptools-0.12.orig/plpftp/Makefile.am plptools-0.12/plpftp/Makefile.am
---- plptools-0.12.orig/plpftp/Makefile.am      2002-08-11 10:55:31.000000000 +0200
-+++ plptools-0.12/plpftp/Makefile.am   2004-09-29 19:51:03.474370520 +0200
+ plpbackup_LDADD = $(LIB_PLP) $(INTLLIBS)
+diff -Nur plptools-0.14.orig/plpftp/Makefile.am plptools-0.14/plpftp/Makefile.am
+--- plptools-0.14.orig/plpftp/Makefile.am      2004-05-31 13:37:09.000000000 +0000
++++ plptools-0.14/plpftp/Makefile.am   2005-09-10 01:05:22.000000000 +0000
 @@ -1,6 +1,6 @@
  # $Id$
  #
@@ -213,9 +192,9 @@ diff -Nur plptools-0.12.orig/plpftp/Makefile.am plptools-0.12/plpftp/Makefile.am
  
  bin_PROGRAMS = plpftp
  plpftp_LDADD = $(LIB_PLP) $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS)
-diff -Nur plptools-0.12.orig/plpnfsd/Makefile.am plptools-0.12/plpnfsd/Makefile.am
---- plptools-0.12.orig/plpnfsd/Makefile.am     2002-08-11 10:55:31.000000000 +0200
-+++ plptools-0.12/plpnfsd/Makefile.am  2004-09-29 19:51:03.485368848 +0200
+diff -Nur plptools-0.14.orig/plpnfsd/Makefile.am plptools-0.14/plpnfsd/Makefile.am
+--- plptools-0.14.orig/plpnfsd/Makefile.am     2004-10-04 15:40:15.000000000 +0000
++++ plptools-0.14/plpnfsd/Makefile.am  2005-09-10 01:05:22.000000000 +0000
 @@ -1,6 +1,6 @@
  # $Id$
  #
@@ -223,10 +202,10 @@ diff -Nur plptools-0.12.orig/plpnfsd/Makefile.am plptools-0.12/plpnfsd/Makefile.
 +INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
  
  sbin_PROGRAMS = plpnfsd
- plpnfsd_LDADD = $(LIB_PLP)
-diff -Nur plptools-0.12.orig/plpprint/Makefile.am plptools-0.12/plpprint/Makefile.am
---- plptools-0.12.orig/plpprint/Makefile.am    2002-08-11 10:55:31.000000000 +0200
-+++ plptools-0.12/plpprint/Makefile.am 2004-09-29 19:51:03.490368088 +0200
+ plpnfsd_LDADD = $(LIB_PLP) $(INTLLIBS)
+diff -Nur plptools-0.14.orig/plpprint/Makefile.am plptools-0.14/plpprint/Makefile.am
+--- plptools-0.14.orig/plpprint/Makefile.am    2004-10-04 15:40:16.000000000 +0000
++++ plptools-0.14/plpprint/Makefile.am 2005-09-10 01:05:22.000000000 +0000
 @@ -1,6 +1,6 @@
  # $Id$
  #
@@ -234,26 +213,26 @@ diff -Nur plptools-0.12.orig/plpprint/Makefile.am plptools-0.12/plpprint/Makefil
 +INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
  
  sbin_PROGRAMS = plpprintd
- plpprintd_LDADD = $(LIB_PLP)
-diff -Nur plptools-0.12.orig/po/Makefile.am plptools-0.12/po/Makefile.am
---- plptools-0.12.orig/po/Makefile.am  1970-01-01 01:00:00.000000000 +0100
-+++ plptools-0.12/po/Makefile.am       2004-09-29 19:51:03.355388608 +0200
+ plpprintd_LDADD = $(LIB_PLP) $(INTLLIBS)
+diff -Nur plptools-0.14.orig/po/Makefile.am plptools-0.14/po/Makefile.am
+--- plptools-0.14.orig/po/Makefile.am  1970-01-01 00:00:00.000000000 +0000
++++ plptools-0.14/po/Makefile.am       2005-09-10 01:06:29.000000000 +0000
 @@ -0,0 +1 @@
 +POFILES = AUTO
-diff -Nur plptools-0.12.orig/sisinstall/Makefile.am plptools-0.12/sisinstall/Makefile.am
---- plptools-0.12.orig/sisinstall/Makefile.am  2002-07-06 20:39:34.000000000 +0200
-+++ plptools-0.12/sisinstall/Makefile.am       2004-09-29 19:51:03.480369608 +0200
+diff -Nur plptools-0.14.orig/sisinstall/Makefile.am plptools-0.14/sisinstall/Makefile.am
+--- plptools-0.14.orig/sisinstall/Makefile.am  2004-10-04 15:40:17.000000000 +0000
++++ plptools-0.14/sisinstall/Makefile.am       2005-09-10 01:05:22.000000000 +0000
 @@ -1,11 +1,11 @@
  # $Id$
  #
 -INCLUDES=-I$(top_srcdir)/lib
-+INCLUDES=-I$(top_srcdir)/lib -I$(top_srcdir)/include
++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
  
  bin_PROGRAMS = sisinstall
- sisinstall_LDADD = $(top_srcdir)/lib/libplp.la $(LIBNEWT)
+ sisinstall_LDADD = $(top_srcdir)/lib/libplp.la $(LIBNEWT) $(INTLLIBS)
  sisinstall_SOURCES = psion.cpp sisinstaller.cpp sismain.cpp \
 -      fakepsion.cpp sisfilelink.cpp sisfilelink.h
-+      fakepsion.cpp sisfilelink.cpp 
++      fakepsion.cpp sisfilelink.cpp
  EXTRA_DIST = psion.h sisinstaller.h fakepsion.h
  
  maintainer-clean-local: