Merge branch 'master' into next

Conflicts:
	doc/packages-list.txt

config/rootfiles/packages/cups

@@ -446,6 +446,147 @@ usr/share/cups/templates/header.tmpl
 usr/share/cups/templates/help-header.tmpl
 usr/share/cups/templates/help-printable.tmpl
 usr/share/cups/templates/help-trailer.tmpl
+#usr/share/cups/templates/id
+#usr/share/cups/templates/id/add-class.tmpl
+#usr/share/cups/templates/id/add-printer.tmpl
+#usr/share/cups/templates/id/add-rss-subscription.tmpl
+#usr/share/cups/templates/id/admin.tmpl
+#usr/share/cups/templates/id/choose-device.tmpl
+#usr/share/cups/templates/id/choose-make.tmpl
+#usr/share/cups/templates/id/choose-model.tmpl
+#usr/share/cups/templates/id/choose-serial.tmpl
+#usr/share/cups/templates/id/choose-uri.tmpl
+#usr/share/cups/templates/id/class-added.tmpl
+#usr/share/cups/templates/id/class-confirm.tmpl
+#usr/share/cups/templates/id/class-deleted.tmpl
+#usr/share/cups/templates/id/class-jobs-header.tmpl
+#usr/share/cups/templates/id/class-modified.tmpl
+#usr/share/cups/templates/id/class.tmpl
+#usr/share/cups/templates/id/classes-header.tmpl
+#usr/share/cups/templates/id/classes.tmpl
+#usr/share/cups/templates/id/command.tmpl
+#usr/share/cups/templates/id/edit-config.tmpl
+#usr/share/cups/templates/id/error-op.tmpl
+#usr/share/cups/templates/id/error.tmpl
+#usr/share/cups/templates/id/header.tmpl
+#usr/share/cups/templates/id/help-header.tmpl
+#usr/share/cups/templates/id/help-printable.tmpl
+#usr/share/cups/templates/id/help-trailer.tmpl
+#usr/share/cups/templates/id/job-cancel.tmpl
+#usr/share/cups/templates/id/job-hold.tmpl
+#usr/share/cups/templates/id/job-move.tmpl
+#usr/share/cups/templates/id/job-moved.tmpl
+#usr/share/cups/templates/id/job-release.tmpl
+#usr/share/cups/templates/id/job-restart.tmpl
+#usr/share/cups/templates/id/jobs-header.tmpl
+#usr/share/cups/templates/id/jobs.tmpl
+#usr/share/cups/templates/id/list-available-printers.tmpl
+#usr/share/cups/templates/id/modify-class.tmpl
+#usr/share/cups/templates/id/modify-printer.tmpl
+#usr/share/cups/templates/id/norestart.tmpl
+#usr/share/cups/templates/id/option-boolean.tmpl
+#usr/share/cups/templates/id/option-conflict.tmpl
+#usr/share/cups/templates/id/option-header.tmpl
+#usr/share/cups/templates/id/option-pickmany.tmpl
+#usr/share/cups/templates/id/option-pickone.tmpl
+#usr/share/cups/templates/id/option-trailer.tmpl
+#usr/share/cups/templates/id/pager.tmpl
+#usr/share/cups/templates/id/printer-accept.tmpl
+#usr/share/cups/templates/id/printer-added.tmpl
+#usr/share/cups/templates/id/printer-configured.tmpl
+#usr/share/cups/templates/id/printer-confirm.tmpl
+#usr/share/cups/templates/id/printer-default.tmpl
+#usr/share/cups/templates/id/printer-deleted.tmpl
+#usr/share/cups/templates/id/printer-jobs-header.tmpl
+#usr/share/cups/templates/id/printer-modified.tmpl
+#usr/share/cups/templates/id/printer-purge.tmpl
+#usr/share/cups/templates/id/printer-reject.tmpl
+#usr/share/cups/templates/id/printer-start.tmpl
+#usr/share/cups/templates/id/printer-stop.tmpl
+#usr/share/cups/templates/id/printer.tmpl
+#usr/share/cups/templates/id/printers-header.tmpl
+#usr/share/cups/templates/id/printers.tmpl
+#usr/share/cups/templates/id/restart.tmpl
+#usr/share/cups/templates/id/samba-export.tmpl
+#usr/share/cups/templates/id/samba-exported.tmpl
+#usr/share/cups/templates/id/search.tmpl
+#usr/share/cups/templates/id/set-printer-options-header.tmpl
+#usr/share/cups/templates/id/set-printer-options-trailer.tmpl
+#usr/share/cups/templates/id/subscription-added.tmpl
+#usr/share/cups/templates/id/subscription-canceled.tmpl
+#usr/share/cups/templates/id/test-page.tmpl
+#usr/share/cups/templates/id/trailer.tmpl
+#usr/share/cups/templates/id/users.tmpl
+#usr/share/cups/templates/it
+#usr/share/cups/templates/it/add-class.tmpl
+#usr/share/cups/templates/it/add-printer.tmpl
+#usr/share/cups/templates/it/add-rss-subscription.tmpl
+#usr/share/cups/templates/it/admin.tmpl
+#usr/share/cups/templates/it/choose-device.tmpl
+#usr/share/cups/templates/it/choose-make.tmpl
+#usr/share/cups/templates/it/choose-model.tmpl
+#usr/share/cups/templates/it/choose-serial.tmpl
+#usr/share/cups/templates/it/choose-uri.tmpl
+#usr/share/cups/templates/it/class-added.tmpl
+#usr/share/cups/templates/it/class-confirm.tmpl
+#usr/share/cups/templates/it/class-deleted.tmpl
+#usr/share/cups/templates/it/class-jobs-header.tmpl
+#usr/share/cups/templates/it/class-modified.tmpl
+#usr/share/cups/templates/it/class.tmpl
+#usr/share/cups/templates/it/classes-header.tmpl
+#usr/share/cups/templates/it/classes.tmpl
+#usr/share/cups/templates/it/command.tmpl
+#usr/share/cups/templates/it/edit-config.tmpl
+#usr/share/cups/templates/it/error-op.tmpl
+#usr/share/cups/templates/it/error.tmpl
+#usr/share/cups/templates/it/help-header.tmpl
+#usr/share/cups/templates/it/help-printable.tmpl
+#usr/share/cups/templates/it/help-trailer.tmpl
+#usr/share/cups/templates/it/job-cancel.tmpl
+#usr/share/cups/templates/it/job-hold.tmpl
+#usr/share/cups/templates/it/job-move.tmpl
+#usr/share/cups/templates/it/job-moved.tmpl
+#usr/share/cups/templates/it/job-release.tmpl
+#usr/share/cups/templates/it/job-restart.tmpl
+#usr/share/cups/templates/it/jobs-header.tmpl
+#usr/share/cups/templates/it/jobs.tmpl
+#usr/share/cups/templates/it/list-available-printers.tmpl
+#usr/share/cups/templates/it/modify-class.tmpl
+#usr/share/cups/templates/it/modify-printer.tmpl
+#usr/share/cups/templates/it/norestart.tmpl
+#usr/share/cups/templates/it/option-boolean.tmpl
+#usr/share/cups/templates/it/option-conflict.tmpl
+#usr/share/cups/templates/it/option-header.tmpl
+#usr/share/cups/templates/it/option-pickmany.tmpl
+#usr/share/cups/templates/it/option-pickone.tmpl
+#usr/share/cups/templates/it/option-trailer.tmpl
+#usr/share/cups/templates/it/pager.tmpl
+#usr/share/cups/templates/it/printer-accept.tmpl
+#usr/share/cups/templates/it/printer-added.tmpl
+#usr/share/cups/templates/it/printer-configured.tmpl
+#usr/share/cups/templates/it/printer-confirm.tmpl
+#usr/share/cups/templates/it/printer-default.tmpl
+#usr/share/cups/templates/it/printer-deleted.tmpl
+#usr/share/cups/templates/it/printer-jobs-header.tmpl
+#usr/share/cups/templates/it/printer-modified.tmpl
+#usr/share/cups/templates/it/printer-purge.tmpl
+#usr/share/cups/templates/it/printer-reject.tmpl
+#usr/share/cups/templates/it/printer-start.tmpl
+#usr/share/cups/templates/it/printer-stop.tmpl
+#usr/share/cups/templates/it/printer.tmpl
+#usr/share/cups/templates/it/printers-header.tmpl
+#usr/share/cups/templates/it/printers.tmpl
+#usr/share/cups/templates/it/restart.tmpl
+#usr/share/cups/templates/it/samba-export.tmpl
+#usr/share/cups/templates/it/samba-exported.tmpl
+#usr/share/cups/templates/it/search.tmpl
+#usr/share/cups/templates/it/set-printer-options-header.tmpl
+#usr/share/cups/templates/it/set-printer-options-trailer.tmpl
+#usr/share/cups/templates/it/subscription-added.tmpl
+#usr/share/cups/templates/it/subscription-canceled.tmpl
+#usr/share/cups/templates/it/test-page.tmpl
+#usr/share/cups/templates/it/trailer.tmpl
+#usr/share/cups/templates/it/users.tmpl
 #usr/share/cups/templates/ja
 #usr/share/cups/templates/ja/add-class.tmpl
 #usr/share/cups/templates/ja/add-printer.tmpl
@@ -797,6 +938,8 @@ usr/share/doc/cups/help
 #usr/share/doc/cups/help/standard.html
 #usr/share/doc/cups/help/translation.html
 #usr/share/doc/cups/help/whatsnew.html
+#usr/share/doc/cups/id
+#usr/share/doc/cups/id/index.html
 usr/share/doc/cups/images
 #usr/share/doc/cups/images/color-wheel.png
 #usr/share/doc/cups/images/cups-block-diagram.png
@@ -813,6 +956,8 @@ usr/share/doc/cups/images
 #usr/share/doc/cups/images/unsel.gif
 #usr/share/doc/cups/images/wait.gif
 usr/share/doc/cups/index.html
+#usr/share/doc/cups/it
+#usr/share/doc/cups/it/index.html
 #usr/share/doc/cups/ja
 #usr/share/doc/cups/ja/index.html
 #usr/share/doc/cups/pl
@@ -826,6 +971,7 @@ usr/share/doc/cups/robots.txt
 #usr/share/locale/eu/cups_eu.po
 #usr/share/locale/fi/cups_fi.po
 #usr/share/locale/fr/cups_fr.po
+#usr/share/locale/id/cups_id.po
 #usr/share/locale/it/cups_it.po
 #usr/share/locale/ja/cups_ja.po
 #usr/share/locale/ko/cups_ko.po
@@ -901,4 +1047,4 @@ var/run/cups
 var/run/cups/certs
 var/spool/cups
 var/spool/cups/tmp
-etc/rc.d/init.d/cups
+etc/rc.d/init.d/cups

config/rootfiles/packages/ipfireseeder

@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core40.iso.torrent
 #var/log/seeder
 var/log/seeder/info