Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Peter Pfeiffer
2009-09-06 11:20:38 +02:00
7 changed files with 86 additions and 74 deletions

View File

@@ -1,2 +1,5 @@
srv/web/ipfire/cgi-bin/chpasswd.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
etc/system-release
boot/grub/grub.conf
etc/ppp/ip-up

View File

@@ -1,71 +1,77 @@
#usr/bin/jmacs
usr/bin/joe
#usr/bin/jpico
#usr/bin/jstar
usr/bin/rjoe
usr/share/doc/joe
usr/share/doc/joe/LIST
usr/share/doc/joe/README
usr/share/doc/joe/HINTS
usr/share/doc/joe/ChangeLog
usr/share/doc/joe/HACKING
usr/share/doc/joe/NEWS
usr/share/man/man1/joe.1
usr/share/man/ru/man1/joe.1
usr/share/joe
usr/share/joe/lang
usr/share/joe/lang/ru.po
usr/share/joe/lang/de.po
usr/share/joe/lang/fr.po
usr/share/joe/lang/uk.po
usr/share/joe/syntax
usr/share/joe/syntax/c.jsf
usr/share/joe/syntax/perl.jsf
usr/share/joe/syntax/verilog.jsf
usr/share/joe/syntax/conf.jsf
usr/share/joe/syntax/python.jsf
usr/share/joe/syntax/php.jsf
usr/share/joe/syntax/sh.jsf
usr/share/joe/syntax/mail.jsf
usr/share/joe/syntax/pascal.jsf
usr/share/joe/syntax/html.jsf
usr/share/joe/syntax/vhdl.jsf
usr/share/joe/syntax/fortran.jsf
usr/share/joe/syntax/java.jsf
usr/share/joe/syntax/xml.jsf
usr/share/joe/syntax/tcl.jsf
usr/share/joe/syntax/lisp.jsf
usr/share/joe/syntax/csh.jsf
usr/share/joe/syntax/mason.jsf
usr/share/joe/syntax/diff.jsf
usr/share/joe/syntax/asm.jsf
usr/share/joe/syntax/tex.jsf
usr/share/joe/syntax/css.jsf
usr/share/joe/syntax/ocaml.jsf
usr/share/joe/syntax/4gl.jsf
usr/share/joe/syntax/sml.jsf
usr/share/joe/syntax/sql.jsf
usr/share/joe/syntax/awk.jsf
usr/share/joe/syntax/cobol.jsf
usr/share/joe/syntax/sed.jsf
usr/share/joe/syntax/ps.jsf
usr/share/joe/syntax/ada.jsf
usr/share/joe/syntax/troff.jsf
usr/share/joe/syntax/haskell.jsf
usr/share/joe/syntax/rexx.jsf
usr/share/joe/syntax/skill.jsf
usr/share/joe/syntax/lua.jsf
usr/share/joe/syntax/ruby.jsf
usr/share/joe/syntax/m4.jsf
usr/share/joe/syntax/joerc.jsf
usr/share/joe/syntax/spec.jsf
usr/share/joe/syntax/matlab.jsf
usr/share/joe/syntax/jsf.jsf
usr/share/joe/syntax/jsf_check.jsf
usr/share/joe/charmaps
usr/share/joe/charmaps/klingon
usr/etc/joe
usr/etc/joe/joerc
#usr/bin/termidx
#usr/etc/joe
usr/etc/joe/ftyperc
usr/etc/joe/jicerc.ru
usr/etc/joe/jmacsrc
usr/etc/joe/joerc
usr/etc/joe/jpicorc
usr/etc/joe/jstarrc
usr/etc/joe/rjoerc
usr/etc/joe/jpicorc
usr/etc/joe/ftyperc
#usr/share/doc/joe
#usr/share/doc/joe/ChangeLog
#usr/share/doc/joe/HACKING
#usr/share/doc/joe/HINTS
#usr/share/doc/joe/LIST
#usr/share/doc/joe/NEWS
#usr/share/doc/joe/README
#usr/share/joe
#usr/share/joe/charmaps
usr/share/joe/charmaps/klingon
#usr/share/joe/lang
usr/share/joe/lang/de.po
#usr/share/joe/lang/fr.po
#usr/share/joe/lang/ru.po
usr/share/joe/lang/uk.po
#usr/share/joe/syntax
usr/share/joe/syntax/4gl.jsf
usr/share/joe/syntax/ada.jsf
usr/share/joe/syntax/asm.jsf
usr/share/joe/syntax/awk.jsf
usr/share/joe/syntax/c.jsf
usr/share/joe/syntax/cobol.jsf
usr/share/joe/syntax/conf.jsf
usr/share/joe/syntax/csh.jsf
usr/share/joe/syntax/css.jsf
usr/share/joe/syntax/diff.jsf
usr/share/joe/syntax/fortran.jsf
usr/share/joe/syntax/haskell.jsf
usr/share/joe/syntax/html.jsf
usr/share/joe/syntax/java.jsf
usr/share/joe/syntax/joerc.jsf
usr/share/joe/syntax/jsf.jsf
usr/share/joe/syntax/jsf_check.jsf
usr/share/joe/syntax/lisp.jsf
usr/share/joe/syntax/lua.jsf
usr/share/joe/syntax/m4.jsf
usr/share/joe/syntax/mail.jsf
usr/share/joe/syntax/mason.jsf
usr/share/joe/syntax/matlab.jsf
usr/share/joe/syntax/ocaml.jsf
usr/share/joe/syntax/pascal.jsf
usr/share/joe/syntax/perl.jsf
usr/share/joe/syntax/php.jsf
usr/share/joe/syntax/ps.jsf
usr/share/joe/syntax/python.jsf
usr/share/joe/syntax/rexx.jsf
usr/share/joe/syntax/ruby.jsf
usr/share/joe/syntax/sed.jsf
usr/share/joe/syntax/sh.jsf
usr/share/joe/syntax/skill.jsf
usr/share/joe/syntax/sml.jsf
usr/share/joe/syntax/spec.jsf
usr/share/joe/syntax/sql.jsf
usr/share/joe/syntax/tcl.jsf
usr/share/joe/syntax/tex.jsf
usr/share/joe/syntax/troff.jsf
usr/share/joe/syntax/verilog.jsf
usr/share/joe/syntax/vhdl.jsf
usr/share/joe/syntax/xml.jsf
usr/share/man/man1/joe.1
#usr/share/man/ru
#usr/share/man/ru/man1
#usr/share/man/ru/man1/joe.1

View File

@@ -3,6 +3,7 @@ usr/bin/mediatomb
#usr/share/mediatomb
#usr/share/mediatomb/js
usr/share/mediatomb/js/common.js
usr/share/mediatomb/js/import-dvd.js
usr/share/mediatomb/js/import.js
usr/share/mediatomb/js/playlists.js
usr/share/mediatomb/mappings.xml
@@ -94,9 +95,9 @@ usr/share/mediatomb/web/std_treelook.css
usr/share/mediatomb/web/top.html
usr/share/mediatomb/web/topleft.html
usr/share/mediatomb/web/topright.html
var/ipfire/backup/addons/includes/mediatomb
var/ipfire/mediatomb
#var/ipfire/mediatomb/config.xml
var/ipfire/backup/addons/includes/mediatomb
etc/rc.d/init.d/mediatomb
etc/rc.d/rc0.d/K02mediatomb
etc/rc.d/rc6.d/K02mediatomb