Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
	config/rootfiles/packages/asterisk
This commit is contained in:
Dirk Wagner
2014-07-23 10:37:02 +02:00
220 changed files with 13184 additions and 1948 deletions

View File

@@ -0,0 +1,21 @@
#usr/include/gmp.h
#usr/include/gmpxx.h
#usr/include/mp.h
#usr/lib/libgmp.a
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
usr/lib/libgmp.so.10.0.5
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
usr/lib/libgmpxx.so.4.2.5
#usr/lib/libmp.a
#usr/lib/libmp.la
#usr/lib/libmp.so
usr/lib/libmp.so.3
usr/lib/libmp.so.3.1.25
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2

View File

@@ -24,6 +24,7 @@ etc/rc.d/init.d/console
#etc/rc.d/init.d/cyrus-imapd
#etc/rc.d/init.d/cyrus-sasl
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/dhcrelay
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/fcron
#etc/rc.d/init.d/fetchmail

View File

@@ -625,6 +625,7 @@
#usr/include/linux/unix_diag.h
#usr/include/linux/usb
#usr/include/linux/usb/audio.h
#usr/include/linux/usb/cdc-wdm.h
#usr/include/linux/usb/cdc.h
#usr/include/linux/usb/ch11.h
#usr/include/linux/usb/ch9.h