From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 66289de753c1ca1c2196b1246fcab46ec7735ba4
Date: Thu, 16 Jul 2015 12:26:15 +0200 [thread overview]
Message-ID: <20150716102616.050B62239C@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 10476 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 66289de753c1ca1c2196b1246fcab46ec7735ba4 (commit)
via 5d4bb3c9ffbff5e4d3d7ee7094a1dd296c44ca41 (commit)
from a722eae9dd0067eead8898fa2a53c95469e10226 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 66289de753c1ca1c2196b1246fcab46ec7735ba4
Merge: 5d4bb3c a722eae
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 16 12:25:43 2015 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 5d4bb3c9ffbff5e4d3d7ee7094a1dd296c44ca41
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 16 08:02:06 2015 +0200
cups: rootfile update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/cups | 151 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 147 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 56ee1f2..e3cd084 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -1,6 +1,4 @@
-#etc/dbus-1/system.d/cups.conf
etc/pam.d/cups
-etc/rc.d/init.d/cups
#etc/rc0.d
#etc/rc0.d/K36cups
#etc/rc2.d
@@ -339,6 +337,77 @@ usr/share/cups/templates/cs/subscription-canceled.tmpl
usr/share/cups/templates/cs/test-page.tmpl
usr/share/cups/templates/cs/trailer.tmpl
usr/share/cups/templates/cs/users.tmpl
+usr/share/cups/templates/de
+usr/share/cups/templates/de/add-class.tmpl
+usr/share/cups/templates/de/add-printer.tmpl
+usr/share/cups/templates/de/add-rss-subscription.tmpl
+usr/share/cups/templates/de/admin.tmpl
+usr/share/cups/templates/de/choose-device.tmpl
+usr/share/cups/templates/de/choose-make.tmpl
+usr/share/cups/templates/de/choose-model.tmpl
+usr/share/cups/templates/de/choose-serial.tmpl
+usr/share/cups/templates/de/choose-uri.tmpl
+usr/share/cups/templates/de/class-added.tmpl
+usr/share/cups/templates/de/class-confirm.tmpl
+usr/share/cups/templates/de/class-deleted.tmpl
+usr/share/cups/templates/de/class-jobs-header.tmpl
+usr/share/cups/templates/de/class-modified.tmpl
+usr/share/cups/templates/de/class.tmpl
+usr/share/cups/templates/de/classes-header.tmpl
+usr/share/cups/templates/de/classes.tmpl
+usr/share/cups/templates/de/command.tmpl
+usr/share/cups/templates/de/edit-config.tmpl
+usr/share/cups/templates/de/error-op.tmpl
+usr/share/cups/templates/de/error.tmpl
+usr/share/cups/templates/de/header.tmpl
+usr/share/cups/templates/de/help-header.tmpl
+usr/share/cups/templates/de/help-printable.tmpl
+usr/share/cups/templates/de/help-trailer.tmpl
+usr/share/cups/templates/de/job-cancel.tmpl
+usr/share/cups/templates/de/job-hold.tmpl
+usr/share/cups/templates/de/job-move.tmpl
+usr/share/cups/templates/de/job-moved.tmpl
+usr/share/cups/templates/de/job-release.tmpl
+usr/share/cups/templates/de/job-restart.tmpl
+usr/share/cups/templates/de/jobs-header.tmpl
+usr/share/cups/templates/de/jobs.tmpl
+usr/share/cups/templates/de/list-available-printers.tmpl
+usr/share/cups/templates/de/modify-class.tmpl
+usr/share/cups/templates/de/modify-printer.tmpl
+usr/share/cups/templates/de/norestart.tmpl
+usr/share/cups/templates/de/option-boolean.tmpl
+usr/share/cups/templates/de/option-conflict.tmpl
+usr/share/cups/templates/de/option-header.tmpl
+usr/share/cups/templates/de/option-pickmany.tmpl
+usr/share/cups/templates/de/option-pickone.tmpl
+usr/share/cups/templates/de/option-trailer.tmpl
+usr/share/cups/templates/de/pager.tmpl
+usr/share/cups/templates/de/printer-accept.tmpl
+usr/share/cups/templates/de/printer-added.tmpl
+usr/share/cups/templates/de/printer-configured.tmpl
+usr/share/cups/templates/de/printer-confirm.tmpl
+usr/share/cups/templates/de/printer-default.tmpl
+usr/share/cups/templates/de/printer-deleted.tmpl
+usr/share/cups/templates/de/printer-jobs-header.tmpl
+usr/share/cups/templates/de/printer-modified.tmpl
+usr/share/cups/templates/de/printer-purge.tmpl
+usr/share/cups/templates/de/printer-reject.tmpl
+usr/share/cups/templates/de/printer-start.tmpl
+usr/share/cups/templates/de/printer-stop.tmpl
+usr/share/cups/templates/de/printer.tmpl
+usr/share/cups/templates/de/printers-header.tmpl
+usr/share/cups/templates/de/printers.tmpl
+usr/share/cups/templates/de/restart.tmpl
+usr/share/cups/templates/de/samba-export.tmpl
+usr/share/cups/templates/de/samba-exported.tmpl
+usr/share/cups/templates/de/search.tmpl
+usr/share/cups/templates/de/set-printer-options-header.tmpl
+usr/share/cups/templates/de/set-printer-options-trailer.tmpl
+usr/share/cups/templates/de/subscription-added.tmpl
+usr/share/cups/templates/de/subscription-canceled.tmpl
+usr/share/cups/templates/de/test-page.tmpl
+usr/share/cups/templates/de/trailer.tmpl
+usr/share/cups/templates/de/users.tmpl
usr/share/cups/templates/edit-config.tmpl
usr/share/cups/templates/error-op.tmpl
usr/share/cups/templates/error.tmpl
@@ -664,6 +733,75 @@ usr/share/cups/templates/printer-stop.tmpl
usr/share/cups/templates/printer.tmpl
usr/share/cups/templates/printers-header.tmpl
usr/share/cups/templates/printers.tmpl
+usr/share/cups/templates/pt_BR
+usr/share/cups/templates/pt_BR/add-class.tmpl
+usr/share/cups/templates/pt_BR/add-printer.tmpl
+usr/share/cups/templates/pt_BR/add-rss-subscription.tmpl
+usr/share/cups/templates/pt_BR/admin.tmpl
+usr/share/cups/templates/pt_BR/choose-device.tmpl
+usr/share/cups/templates/pt_BR/choose-make.tmpl
+usr/share/cups/templates/pt_BR/choose-model.tmpl
+usr/share/cups/templates/pt_BR/choose-serial.tmpl
+usr/share/cups/templates/pt_BR/choose-uri.tmpl
+usr/share/cups/templates/pt_BR/class-added.tmpl
+usr/share/cups/templates/pt_BR/class-confirm.tmpl
+usr/share/cups/templates/pt_BR/class-deleted.tmpl
+usr/share/cups/templates/pt_BR/class-jobs-header.tmpl
+usr/share/cups/templates/pt_BR/class-modified.tmpl
+usr/share/cups/templates/pt_BR/class.tmpl
+usr/share/cups/templates/pt_BR/classes-header.tmpl
+usr/share/cups/templates/pt_BR/classes.tmpl
+usr/share/cups/templates/pt_BR/command.tmpl
+usr/share/cups/templates/pt_BR/edit-config.tmpl
+usr/share/cups/templates/pt_BR/error-op.tmpl
+usr/share/cups/templates/pt_BR/error.tmpl
+usr/share/cups/templates/pt_BR/header.tmpl
+usr/share/cups/templates/pt_BR/help-header.tmpl
+usr/share/cups/templates/pt_BR/job-cancel.tmpl
+usr/share/cups/templates/pt_BR/job-hold.tmpl
+usr/share/cups/templates/pt_BR/job-move.tmpl
+usr/share/cups/templates/pt_BR/job-moved.tmpl
+usr/share/cups/templates/pt_BR/job-release.tmpl
+usr/share/cups/templates/pt_BR/job-restart.tmpl
+usr/share/cups/templates/pt_BR/jobs-header.tmpl
+usr/share/cups/templates/pt_BR/jobs.tmpl
+usr/share/cups/templates/pt_BR/list-available-printers.tmpl
+usr/share/cups/templates/pt_BR/modify-class.tmpl
+usr/share/cups/templates/pt_BR/modify-printer.tmpl
+usr/share/cups/templates/pt_BR/norestart.tmpl
+usr/share/cups/templates/pt_BR/option-boolean.tmpl
+usr/share/cups/templates/pt_BR/option-conflict.tmpl
+usr/share/cups/templates/pt_BR/option-header.tmpl
+usr/share/cups/templates/pt_BR/option-pickmany.tmpl
+usr/share/cups/templates/pt_BR/option-pickone.tmpl
+usr/share/cups/templates/pt_BR/option-trailer.tmpl
+usr/share/cups/templates/pt_BR/pager.tmpl
+usr/share/cups/templates/pt_BR/printer-accept.tmpl
+usr/share/cups/templates/pt_BR/printer-added.tmpl
+usr/share/cups/templates/pt_BR/printer-configured.tmpl
+usr/share/cups/templates/pt_BR/printer-confirm.tmpl
+usr/share/cups/templates/pt_BR/printer-default.tmpl
+usr/share/cups/templates/pt_BR/printer-deleted.tmpl
+usr/share/cups/templates/pt_BR/printer-jobs-header.tmpl
+usr/share/cups/templates/pt_BR/printer-modified.tmpl
+usr/share/cups/templates/pt_BR/printer-purge.tmpl
+usr/share/cups/templates/pt_BR/printer-reject.tmpl
+usr/share/cups/templates/pt_BR/printer-start.tmpl
+usr/share/cups/templates/pt_BR/printer-stop.tmpl
+usr/share/cups/templates/pt_BR/printer.tmpl
+usr/share/cups/templates/pt_BR/printers-header.tmpl
+usr/share/cups/templates/pt_BR/printers.tmpl
+usr/share/cups/templates/pt_BR/restart.tmpl
+usr/share/cups/templates/pt_BR/samba-export.tmpl
+usr/share/cups/templates/pt_BR/samba-exported.tmpl
+usr/share/cups/templates/pt_BR/search.tmpl
+usr/share/cups/templates/pt_BR/set-printer-options-header.tmpl
+usr/share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
+usr/share/cups/templates/pt_BR/subscription-added.tmpl
+usr/share/cups/templates/pt_BR/subscription-canceled.tmpl
+usr/share/cups/templates/pt_BR/test-page.tmpl
+usr/share/cups/templates/pt_BR/trailer.tmpl
+usr/share/cups/templates/pt_BR/users.tmpl
usr/share/cups/templates/restart.tmpl
usr/share/cups/templates/ru
usr/share/cups/templates/ru/add-class.tmpl
@@ -755,6 +893,8 @@ usr/share/doc/cups/cs
usr/share/doc/cups/cs/index.html
usr/share/doc/cups/cups-printable.css
usr/share/doc/cups/cups.css
+usr/share/doc/cups/de
+usr/share/doc/cups/de/index.html
usr/share/doc/cups/es
usr/share/doc/cups/es/index.html
usr/share/doc/cups/fr
@@ -865,15 +1005,19 @@ 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/pt_BR
+usr/share/doc/cups/pt_BR/index.html
usr/share/doc/cups/robots.txt
usr/share/doc/cups/ru
usr/share/doc/cups/ru/index.html
usr/share/locale/ca/cups_ca.po
usr/share/locale/cs/cups_cs.po
+usr/share/locale/de/cups_de.po
usr/share/locale/es/cups_es.po
usr/share/locale/fr/cups_fr.po
usr/share/locale/it/cups_it.po
usr/share/locale/ja/cups_ja.po
+usr/share/locale/pt_BR/cups_pt_BR.po
usr/share/locale/ru/cups_ru.po
#usr/share/man/man1/cancel.1.gz
#usr/share/man/man1/cups-config.1.gz
@@ -936,7 +1080,6 @@ var/ipfire/cups/ppd
var/ipfire/cups/snmp.conf
var/ipfire/cups/ssl
var/log/cups
-#var/run/cups
-#var/run/cups/certs
var/spool/cups
var/spool/cups/tmp
+etc/rc.d/init.d/cups
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-07-16 10:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150716102616.050B62239C@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox