1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
by <Hector Garcia <hector@debian.org>>
Remove header from fetchmailconf.py since it is a library.
Changed Makefiles to create fetchmailconf correctly according
to latest python migration.
diff -urNad trunk~/Makefile.am trunk/Makefile.am
--- trunk~/Makefile.am 2006-04-02 12:19:27.000000000 +0200
+++ trunk/Makefile.am 2006-08-15 12:58:31.000000000 +0200
@@ -121,7 +121,7 @@
dist-tools/manServer.pl
fetchmailconf:
- ( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ || { rm -f $@ ; exit 1; }
+ ( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/site-packages/fetchmailconf.py "$$@"' ) >$@ || { rm -f $@ ; exit 1; }
FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt
AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
diff -urNad trunk~/Makefile.in trunk/Makefile.in
--- trunk~/Makefile.in 2006-04-14 17:42:56.000000000 +0200
+++ trunk/Makefile.in 2006-08-15 12:58:53.000000000 +0200
@@ -1422,7 +1422,7 @@
$(srcdir)/specgen.sh $(VERSION) >fetchmail.spec
fetchmailconf:
- ( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ || { rm -f $@ ; exit 1; }
+ ( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/site-packages/fetchmailconf.py "$$@"' ) >$@ || { rm -f $@ ; exit 1; }
FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt
AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
diff -urNad trunk~/fetchmailconf.py trunk/fetchmailconf.py
--- trunk~/fetchmailconf.py 2006-03-14 17:10:10.000000000 +0100
+++ trunk/fetchmailconf.py 2006-08-15 12:57:27.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
# A GUI configurator for generating fetchmail configuration files.
# by Eric S. Raymond, <esr@snark.thyrsus.com>,
# Matthias Andree <matthias.andree@gmx.de>
|