1 diff -ur emirror-2.1.21.orig/Makefile.in emirror-2.1.21/Makefile.in
2 --- emirror-2.1.21.orig/Makefile.in Fri Apr 5 18:45:53 2002
3 +++ emirror-2.1.21/Makefile.in Mon May 20 15:58:36 2002
7 sysconfdir=@sysconfdir@
9 +bindir=$(DESTDIR)$(prefix)/bin
12 -libdir=$(prefix)/lib/emirror
13 -etcdir=$(sysconfdir)/emirror
14 -mandir=$(prefix)/man/man1
15 +libdir=$(DESTDIR)$(prefix)/lib/emirror
16 +etcdir=$(DESTDIR)$(sysconfdir)/emirror
17 +mandir=$(DESTDIR)$(prefix)/share/man/man1
18 +htmldir=$(DESTDIR)@HTMLDIR@
19 THEMEDIRS:=blue eclipt eclipt-php freshmeat zope
22 @echo There\'s no need to compile anything - use \"make install\"
25 - @echo Installing files in $(prefix) ...
26 + @echo Installing files in $(DESTDIR)$(prefix) ...
27 @$(INSTALL) -d $(bindir)
28 @$(INSTALL) emirror $(bindir)
29 @$(INSTALL) -d $(libdir)
31 @$(INSTALL) -b -m 644 etc/*.cfg $(etcdir)
32 @$(INSTALL) -b -m 644 etc/email-addresses $(etcdir)
33 @$(INSTALL) -m 644 etc/*.template $(etcdir)
34 + @$(INSTALL) -m 644 etc/*.inc $(htmldir)
35 @$(INSTALL) -d $(etcdir)/active
36 @$(INSTALL) -d $(etcdir)/unused
37 @$(INSTALL) -d $(etcdir)/themes
38 diff -ur emirror-2.1.21.orig/bin/mirror.in emirror-2.1.21/bin/mirror.in
39 --- emirror-2.1.21.orig/bin/mirror.in Sat Feb 16 08:34:13 2002
40 +++ emirror-2.1.21/bin/mirror.in Mon May 20 15:58:36 2002
44 # Start the mirror program and update the index page
45 -emirror -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ -n @HTMLDIR@
46 +emirror -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/
47 diff -ur emirror-2.1.21.orig/bin/updateindex.in emirror-2.1.21/bin/updateindex.in
48 --- emirror-2.1.21.orig/bin/updateindex.in Sat Feb 16 08:40:28 2002
49 +++ emirror-2.1.21/bin/updateindex.in Mon May 20 15:58:36 2002
51 export PATH EMIRRORCFGPATH
53 # Start the mirror program and update the index page
54 -emirror -v -c @sysconfdir@/emirror/general.cfg -n @HTMLDIR@
55 +emirror -v -c @sysconfdir@/emirror/general.cfg
56 diff -ur emirror-2.1.21.orig/configure.in emirror-2.1.21/configure.in
57 --- emirror-2.1.21.orig/configure.in Sat Feb 16 08:42:14 2002
58 +++ emirror-2.1.21/configure.in Mon May 20 16:00:50 2002
60 AC_MSG_CHECKING(for Python version >= 1.5 )
62 PYTHONVERSION=`python -c "import sys,string;x=sys.version;print string.split(x)[[0]]"`
63 -echo -n $PYTHONVERSION\
64 +echo -n $PYTHONVERSION
65 PYTHONMAJOR=`echo $PYTHONVERSION | awk -F . '{print $1}'`
66 PYTHONMINOR=`echo $PYTHONVERSION | awk -F . '{print $2}'`
67 if test $PYTHONMAJOR -lt 2
68 diff -ur emirror-2.1.21.orig/etc/general.cfg.in emirror-2.1.21/etc/general.cfg.in
69 --- emirror-2.1.21.orig/etc/general.cfg.in Fri Apr 13 09:21:43 2001
70 +++ emirror-2.1.21/etc/general.cfg.in Mon May 20 15:58:36 2002
73 +Download-url: ftp://localhost/pub/mirrors
74 +Parent: /home/ftp/pub/mirrors
76 Output-directory: @HTMLDIR@
80 -Email: root@localhost
86 -Password: anonymous@localhost
87 -Error-MailCmd: mail -s "EMirror Error Report" Martin.Preishuber@eclipt.at
88 +Password: emirror@localhost
89 +Error-MailCmd: mail -s "EMirror Error Report" ftp@localhost
90 Mail-Users: @SYSCONFDIR@/emirror/email-addresses
91 Mail-User-Cmd: mail -s "EMirror EMail-Information"
92 Log-Template: @SYSCONFDIR@/emirror/logfile.template
93 Index-Template: @SYSCONFDIR@/emirror/index.template
94 Index-Directory: @HTMLDIR@
95 -Summary-Template: @SYSCONFDIR@/emirror/summary.template
96 \ No newline at end of file
97 +Summary-Template: @SYSCONFDIR@/emirror/summary.template
98 diff -ur emirror-2.1.21.orig/etc/themes/eclipt-php/index.template emirror-2.1.21/etc/themes/eclipt-php/index.template
99 --- emirror-2.1.21.orig/etc/themes/eclipt-php/index.template Mon Aug 13 22:26:48 2001
100 +++ emirror-2.1.21/etc/themes/eclipt-php/index.template Mon May 20 15:58:36 2002
102 -<? include "/home/httpd/htdocs/include/emirror.inc"; ?>
103 +<? include "emirror.inc"; ?>
104 <? FullHtmlHeader("$title$"); ?>
106 <script language="JavaScript">
107 diff -ur emirror-2.1.21.orig/etc/themes/eclipt-php/logfile.template emirror-2.1.21/etc/themes/eclipt-php/logfile.template
108 --- emirror-2.1.21.orig/etc/themes/eclipt-php/logfile.template Mon Aug 13 21:33:35 2001
109 +++ emirror-2.1.21/etc/themes/eclipt-php/logfile.template Mon May 20 15:58:36 2002
111 -<? include "/home/httpd/htdocs/include/emirror.inc"; ?>
112 +<? include "emirror.inc"; ?>
113 <? FullHtmlHeader("$title$"); ?>
115 <script language="JavaScript">
116 diff -ur emirror-2.1.21.orig/etc/themes/eclipt-php/summary.template emirror-2.1.21/etc/themes/eclipt-php/summary.template
117 --- emirror-2.1.21.orig/etc/themes/eclipt-php/summary.template Mon Aug 13 22:27:09 2001
118 +++ emirror-2.1.21/etc/themes/eclipt-php/summary.template Mon May 20 15:58:36 2002
120 -<? include "/home/httpd/htdocs/include/emirror.inc"; ?>
121 +<? include "emirror.inc"; ?>
122 <? FullHtmlHeader("$title$"); ?>
124 <script language="JavaScript">
125 diff -ur emirror-2.1.21.orig/man/emirror.1 emirror-2.1.21/man/emirror.1
126 --- emirror-2.1.21.orig/man/emirror.1 Mon Sep 10 17:38:16 2001
127 +++ emirror-2.1.21/man/emirror.1 Mon May 20 15:58:36 2002
130 Specifies a file, which contains a list of valid email-addresses
131 of users, who want to get information about updates
132 -(e.g. /usr/local/etc/email-addresses)
133 +(e.g. /etc/emirror/email-addresses)
135 Command to send mail to users when one spcific mirror has been updated
136 (e.g. mail -s "EMirror - Package updated: %s" user1@host1 user2@host2)
137 @@ -480,11 +480,11 @@
141 -\fI/usr/local/lib/emirror/*\fP,
142 -\fI/usr/local/etc/general.cfg\fP,
143 -\fI/usr/local/etc/email-addresses\fP,
144 -\fI/usr/local/etc/active/*\fP,
145 -\fI/usr/local/etc/unused/*\fP
146 +\fI/usr/lib/emirror/*\fP,
147 +\fI/etc/emirror/general.cfg\fP,
148 +\fI/etc/emirror/email-addresses\fP,
149 +\fI/etc/emirror/active/*\fP,
150 +\fI/etc/emirror/unused/*\fP