From: Bdale Garbee Date: Mon, 19 Mar 2012 14:42:06 +0000 (+0100) Subject: Merge tag 'upstream/3.3.1' X-Git-Tag: debian/3.3.1-1~9 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8eb7e8e19f1373f6be7f1f7837b997748ce31d0e;hp=c6f0a88c567f8536c498f554285aed1f8150da18;p=debian%2Famanda Merge tag 'upstream/3.3.1' Upstream version 3.3.1 Conflicts: man/disklist.5 --- diff --git a/client-src/amandates.c b/client-src/amandates.c index c16b246..cdeafe3 100644 --- a/client-src/amandates.c +++ b/client-src/amandates.c @@ -26,7 +26,7 @@ /* * $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $ * - * manage amandates file, that mimics /etc/dumpdates, but stores + * manage amandates file, that mimics /var/lib/dumpdates, but stores * GNUTAR dates */ @@ -314,7 +314,7 @@ import_dumpdates( devname = amname_to_devname(amdp->name); - if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) { + if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) { amfree(devname); return; } diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c index e044a6c..04e8248 100644 --- a/client-src/selfcheck.c +++ b/client-src/selfcheck.c @@ -1137,8 +1137,8 @@ check_overall(void) check_file(COMPRESS_PATH, X_OK); if (need_dump || need_xfsdump ) { - if (check_file_exist("/etc/dumpdates")) { - check_file("/etc/dumpdates", + if (check_file_exist("/var/lib/dumpdates")) { + check_file("/var/lib/dumpdates", #ifdef USE_RUNDUMP F_OK #else @@ -1148,15 +1148,15 @@ check_overall(void) } else { #ifndef USE_RUNDUMP if (access("/etc", R_OK|W_OK) == -1) { - g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno)); + g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno)); } #endif } } if (need_vdump) { - if (check_file_exist("/etc/vdumpdates")) { - check_file("/etc/vdumpdates", F_OK); + if (check_file_exist("/var/lib/vdumpdates")) { + check_file("/var/lib/vdumpdates", F_OK); } } @@ -1168,6 +1168,7 @@ check_overall(void) check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */ #endif + check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */ check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */ } } diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..a5a6b97 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,13 @@ +amanda (1:3.3.0-1) unstable; urgency=low + + As of version 3.3.0, Amanda now uses bsdtcp as the default auth method, + and the package postinst scripts install a suitable inetd entry. + + You may need to update existing amanda.conf files to reflect this change, + as such configs are often hand-crafted to meet site expectations. + + You may also need to adjust inetd or xinetd configs to include both bsd + and bsdtcp auth methods if circumstances mandate keeping auth method bsd + active in your environment. + + -- Bdale Garbee Tue, 13 Sep 2011 12:36:08 -0600 diff --git a/debian/activate-devpay.1 b/debian/activate-devpay.1 new file mode 100644 index 0000000..a926db2 --- /dev/null +++ b/debian/activate-devpay.1 @@ -0,0 +1,15 @@ +.TH ACTIVATE-DEVPAY 1 +.SH NAME +activate-devpay \- create the token and certificate files for Amazon S3 +.SH SYNOPSIS +.B activate-devpay +.SH "DESCRIPTION" +This program creates the token and certificate files for Amazon Devpay's +Simple Token Service (STS). You can then use those files with the S3 device. + +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. + +.SH AUTHOR +This manual page was written by Bdale Garbee , +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/amanda-client.README.Debian b/debian/amanda-client.README.Debian new file mode 100644 index 0000000..30b4c02 --- /dev/null +++ b/debian/amanda-client.README.Debian @@ -0,0 +1,14 @@ +Notes on making amanda-client work on a Debian system + +To get indexing (or specifically amrecover) to work right two things need +to be done: + +1. If you're using tcpd, make sure to edit the server's /etc/hosts.allow and + allow all client machines into the daemon amandad + +2. Edit the server(s) ~backup/.amandahosts and add an entry like: + " root" + +As always: for more complex setups consult the manpages and available +documentation in /usr/share/doc/amanda-common ;-) + diff --git a/debian/amanda-client.dirs b/debian/amanda-client.dirs new file mode 100644 index 0000000..3f2a4c8 --- /dev/null +++ b/debian/amanda-client.dirs @@ -0,0 +1,3 @@ +usr/share/doc/amanda-client +usr/share/lintian/overrides +var/lib/amanda/gnutar-lists diff --git a/debian/amanda-client.files b/debian/amanda-client.files new file mode 100644 index 0000000..5df9dd2 --- /dev/null +++ b/debian/amanda-client.files @@ -0,0 +1,19 @@ +usr/lib/amanda/amandad +usr/lib/amanda/application/* +usr/lib/amanda/calcsize +usr/lib/amanda/killpgrp +usr/lib/amanda/patch-system +usr/lib/amanda/rundump +usr/lib/amanda/runtar +usr/lib/amanda/selfcheck +usr/lib/amanda/sendbackup +usr/lib/amanda/sendsize +usr/sbin/amfetchdump +usr/sbin/amoldrecover +usr/sbin/amrecover +usr/sbin/amrestore +usr/share/man/man5/amanda-client.conf.5.gz +usr/share/man/man7/amanda-applications.7.gz +usr/share/man/man8/amfetchdump.8.gz +usr/share/man/man8/amrecover.8.gz +usr/share/man/man8/amrestore.8.gz diff --git a/debian/amanda-client.lintian b/debian/amanda-client.lintian new file mode 100644 index 0000000..b33b73a --- /dev/null +++ b/debian/amanda-client.lintian @@ -0,0 +1,9 @@ +amanda-client: setuid-binary usr/lib/amanda/application/amgtar 4754 root/backup +amanda-client: setuid-binary usr/lib/amanda/application/amstar 4754 root/backup +amanda-client: setuid-binary usr/lib/amanda/calcsize 4754 root/backup +amanda-client: setuid-binary usr/lib/amanda/killpgrp 4754 root/backup +amanda-client: setuid-binary usr/lib/amanda/rundump 4754 root/backup +amanda-client: setuid-binary usr/lib/amanda/runtar 4754 root/backup +amanda-client: non-standard-dir-perm var/lib/amanda/ 0770 != 0755 +amanda-client: non-standard-dir-perm var/lib/amanda/gnutar-lists/ 0770 != 0755 +amanda-client: possible-gpl-code-linked-with-openssl diff --git a/debian/amanda-client.manpages b/debian/amanda-client.manpages new file mode 100644 index 0000000..16a043a --- /dev/null +++ b/debian/amanda-client.manpages @@ -0,0 +1 @@ +debian/amoldrecover.8 diff --git a/debian/amanda-common.dirs b/debian/amanda-common.dirs new file mode 100644 index 0000000..3605183 --- /dev/null +++ b/debian/amanda-common.dirs @@ -0,0 +1,4 @@ +etc/xinetd.d +usr/lib +usr/share/doc/amanda-common/examples +usr/share/lintian/overrides diff --git a/debian/amanda-common.lintian b/debian/amanda-common.lintian new file mode 100644 index 0000000..ba9cb12 --- /dev/null +++ b/debian/amanda-common.lintian @@ -0,0 +1 @@ +amanda-common: possible-gpl-code-linked-with-openssl diff --git a/debian/amanda-common.postinst b/debian/amanda-common.postinst new file mode 100644 index 0000000..50f05f3 --- /dev/null +++ b/debian/amanda-common.postinst @@ -0,0 +1,63 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +if [ "$1" = configure ]; then + if ! getent passwd backup; then + adduser --quiet --system --no-create-home --home /var/backups \ + --shell /bin/sh --uid 34 --gid 34 backup + fi + + if [ ! -f /var/backups/.profile ]; then + echo 'PATH="$PATH:/usr/sbin"' > /var/backups/.profile + fi + + groupadd -f -g 34 backup + groupadd -f -g 26 tape + + adduser backup disk + adduser backup tape + + # in case we get installed first + if [ ! -d /var/lib/amanda ]; then + mkdir -p /var/lib/amanda + fi + + # try to handle a /var/lib/amandates file, since we created it + # incorrectly in previous versions of the amanda packages for Debian + if [ -f /var/lib/amandates ]; then + if [ ! -f /var/lib/amanda/amandates ]; then + mv /var/lib/amandates /var/lib/amanda/amandates + fi + fi + + # make sure amandates exists and has the right perms + if [ ! -f /var/lib/amanda/amandates ]; then + touch /var/lib/amanda/amandates + fi + chown backup:backup /var/lib/amanda/amandates + + # make sure user backup has a home directory + if [ ! -d ~backup ]; then + mkdir -p ~backup + fi + + # make sure there is a .amandahosts symlink + if [ ! -L ~backup/.amandahosts ]; then + ln -sf /etc/amandahosts ~backup/.amandahosts + fi + + # make sure /var/log/amanda exists + if [ ! -d /var/log/amanda ]; then + mkdir -p /var/log/amanda + fi + + chown backup:backup ~backup/.amandahosts /etc/amandahosts \ + /var/log/amanda + chmod 600 ~backup/.amandahosts /etc/amandahosts + chmod 770 /var/log/amanda +fi + +update-inetd --add "amanda stream tcp nowait backup /usr/lib/amanda/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped" + +#DEBHELPER# diff --git a/debian/amanda-common.postrm b/debian/amanda-common.postrm new file mode 100644 index 0000000..9c39738 --- /dev/null +++ b/debian/amanda-common.postrm @@ -0,0 +1,37 @@ +#!/bin/sh -e +case "$1" in + purge) + if [ -d /var/log/amanda ]; then + rm -rf /var/log/amanda + fi + if [ -d /var/lib/amanda-gnutar-lists ]; then + rm -rf /var/lib/amanda-gnutar-lists + fi + if [ -d /var/lib/amanda-index ]; then + rm -rf /var/lib/amanda-index + fi + if [ -d /var/lib/amanda ]; then + rm -rf /var/lib/amanda + fi + # keep this around to clean up after old, broken amanda packages + # new packages have amandates in /var/lib/amanda... + if [ -f /var/lib/amandates ]; then + rm -f /var/lib/amandates + fi + + rm -f ~backup/.amandahosts + + ;; + remove|upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "unknown argument --> $1" >&2 + exit 0 + ;; +esac + +#DEBHELPER# diff --git a/debian/amanda-common.preinst b/debian/amanda-common.preinst new file mode 100644 index 0000000..e541f24 --- /dev/null +++ b/debian/amanda-common.preinst @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# if a .amandahosts exists and is not a symlink, move it to /etc +if [ ! -L ~backup/.amandahosts ] +then + if [ -f ~backup/.amandahosts ] + then + mv -f ~backup/.amandahosts /etc/amandahosts + fi +fi + +#DEBHELPER# diff --git a/debian/amanda-common.prerm b/debian/amanda-common.prerm new file mode 100644 index 0000000..1ff778a --- /dev/null +++ b/debian/amanda-common.prerm @@ -0,0 +1,5 @@ +#!/bin/sh -e + +update-inetd --remove "amanda" + +#DEBHELPER# diff --git a/debian/amanda-server.README.Debian b/debian/amanda-server.README.Debian new file mode 100644 index 0000000..c51849c --- /dev/null +++ b/debian/amanda-server.README.Debian @@ -0,0 +1,144 @@ +amanda for DEBIAN +----------------- + +Since every Amanda installation is different, there is some work you need to +do to configure your server. For a simple setup, as root you need to: + +1. Create a directory under /etc/amanda for your backup config, we'll assume + a name 'DailySet1' as our example. + + mkdir /etc/amanda/DailySet1 + + Make sure that /etc/amanda and all the files under it are owner and group + backup with directory permissions of 770 and file permissions of 660. + +2. populate this directory with config files. At a minimum, you need + amanda.conf and disklist. + + cp /usr/share/doc/amanda-server/examples/amanda.conf \ + /etc/amanda/DailySet1/amanda.conf* + cp /usr/share/doc/amanda-server/examples/disklist \ + /etc/amanda/DailySet1/disklist + + Edit these files as needed, following the instructions in each file. + +3. Make sure that /etc/amanda and all the files under it are owner and group + backup with directory permissions of 770 and file permissions of 660. + + chown -R backup:backup /etc/amanda + +3. Prepare the "holding disk" if you plan to use one (highly recommended!) by + ensuring user backup can access it. See the note below indicating that it + may be better to use a subdirectory and not a mount point to avoid having + system artifacts like the lost+found directory confuse things. + + chown -R backup:backup + +4. Install a suitable crontab for user backup. If you used DailySet1 as your + configuration name, you can just install the provided example. If you + picked some other name, you will obviously need to edit a copy of the + example before installing it. + + crontab -u backup /usr/share/doc/amanda-server/examples/crontab.amanda + +To use all of Amanda's features, you probably also want to put each client +machine's root user in the .rhosts or .amandahosts for ~backup on the server +machine. On Debian systems, this is usually linked to /etc/amandahosts, but +if you have clients running other operating systems you'll have to find the +right place yourself. + +NOTE: If you want to backup your server too, you need to treat it as both a +client *and* a server, see /usr/share/doc/amanda-client/README.Debian for +more information. + +For more complex setups, consult the manpages and the extra documents and +example files in /usr/share/doc/amanda-common, or look at www.amanda.org on +the web. + +Another Note: if you use floppy tapes you have to use the sftape interface +for use with ftape(>=3.03). + +Jean Pierre LeJacq reports the following about +his experience using ftape: + + I'm using ftape successfully with amanda but only after + struggling. The crucial trick was to set the block size with with ftmt to + be the same as used by amanda. I've implemented this with this entry in + /etc/modules.conf: + + alias char-major-27 zftape + pre-install zftape /sbin/swapout 5 + post-install zftape /bin/ftmt -f /dev/nzqft0 setblk 32768 + +To ease use with firewalls, Amanda has been built with options restricting the +use of TCP to the port range 50000-50100, and UDP to the port range 840-860. + +Sam Johnston reported problems with an Amanda server on which +bastille was used with the "restrict system resources" option. See bug +118616 in the Debian bug tracking system for more information. + +If you choose to use the SSH authentication method and associated transport, +please be aware that there may be problems if /usr/lib/amanda/dumper is suid. +You can fix this on your server with chmod u-s /usr/lib/amanda/dumper, or +investigate dpkg-statoverride. + +Concerns have been expressed about the reliability of 'dump' as a backup tool +on live Linux systems. Nothing can guarantee a consistent and meaningful +backup of a live filesystem under all circumstances, and the maintainer of +these packages uses dump with good results. + +The tar utility is 'essential' in Debian and so will always be around, is not +tied to any specific filesystem type, and there are entries in the default +amanda.conf file defining dump types using tar. This may therefore be a good +option to consider. + +Note that if you are using tar with amanda, and getting errors about missing +exclude files (particularly on upgrades from older versions), then you may +need to update your dumptypes definition to explicitly indicate that the +exclude file is optional, as shown in this example: + + define dumptype userdata-lowvalue { + program "GNUTAR" + comment "Low value user data dumped with tar" + options compress-fast, index + exclude list optional ".amandaexclude" + priority low + } + +- - - - - + +If you see backups failing with an error like: + + driver: FATAL flush line 1: syntax error (skipping != FLUSH) + +The problem may be that some versions of Amanda around 2.5.2 are not +happy if there are unexpected contents in the holdingdisk you have +defined on the server. This can occur, for example, if you are using +the mount point of a separate filesystem that contains a lost+found +directory. The quick fix is to create a subdirectory in that partition +for Amanda to use that will have no such unexpected contents. For more +info on this issue see: + + http://forums.zmanda.com/archive/index.php/t-591.html + +- - - - - + +If you see things like this in dmesg: + + INFO: task ammt:9839 blocked for more than 120 seconds. + "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. + +This information from Marc Schaefer may relevant: + +> AFAIK it's because mtio operations are done in D state (uninterruptible +> sleep). +> +> And except for mtio operations which may last more than two minutes, +> nothing in the usual kernel operation will last that long. +> +> Solutions: +> - either fix mtio to be interruptible (which may well cause problems +> because e.g. SCSI reselection might happen later) +> - use the proposed work-around +> - ignore those messages in your logcheck. + diff --git a/debian/amanda-server.dirs b/debian/amanda-server.dirs new file mode 100644 index 0000000..1e626ae --- /dev/null +++ b/debian/amanda-server.dirs @@ -0,0 +1,7 @@ +etc/amanda +etc/xinetd.d +usr/sbin +usr/share/doc/amanda-server/examples +usr/share/lintian/overrides +var/lib/amanda +var/log/amanda diff --git a/debian/amanda-server.examples b/debian/amanda-server.examples new file mode 100644 index 0000000..b2a0116 --- /dev/null +++ b/debian/amanda-server.examples @@ -0,0 +1 @@ +debian/crontab.amanda diff --git a/debian/amanda-server.files b/debian/amanda-server.files new file mode 100644 index 0000000..756dbf2 --- /dev/null +++ b/debian/amanda-server.files @@ -0,0 +1,49 @@ +usr/lib/amanda/amcat.awk +usr/lib/amanda/amcleanupdisk +usr/lib/amanda/amidxtaped +usr/lib/amanda/amindexd +usr/lib/amanda/amlogroll +usr/lib/amanda/amplot.* +usr/lib/amanda/amtrmidx +usr/lib/amanda/amtrmlog +usr/lib/amanda/chg-* +usr/lib/amanda/driver +usr/lib/amanda/dumper +usr/lib/amanda/planner +usr/lib/amanda/taper +usr/sbin/activate-devpay +usr/sbin/amadmin +usr/sbin/amcheck +usr/sbin/amcheckdb +usr/sbin/amcheckdump +usr/sbin/amcleanup +usr/sbin/amdump +usr/sbin/amflush +usr/sbin/amgetconf +usr/sbin/amlabel +usr/sbin/amoverview +usr/sbin/amplot +usr/sbin/amreport +usr/sbin/amrmtape +usr/sbin/amstatus +usr/sbin/amtape +usr/sbin/amtapetype +usr/sbin/amtoc +usr/share/man/man8/amadmin.8.gz +usr/share/man/man8/amanda.8.gz +usr/share/man/man8/amcheck.8.gz +usr/share/man/man8/amcheckdb.8.gz +usr/share/man/man8/amcheckdump.8.gz +usr/share/man/man8/amcleanup.8.gz +usr/share/man/man8/amdump.8.gz +usr/share/man/man8/amflush.8.gz +usr/share/man/man8/amgetconf.8.gz +usr/share/man/man8/amlabel.8.gz +usr/share/man/man8/amoverview.8.gz +usr/share/man/man8/amplot.8.gz +usr/share/man/man8/amreport.8.gz +usr/share/man/man8/amrmtape.8.gz +usr/share/man/man8/amstatus.8.gz +usr/share/man/man8/amtape.8.gz +usr/share/man/man8/amtapetype.8.gz +usr/share/man/man8/amtoc.8.gz diff --git a/debian/amanda-server.lintian b/debian/amanda-server.lintian new file mode 100644 index 0000000..794a3a3 --- /dev/null +++ b/debian/amanda-server.lintian @@ -0,0 +1,7 @@ +amanda-server: non-standard-dir-perm etc/amanda/ 0770 != 0755 +amanda-server: setuid-binary usr/lib/amanda/dumper 4754 root/backup +amanda-server: setuid-binary usr/lib/amanda/planner 4754 root/backup +amanda-server: setuid-binary usr/sbin/amcheck 4754 root/backup +amanda-server: non-standard-dir-perm var/lib/amanda/ 0770 != 0755 +amanda-server: non-standard-dir-perm var/log/amanda/ 0770 != 0755 +amanda-server: possible-gpl-code-linked-with-openssl diff --git a/debian/amanda-server.manpages b/debian/amanda-server.manpages new file mode 100644 index 0000000..14e5dfc --- /dev/null +++ b/debian/amanda-server.manpages @@ -0,0 +1 @@ +debian/activate-devpay.1 diff --git a/debian/amandahosts b/debian/amandahosts new file mode 100644 index 0000000..5e9f6eb --- /dev/null +++ b/debian/amandahosts @@ -0,0 +1 @@ +localhost backup diff --git a/debian/amoldrecover.8 b/debian/amoldrecover.8 new file mode 100644 index 0000000..7e9e821 --- /dev/null +++ b/debian/amoldrecover.8 @@ -0,0 +1,18 @@ +.TH AMOLDRECOVER 8 +.SH NAME +amoldrecover \- amrecover variant compantible with old Amanda protocols +.SH "DESCRIPTION" +This program has the same syntax and functionality as amrecover, but uses +the older amidxtaped/amindexd protocol. It is provided only for compatibility +with old Amanda releases. + +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. + +.SH "SEE ALSO" +.PP +\fBamrecover\fR(8), + +.SH AUTHOR +This manual page was written by Bdale Garbee , +for the Debian GNU/Linux system (but may be used by others). diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..24c0e7a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,798 @@ +amanda (1:3.3.0-1) unstable; urgency=low + + * new upstream version, closes: #641453 + * lots of packaging cleanup + * consolidate inetd and xinetd config handling in amanda-common package + * add a NEWS entry explaining the switch to bsdtcp auth as default + + -- Bdale Garbee Tue, 13 Sep 2011 12:42:40 -0600 + +amanda (1:3.2.1-1.1) unstable; urgency=low + + * non-maintainer upload + * clear dependency_libs in *.la files, closes: #621214 + + -- Luk Claes Sat, 28 May 2011 17:04:18 +0200 + +amanda (1:3.2.1-1) unstable; urgency=low + + * new upstream version, closes: #613178 + * enable support for Amazon S3 storage on request from Christopher McCrory + * fix for dh_perl usage to include private library, closes: #582220 + * merge updated Vietnamese debconf translation, closes: #601919 + * merge updated Danish debconf translation, closes: #608435 + * merge updated Arabic debconf translation, closes: #596178 + + -- Bdale Garbee Sun, 27 Feb 2011 11:54:58 -0700 + +amanda (1:3.2.0-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee Wed, 01 Dec 2010 20:39:49 -0700 + +amanda (1:3.1.0-1) unstable; urgency=low + + * new upstream version + + -- Bdale Garbee Mon, 14 Jun 2010 13:46:03 -0600 + +amanda (1:2.6.1p2-2) unstable; urgency=low + + * add build depend on procps, closes: #552390 + * add dh_perl call to rules and ${perl:Depends} to amanda-common deps so + that we comply with Perl policy, closes: #582220 + + -- Bdale Garbee Mon, 14 Jun 2010 10:21:11 -0600 + +amanda (1:2.6.1p2-1) unstable; urgency=low + + * new upstream version + * move more files out of amanda-common that really belong elsewhere + * deliver /usr/lib/amanda/application/am[gs]tar setuid, closes: #558094 + * leave user backup groups alone on purge, closes: #572933 + + -- Bdale Garbee Mon, 15 Mar 2010 15:23:20 -0600 + +amanda (1:2.6.1p1-2) unstable; urgency=low + + * calcsize needs to be setuid, closes: #551156 + * patch from upstream to fix init of xml_app.result in diskfile.c, + closes: #550098 + * add note to server package README.Debian regarding mtio operations that + take too long putting noise in dmesg, closes: #506397 + * merge Finnish translation of the debconf templates, closes: #535214 + + -- Bdale Garbee Fri, 16 Oct 2009 02:10:52 -0600 + +amanda (1:2.6.1p1-1) unstable; urgency=low + + * new upstream version, closes: #527090, #527489, #486405, #488713 + * tweak configure to ensure ssh support is enabled, closes: #524618, #492352 + * update debian/control to include my git packaging repo location + * resolve possible bashisms, closes: #530041 + + -- Bdale Garbee Tue, 08 Sep 2009 11:40:42 -0600 + +amanda (1:2.5.2p1-5) unstable; urgency=low + + * add --without-ipv6 as a short-term fix for amdump connectivity problems, + closes: #482754, #501281, #470202 + + -- Bdale Garbee Thu, 26 Mar 2009 22:52:51 -0600 + +amanda (1:2.5.2p1-4) unstable; urgency=high + + * high priority bug fixes intended for lenny release + * update version thresholds in Replaces to ease upgrades, closes: #476583 + * don't set maxdumpsize in the default amanda.conf, closes: #475524 + * freshen to latest standards version + * revert chg-multi.sh.in and patch since the new version previously pulled + in caused more problems than it solved, closes: #486384 + * undo traps on amverify exit to prevent double reports, closes: #487405 + * correct paths in amcrypt-ossl-asym(8) xml source, closes: #486739 + + -- Bdale Garbee Sat, 16 Aug 2008 16:03:27 -0300 + +amanda (1:2.5.2p1-3) unstable; urgency=low + + * fix "bashisms" in the amcleanup and amverify scripts. closes: #464489 + * merge updated Russian translation, closes: #471030 + * move example configuration 'DailySet1' from /etc/amanda to + /usr/share/doc/amanda-server/examples to reduce confusion, update + the amanda-server README.Debian with fresh install notes. closes: #420023 + * move some binaries out of amanda-common into -server and -client + * harden forcing of /usr/bin/mail instead of /usr/bin/Mail, closes: #475771 + + -- Bdale Garbee Wed, 16 Apr 2008 00:02:13 -0600 + +amanda (1:2.5.2p1-2) unstable; urgency=low + + * document holding disk constraint in amanda-server README.Debian file, + closes: #465746 + * patch from Wolfgang Weisselberg for a problem in amstatus, closes: #471240 + * enable both with-bsdtcp-security and with-bsdudp-security in configure, + perhaps that will help resolve some of the problems users are having + with 2.5.2? + + -- Bdale Garbee Thu, 20 Mar 2008 18:06:58 -0600 + +amanda (1:2.5.2p1-1) unstable; urgency=low + + * new upstream version, closes: #434607, #434606 + * pull fresher chg-multi.sh.in from upstream to fix syntax error + * drop reference to non-existent 'taper' package in control, closes: #444330 + * a number of tweaks to address issues found by lintian + * incorporate Galician translation, closes: #414113 + + -- Bdale Garbee Sun, 07 Oct 2007 18:39:45 -0600 + +amanda (1:2.5.1p3-3) unstable; urgency=low + + * fix amcrypt-ossl and amcryopt-ossl-asym to use the right username for + Debian systems, closes: #417818 + * patch from upstream for problem in get_fs_stats(), closes: #420100 + * patch from upstream for problem in sendsize.c, closes: #420076 + * replace netbase dependency with update-inetd + + -- Bdale Garbee Tue, 15 May 2007 11:44:34 -0600 + +amanda (1:2.5.1p3-2) unstable; urgency=low + + * fold in diff from NMU of 1:2.5.1p1-2.1 by Peter Palfrader, closes: #399790 + Do not fail postrm when removing the backup user from either + group disk or tape does not succeed. Also, try this only + when the backup user is in those groups to begin with. Also + handles the case of deluser not existing anymore. + Based in parts on the patch provided by Andreas Henriksson and + the cupsys postinst script. + * remove useless redundant clause in postrm, closes: #411739 + + -- Bdale Garbee Wed, 21 Feb 2007 04:22:49 +0900 + +amanda (1:2.5.1p3-1) unstable; urgency=low + + * new upstream version, closes: #402221 + * merge updated es.po, closes: #409316 + * merge updated pt.po, closes: #409697 + * fix for segfault in amfetchdump, closes: #411470 + * update inetd and xinetd configs for new security model, closes: #402215 + + -- Bdale Garbee Tue, 20 Feb 2007 13:05:28 +0900 + +amanda (1:2.5.1p1-2) unstable; urgency=medium + + * fix broken way of setting default CLN_AMANDATES in client-src/clientconf.c + so that the file ends up where we expect it, closes: #394796 + * make this medium priority because of the amandates location problem + * updated German translation, closes: #396029 + + -- Bdale Garbee Sun, 29 Oct 2006 11:24:39 -0700 + +amanda (1:2.5.1p1-1) unstable; urgency=low + + * new upstream version, closes: #395319 + + -- Bdale Garbee Thu, 26 Oct 2006 15:29:08 -0600 + +amanda (1:2.5.1-1) unstable; urgency=low + + * new upstream version, closes: #361716 + * incorporate patch from NMU by Martin Krafft based on a suggestion by + Bill Alombert (thanks!), accounting for the fact that we now deliver + content in amanda-common that used to be in amanda-client, closes: #391026 + * updated ja.po from Hideki Yamane, closes: #392153 + * change debconf notification about old/rare conflict with amandadates file + to be of type 'error' instead of 'note', closes: #388707 + * add --with-ssh-security to configure and note issue with suid of dumper + to README.Debian, closes: #365306 + + -- Bdale Garbee Wed, 18 Oct 2006 01:02:23 -0600 + +amanda (1:2.5.0p2-2) unstable; urgency=low + + * merge updated French translation, closes: #369243 + * merge updated Italian translation, closes: #369588 + * merge updated Czech translaterion, closes: #370299 + * merge updated Dutch translaterion, closes: #374850 + * merge updated Swedish translaterion, closes: #375747 + * rework postinst to use adduser instead of usermod to add user backup to + groups disk and tape, and add postrm support for removing user backup from + those groups on purge, closes: #380336 + * patch from upstream 2.5.1b1 via Geert Uytterhoeven to support tar 1.15.91, + closes: #378558 + * accept patch from Raphael Pinson adding xinetd support + * Clean debian/po/templates.pot after build + + -- Bdale Garbee Mon, 28 Aug 2006 09:15:23 -0400 + +amanda (1:2.5.0p2-1) unstable; urgency=low + + * new upstream version + * freshen delivered default amanda.conf, closes: #359036 + + -- Bdale Garbee Thu, 25 May 2006 22:59:16 -0600 + +amanda (1:2.5.0-2) unstable; urgency=low + + * tighten amandahosts permissions to user-only in the amanda-common postinst + + -- Bdale Garbee Mon, 3 Apr 2006 05:03:29 -0700 + +amanda (1:2.5.0-1) unstable; urgency=low + + * new upstream version, closes: #360085 + * add --with-maxtapeblocksize=256 to configure, to better support LTO-3 + tapes like the HP Ultrium 960 + * tweak packaging to handle changes in upstream makefiles, etc + * fix overlong line in amrestore man page synopsys + * move private shlibs to the amanda-common package to simplify deps + + -- Bdale Garbee Mon, 3 Apr 2006 00:28:17 -0700 + +amanda (1:2.4.5p1-2) unstable; urgency=low + + * now that we're using it for debugging info, make sure /var/log/amanda + exists in the amanda-common postinst + + -- Bdale Garbee Thu, 29 Dec 2005 11:57:11 -0700 + +amanda (1:2.4.5p1-1) unstable; urgency=low + + * new upstream version + * add --with-debugging=/var/log/amanda to avoid potentially insecure use + of /tmp, closes: #226139 + * fix typo in chg-null.sh.in causing it to not use AMANDA_DBGDIR definition + * patch chg-null.sh.in to use defined value of tapedev, closes: #219656 + * patch from Jan Nordholz to fix off-by-one error, closes: #339588 + * fix misleading usage example in amtoc man page, closes: #297690 + * add a note to amanda-server's README.Debian about how to keep missing + exclude files from making tar not work, closes: #168229, #185312, #186285 + * fix bogus reported sizes when using dump caused by assuming dump is + reporting 512 byte instead of 1k blocks, closes: #234173 + Debian reports results in 1k, not 512-byte blocks, + * remove globbing example from amanda man page that is hopelessly broken + and generating man errors + + -- Bdale Garbee Thu, 29 Dec 2005 01:36:23 -0700 + +amanda (1:2.4.5-2) unstable; urgency=low + + * merge Arabic translation, closes: #320759 + * merge Vietnamese translation, closes: #307735 + * allow debconf-2.0 as a dependency alternative + * update dependencies in light of libreadline5-dev, closes: #326390 + * don't blindly remove non-conffiles in /etc/amanda, closes: #282772 + * fix strange dump results with smbclient 3.0, closes: #226798, #313553 + * pass --numeric-owner to tar from sendsize to improve estimation speed + on systems using mixed libnss modules, closes: #247661 + * have amanda-common postinst add /usr/sbin to backup user's path, + closes: #74045 + + -- Bdale Garbee Wed, 28 Sep 2005 00:16:44 -0600 + +amanda (1:2.4.5-1) unstable; urgency=low + + * new upstream version, closes: #299586, #308559 + + -- Bdale Garbee Fri, 3 Jun 2005 09:02:42 -0600 + +amanda (1:2.4.4p3-3) unstable; urgency=low + + * use /usr/bin/mail instead of /usr/bin/Mail, closes: #296022 + * incorporate Czech translation from Miroslav Kure, closes: #297596 + + -- Bdale Garbee Sun, 29 May 2005 17:02:16 +0200 + +amanda (1:2.4.4p3-2) unstable; urgency=low + + * add killpgrp to the set of setuid root:backup executables in the + amanda-client package, closes: #266520 + + -- Bdale Garbee Wed, 18 Aug 2004 12:55:21 -0600 + +amanda (1:2.4.4p3-1) unstable; urgency=low + + * new upstream version + * incorporate nl.po from Luk Claes, closes: #240071 + * incorporate it.po from Luca Monducci, closes: #249171 + + -- Bdale Garbee Sat, 24 Jul 2004 00:17:50 -0600 + +amanda (1:2.4.4p2-2) unstable; urgency=high + + * don't assume /var/backups is owned by user backup in the postinst, + closes: #238069, #218135 + * fix README.Debian pathnames in descriptions, closes: #225849, #225856 + * include Japanese debconf translation, closes: #235321 + * include upstream changelog in amanda-common, closes: #227033 + + -- Bdale Garbee Sun, 14 Mar 2004 23:35:13 -0700 + +amanda (1:2.4.4p2-1) unstable; urgency=low + + * new upstream version, closes: #228697 + + -- Bdale Garbee Sun, 15 Feb 2004 19:38:11 -0700 + +amanda (1:2.4.4p1-2) unstable; urgency=low + + * patch to fix problem using samba3, closes: #214845 + * add AUTHORS, NEWS, and README to the set of docs delivered, closes: #81068 + * add a note to the amanda-server README.Debian regarding the interaction + with bastille's 'restrict system resources' option, closes: #118616 + * add a note to the amanda-server README.Debian regarding the concerns + about the reliability of 'dump', closes: #198060 + * though amverify now exits instead of hanging if mt is not present, make + amanda-server suggest cpio|mt-st to get an mt anyway, closes: #155181 + * apply patch for chg-scsi.c from Chirik to make emubarcode option work, + closes: #214519 + * include pt.po from Bruno Rodrigues, closes: #216390 + + -- Bdale Garbee Fri, 24 Oct 2003 01:49:29 -0600 + +amanda (1:2.4.4p1-1) unstable; urgency=low + + * new upstream version, closes: #210324 + * make rundump setuid like runtar, closes: #193982 + * switch to gettext-based debconf templates, closes: #198101 + * stop forcing ownership of ~backup to avoid security issues posed by other + packages writing there as root, closes: #198944 + * limit port ranges to ease use with firewalls, semi-arbitrarily picking + ranges TCP 50000-50100 and UDP 840-860, closes: #65109, #89432, #111882 + * remove ~backup/.amandahosts symlink in postrm on purge, closes: #198949 + + -- Bdale Garbee Sun, 14 Sep 2003 23:21:00 -0600 + +amanda (1:2.4.4-2) unstable; urgency=low + + * mark amanda-server as replacing files in older amanda-common to ease + upgrading, closes: #190185, #191626 + + -- Bdale Garbee Fri, 2 May 2003 10:50:44 -0600 + +amanda (1:2.4.4-1) unstable; urgency=low + + * new upstream version, closes: #169634, #182397, #182882 + * updates the README.Debian files, closes: #189228, #189229 + * change mailx from suggests to depends, closes: #187283 + * correct instructions in amanda-client's README.Debian, closes: #180179 + * patch from Brad Roberts, also submitted upstream, that fixes problems + with amflush sometimes ending up in an infinite loop inside the libc + memory allocation code, closes: #169537 + * merge Danish templates translation, closes: #174740 + * update chg-zd-mtx to include definition of cleancycle, the code using it + is already fixed in 2.4.3, closes: #169634 + * remove explicit suggests on awk, since some flavor of awk is essential + * add lintian overrides files to squelch noise about conscious decisions + + -- Bdale Garbee Sun, 20 Apr 2003 01:14:33 -0600 + +amanda (1:2.4.3-1) unstable; urgency=low + + * new upstream version, closes: #127801, #163844, #167021, #165522, #127801 + * this version does not hard-code the sed path, closes: #161850, #151962 + * have clean target in rules file update config.sub/guess + * clean up postinst files to only call ldconfig when configuring + * move to newer debhelper compatibility mode + * fix typo in postinst creation of group tape, closes: #165640 + * enable support for XFS filesystems by adding xfsdump to the list of + required build dependencies, closes: #143913, #110731 + + -- Bdale Garbee Wed, 6 Nov 2002 02:39:58 -0700 + +amanda (1:2.4.2p2-4) unstable; urgency=low + + * add mtx to the list of build dependencies so support for it gets included + * merge chg-zd-mtx.sh.in from 2.5.0 CVS, since it actually works with our + current mtx, closes: #136571 + * merge french templates translation, closes: #138521 + * merge russian templates translation, closes: #137616 + * switch to unmerged templates files in the source package + + -- Bdale Garbee Tue, 2 Apr 2002 00:43:13 -0700 + +amanda (1:2.4.2p2-3) unstable; urgency=medium + + * solve problem reported as bug 112691 a different way, to back out the + change made for -2 that had disasterous side-effects... instead of messing + with configure options, just eliminate chg-mtx since it's not useful and + the mtx package provides mtx-changer which works. + Closes: #119495, #119546, #119352, #119361, #119549, #119665 + * add lpr to build dependencies, closes: #119399, #108607 + * change the fix for duplicate dependencies on amanda-common so that it's + the versioned flavor we preserve, so all the pieces stay in sync + + -- Bdale Garbee Wed, 14 Nov 2001 21:41:11 -0700 + +amanda (1:2.4.2p2-2) unstable; urgency=medium + + * add configure option to keep chg-mtx, et al, from writing to files in + in /tmp insecurely, closes: #112691 + * merge in -pt_BR template translation, closes: #106129 + * fix duplicate dependencies on amanda-common, closes: #118639, #118642 + + -- Bdale Garbee Fri, 9 Nov 2001 10:30:27 -0700 + +amanda (1:2.4.2p2-1) unstable; urgency=low + + * new upstream version, closes: #93449 + * freshen config.sub/guess again + * fix problem with tapetype install using wrong libtool, closes: #104772 + * various minor cleanups in the rules file to reduce warnings + + -- Bdale Garbee Thu, 19 Jul 2001 23:26:33 -0600 + +amanda (1:2.4.2-6) unstable; urgency=low + + * freshen config.sub/guess for ia64 and hppa, closes: #90182 + * amanda tests for -E or -S for estimates from dump during configure, and + is selecting -S now with the dump in sid. The latest amanda and latest + dump therefore should work fine together, closes: #91859 + * update build-depends from perl5 to perl + + -- Bdale Garbee Wed, 4 Apr 2001 15:43:52 -0600 + +amanda (1:2.4.2-5) unstable; urgency=low + + * add an explicit dependency in the rules file on /usr/bin/smbclient, since + the Build-Depends: line in the control file isn't checked automatically, + and the configure will happily build amanda without smbclient support if + it isn't installed... which is *not* what we want! closes: #85965 + + -- Bdale Garbee Wed, 14 Feb 2001 11:33:06 -0700 + +amanda (1:2.4.2-4) unstable; urgency=low + + * lose the ftape-util build dependency, nobody wanted it and it's causing + various problems. closes: #85516, #85708 + + -- Bdale Garbee Mon, 12 Feb 2001 21:54:31 -0700 + +amanda (1:2.4.2-3) unstable; urgency=low + + * lose the dh_suidregister calls, since it's obsolete, closes: #85334 + * add build-depend on ftape-util so that configure will find and know how to + use that technology, even though nobody has ever actually asked me about + it who wanted to use it... closes: #83287 + * fold in contributed template translations, closes: #83479, #84839, #84867 + * if ~backup/.amandahosts isn't a link, use 'su -c backup' when creating it + to be compatible with NFS-mounted home directories. It would be cleaner, + of course, to train Amanda to use the real file which I now place in /etc + directly, but that can wait for another day. closes: #83554 + + -- Bdale Garbee Fri, 9 Feb 2001 11:42:31 -0700 + +amanda (1:2.4.2-2) unstable; urgency=low + + * make sure /etc/amandahosts has correct owner/group/perms in postinst, + closes: #80941 + * update dependency information since some files moved from amanda-common + to amanda-client, so that upgrades go smoothly. also, make the client + and server packages have a versioned depend on the common package to avoid + potential problems. + * problem with visible control chars in amverify confirmed to have been + fixed upstream in the 2.4.2 version, closes: #65537 + + -- Bdale Garbee Sun, 31 Dec 2000 21:49:16 -0700 + +amanda (1:2.4.2-1) unstable; urgency=low + + * new upstream version, closes: #76632, #78040, #79500 + * fold in debconf support patch from shaleh + * make sure all build dependencies are present, closes: #67008 + * move canonical location of amandahosts file to /etc, moving existing file + there if necessary, and using a symlink in ~backup. This allows treatment + as a conffile. Closes: #52357 + * upstream implemented a general Y2K amoverview fix, closes: #64780 + * chg-scsi is delivered in amanda-server 2.4.2, closes: #41420 + + -- Bdale Garbee Tue, 26 Dec 2000 23:25:22 -0700 + +amanda (1:2.4.1p1-12) frozen unstable; urgency=low + + * revert amplot/Makefile.in to upstream version to dodge issues created + by newer automake version. Note that items in the build depends + list in the control file *must* be available or the package build will + fail, as some executables won't be generated if configure doesn't find + everything it wants! Closes: #64864, marked as grave for potato. + + -- Bdale Garbee Sun, 11 Jun 2000 09:53:35 -0600 + +amanda (1:2.4.1p1-11) frozen unstable; urgency=low + + * target frozen because I think the spurious failure messages and duplicated + dependencies are worth fixing for potato even though both were filed as + "normal" bugs + * add extra cases to amanda-client's filtering of tar output to eliminate + user concern and confusion from spurious "FAILED DUMP" messages, + closes: #60126 + * be more careful about which -dev packages are on build machine so that + we only depend on one version of libreadline, closes: #57940 + + -- Bdale Garbee Sun, 12 Mar 2000 22:31:39 -0700 + +amanda (1:2.4.1p1-10) unstable; urgency=low + + * fix postinst bug in amanda-server that breaks inetd.conf that was + introduced during cut'n'paste for -8, closes: #52332 + * the amanda-server package depends on mailx because the upstream source + looks for mailx at configure time, embeds the path, and uses it to send + mail. The dependency on mailx is not arbitrary. Closes: #44034 + * add mailx to the Build-Depends so configure can find it + * update path reference to GPL in copyright file for FHS + + -- Bdale Garbee Fri, 7 Jan 2000 01:39:14 -0700 + +amanda (1:2.4.1p1-9) unstable; urgency=low + + * missed a few things in Build-Depends, fill them in + + -- Bdale Garbee Sun, 5 Dec 1999 15:15:33 -0700 + +amanda (1:2.4.1p1-8) unstable; urgency=low + + * supply the real tapetype, not just libtool wrapper. closes: #50585, #50280 + * update control to include Build-Depends:, remove README.source-depends + * move the inetd entry handling from amanda-common postinst/prerm to the + amanda-server package, since they're only relevant there, closes: #49578 + + -- Bdale Garbee Sat, 27 Nov 1999 17:39:13 -0700 + +amanda (1:2.4.1p1-7) unstable; urgency=low + + * recompile to include smbclient support + + -- Bdale Garbee Sun, 7 Nov 1999 14:13:24 -0700 + +amanda (1:2.4.1p1-6) unstable; urgency=low + + * apply patches from Amanda patch page for glibc21, glibc22, and samba2. + Closes: #42771, #44672 + * real fix for self-referential dependencies, closes: #46362 + * the amrecover behavior reported was a 2.4.0 issue, closes: #27709 + * "fix" bash-ism in the rules file, closes: #45236 + * provide tapetype in amanda-server, closes: #42825 + * FHS compliance, lintian clean + * thanks to Ben Kochie for reviewing open bugs for this update + + -- Bdale Garbee Fri, 5 Nov 1999 20:22:00 -0700 + +amanda (1:2.4.1p1-5) unstable; urgency=low + + * update perl dependency to perl5 as per new perl policy + + -- Bdale Garbee Sun, 11 Jul 1999 11:37:32 -0600 + +amanda (1:2.4.1p1-4) unstable; urgency=low + + * fix dependencies for amanda-common in control, closes 38464 + + -- Bdale Garbee Sun, 30 May 1999 23:37:55 -0600 + +amanda (1:2.4.1p1-3) unstable; urgency=low + + * depend on mailx, closes 34894 + * lose the -DENABLE_GNUTAR_ATIME_PRESERVE, since it eliminates the ability + to use tar for incremental backups, closes 36639 + + -- Bdale Garbee Mon, 24 May 1999 23:57:25 -0600 + +amanda (1:2.4.1p1-2) unstable; urgency=low + + * replace /var/state usage with /var/lib/amanda, since user backup can't + write to /var/state + * stop calling automake/autoconf explicitly in the rules file, since it + appears that automake 1.4 breaks amanda, while 1.3 was ok. It should be + ok to just use the provided configure, closes 32143 + + -- Bdale Garbee Tue, 19 Jan 1999 21:21:18 -0700 + +amanda (1:2.4.1p1-1) unstable; urgency=low + + * new upstream version, closes 24855, 22270 + * enable IGNORE_TAR_ERRORS and ENABLE_GNUTAR_ATIME_PRESERVE, closes 28486 + * have the amanda-common postinst create /var/lib/amanda before it tries to + put a file there, closes 22345, 30326, 25106 + * fix a few last references to /usr/adm, closes 25574 + * update the docs for amanda-server to include a note about using ftape + from Jean Pierre LeJacq, closes 22271 + * make the 'build-stamp' chunk of the rules file depend on /sbin/dump, since + amanda won't know about dump unless it can find it during the configure. + Another reason we need build-time dependencies, I guess. Closes 24369. + * fix chg-mtx.sh.in to reflect Debian mtx syntax, closes 26208 + * add tapetype QIC-3080, closes 26569 + * eliminate dh_du from the rules file + * various tweaks to resolve lintian complaints + + -- Bdale Garbee Mon, 18 Jan 1999 22:58:34 -0700 + +amanda (1:2.4.0-4) unstable; urgency=low + + * add suggests dump to amanda-client, closes 24962 + + -- Bdale Garbee Mon, 3 Aug 1998 22:32:29 -0600 + +amanda (1:2.4.0-3) frozen unstable; urgency=low + + * be consistent about pointing to /var/lib/amanda/amandates, closes 21811. + * be consistent about supporting suidregister. + * make sure user backup's home directory exists before using it in the + amanda-common postinst, closes 21897. + + -- Bdale Garbee Sun, 3 May 1998 20:48:38 -0600 + +amanda (1:2.4.0-2) frozen unstable; urgency=low + + * update amanda-common postinst to do a better job of making sure the + user 'backup' exists, and has the right group privs. Closes 18242, + 20675, and 20945 + * update amanda-client README file to reflect automatic handling of user + backup, and to add information for users setting up to do indexing, + closes 21313 + * improve documentation of server config issues in amanda-server README, + closes 21366 + * update default amanda.conf to fix compression flags on comp-user-tar and + comp-root-tar, closes 21198 + * fix typos in amanda-server's README file, closes 21118 + + -- Bdale Garbee Mon, 20 Apr 1998 02:14:50 -0600 + +amanda (1:2.4.0-1) frozen unstable; urgency=high + + * new upstream release, 2.4.0 is no longer beta... + * use an explicit epoch in the version since 2.4.0 < 2.4.0b6 ... sigh + * add --with-smbclient to configure run, and include more docs in + amanda-common, closes 18366 + * clean up dependencies, closes 18746 + * patch dh_movefiles from debhelper to move real files before symlinks when + processing wildcards, closes 19267... debhelper bug 18220 addresses this + issue. + * make better use of wildcards in debhelper control files, closes 18350 + * fix spelling errors in control file, closes 18959 + * have amanda-server suggest mailx, since amcheck optionally uses + /usr/bin/Mail to notify the operator of needed tapes, closes 18334 + * improve the postinst slightly... the home directory for user backup needs + to be fixed in /etc/passwd before I can do the right things to close + 18242 completely. Bug filed against base-passwd, severity important. + * various small cleanups suggested to me via email without bugs filed + + -- Bdale Garbee Mon, 30 Mar 1998 18:29:55 -0700 + +amanda (2.4.0b6-12) unstable; urgency=low + + * apply upstream patches to bring us to 2.4.0-980319 + * fold in some of Heiko's improvements from his bo-unstable version + + -- Bdale Garbee Tue, 24 Mar 1998 23:52:55 -0700 + +amanda (2.4.0b6-11) unstable; urgency=low + + * apply upstream patches to bring us to 2.4.0b6p4 + * use appropriate wildcards in amanda-*.files control files. Closes 18196. + * include 'adduser' alternative in amanda-client's README, closes 18174. + + -- Bdale Garbee Sun, 15 Feb 1998 12:54:46 -0700 + +amanda (2.4.0b6-10) unstable; urgency=low + + * apply upstream patches to bring us to 2.4.0b6p3 + + -- Bdale Garbee Sun, 8 Feb 1998 17:53:47 -0700 + +amanda (2.4.0b6-9) unstable; urgency=low + + * clean up dependencies, closes 17838 + * apply upstream patches to bring us to 2.4.0b6p2 + * switch to automake 1.2d from experimental on build machine, reduces + the amount of hackery required, and therefore the size of the diffs. + + -- Bdale Garbee Thu, 5 Feb 1998 22:40:58 -0700 + +amanda (2.4.0b6-8) unstable; urgency=low + + * apply upstream patch to handle occasional divide by zero in amplot + * refine split of files between binary packages + + -- Bdale Garbee Wed, 28 Jan 1998 14:33:30 -0700 + +amanda (2.4.0b6-7) unstable; urgency=low + + * patch for amrmtape from Heiko, will be in a future upstream release + * add suidmanager support to control files + + -- Bdale Garbee Wed, 28 Jan 1998 14:33:30 -0700 + +amanda (2.4.0b6-6) unstable; urgency=low + + * clean up permissions... with --with-bsd-security enabled, some pieces must + be setuid in the server package + * fix client prerm so that it only removes the inetd.conf entry it owns. + + -- Bdale Garbee Tue, 27 Jan 1998 14:44:30 -0700 + +amanda (2.4.0b6-5) unstable; urgency=low + + * enable use of .amandahosts instead of .rhosts for access control. + * change /etc/amandates location to /var/lib/amandates for FSSTND compliance. + * ensure /var/lib/amandates exists with correct perms in postinst. + * make the /var/lib/amanda-gnutar-lists directory have appropriate perms. + * update README files to reflect contemporary reality + + -- Bdale Garbee Tue, 27 Jan 1998 10:04:58 -0700 + +amanda (2.4.0b6-4) unstable; urgency=low + + * oops... --with-bsd-security got dropped from the configure at some point, + add it back in. Thanks to Heiko again for pointing this out. + + -- Bdale Garbee Mon, 26 Jan 1998 10:40:39 -0700 + +amanda (2.4.0b6-3) unstable; urgency=low + + * make amanda-common depend on tar >= 1.12. Thanks to Heiko Schlittermann + for pointing this out. + + -- Bdale Garbee Mon, 26 Jan 1998 10:40:39 -0700 + +amanda (2.4.0b6-2) unstable; urgency=low + + * amanda-common was suggesting amanda or amanda-client, updated to reflect + replacement of 'amanda' with 'amanda-server'. + + -- Bdale Garbee Mon, 26 Jan 1998 10:40:39 -0700 + +amanda (2.4.0b6-1) unstable; urgency=low + + * new maintainer + * new upstream release, reworked package for libc6, using debhelper + * incorporate amanda-common split suggested by Tom Lear's 2.4.0b4 package. + this replaces 'amanda' with 'amanda-server', and breaks out an + 'amanda-common' package to hold the libs and man pages that were formerly + conflicting between amanda and amanda-client. Closes bugs 11046, 11943. + + -- Bdale Garbee Mon, 26 Jan 1998 09:15:05 -0700 + +amanda (2.3.0.4-2.1) unstable; urgency=low + + * non-maintainer release (never actually uploaded) + * libc6 + * make amanda and amanda-client depend on netbase (>=3.03) for /etc/services + entries. Remove /etc/services mashing from postinst. Closes bugs 12847, + 12848, 13795. + * make amanda depend on amanda-client. This is the easiest way to resolve + the overlapping files problem. It makes the assumption that if you're + running an amanda server, you'll want the client stuff anyway so you can + back up the server. Since the client package is small, this seems like a + better resolution than splitting out a third "common" package. Closes + bugs 11046, 11943. + * update all references to /etc/amandates and /etc/dumpdates to use + /var/lib/*dates, ala current Debian dump package. Closes bug 15586. + * pre-apply all the patches from the upstream archive, to simplify the + build process. Patches applied include: arithexc.diff,exclude2.diff, + flushidx.diff,srvcomp.diff,tardates.diff,exclude.diff,exclude3.diff, + longopt.diff, and srvcomp2.diff. Closes bug 13151, 13796. + * convert rules file to use debhelper. + + -- Bdale Garbee Sat, 10 Jan 1998 02:08:02 -0700 + +amanda (2.3.0.4-2) unstable; urgency=low + + * fixed dependencies for amanda-client + + -- Christian Meder Wed, 18 Jun 1997 14:49:49 -0400 + +amanda (2.3.0.4-1) unstable; urgency=low + + * Initial Release. + * Split in client and server package + * wrote small READMEs to ease a quick start + * applied several patches from + http://www.cs.umd.edu/projects/amanda/patches.html to fix various + new features + + -- Christian Meder Wed, 14 May 1997 13:08:34 -0500 + +Local variables: +mode: debian-changelog +End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/config b/debian/config new file mode 100644 index 0000000..5b622bb --- /dev/null +++ b/debian/config @@ -0,0 +1,12 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +# if both files exist, suggest they merge them +# if only one exists, the postinst moves it +if [ -f /var/lib/amandates ]; then + if [ -f /var/lib/amanda/amandates ]; then + db_input medium amanda-common/merge_amandates || true + db_go + fi +fi diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..50ad55f --- /dev/null +++ b/debian/control @@ -0,0 +1,115 @@ +Source: amanda +Section: utils +Priority: optional +Maintainer: Bdale Garbee +Vcs-Git: git://git.gag.com/debian/amanda +Vcs-Browser: http://git.gag.com/?p=debian/amanda +Build-Depends: debhelper (>= 5), dump, gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump, po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev +Standards-Version: 3.9.2 + +Package: amanda-common +Architecture: any +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, update-inetd, tar (>=1.12), perl5, bsd-mailx | mailx, debconf | debconf-2.0, adduser, openbsd-inetd | inet-superserver +Suggests: amanda-server (= ${binary:Version}) | amanda-client (= ${binary:Version}) +Conflicts: amanda +Replaces: amanda, amanda-client +Description: Advanced Maryland Automatic Network Disk Archiver (Libs) + This package contains libraries required by the amanda client and + server packages. + +Package: amanda-server +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version}), bsd-mailx | mailx +Suggests: perl5, gnuplot, amanda-client (= ${binary:Version}), cpio | mt-st +Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3) +Replaces: amanda-common (<< 1:2.5.2p1-3) +Description: Advanced Maryland Automatic Network Disk Archiver (Server) + Amanda is a backup system designed to archive many computers on a + network to a single large-capacity tape drive. This package is + suitable for large amounts of data to backup. For smaller solutions + take a look at afbackup, tob, ... + . + Features: + * will back up multiple machines in parallel to a holding disk, blasting + finished dumps one by one to tape as fast as we can write files to + tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host + with a large holding disk can be filled by Amanda in under 4 hours. + * built on top of standard backup software: Unix dump/restore, and + later GNU Tar and others. + * does simple tape management: will not overwrite the wrong tape. + * supports tape changers via a generic interface. Easily customizable + to any type of tape carousel, robot, or stacker that can be controlled + via the unix command line. + * for a restore, tells you what tapes you need, and finds the proper + backup image on the tape for you. + * recovers gracefully from errors, including down or hung machines. + * reports results, including all errors in detail, in email to operators. + * will dynamically adjust backup schedule to keep within constraints: + no more juggling by hand when adding disks and computers to network. + * includes a pre-run checker program, that conducts sanity checks on both + the tape server host and all the client hosts (in parallel), and will + send an e-mail report of any problems that could cause the backups to + fail. + * can compress dumps before sending or after sending over the net, with + either compress or gzip. + * can optionally synchronize with external backups, for those large + timesharing computers where you want to do full dumps when the system + is down in single-user mode (since BSD dump is not reliable on active + filesystems): Amanda will still do your daily dumps. + * lots of other options; Amanda is very configurable. + . + For important notes, see /usr/share/doc/amanda-server/README.Debian. + . + Explanation of suggested programs: + - perl is needed for some non essential server utilities + - gnuplot is needed for plotting statistics of backups + - to backup the tape server, you need to install the client too + +Package: amanda-client +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version}) +Suggests: gnuplot, dump, smbclient +Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3) +Replaces: amanda-common (<< 1:2.5.2p1-3) +Description: Advanced Maryland Automatic Network Disk Archiver (Client) + Amanda is a backup system designed to archive many computers on a + network to a single large-capacity tape drive. This package is + suitable for large amounts of data to backup. For smaller solutions + take a look at afbackup, tob, ... + . + Features: + * will back up multiple machines in parallel to a holding disk, blasting + finished dumps one by one to tape as fast as we can write files to + tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host + with a large holding disk can be filled by Amanda in under 4 hours. + * built on top of standard backup software: Unix dump/restore, and + later GNU Tar and others. + * does simple tape management: will not overwrite the wrong tape. + * supports tape changers via a generic interface. Easily customizable + to any type of tape carousel, robot, or stacker that can be controlled + via the unix command line. + * for a restore, tells you what tapes you need, and finds the proper + backup image on the tape for you. + * recovers gracefully from errors, including down or hung machines. + * reports results, including all errors in detail, in email to operators. + * will dynamically adjust backup schedule to keep within constraints: + no more juggling by hand when adding disks and computers to network. + * includes a pre-run checker program, that conducts sanity checks on both + the tape server host and all the client hosts (in parallel), and will + send an e-mail report of any problems that could cause the backups to + fail. + * can compress dumps before sending or after sending over the net, with + either compress or gzip. + * can optionally synchronize with external backups, for those large + timesharing computers where you want to do full dumps when the system + is down in single-user mode (since BSD dump is not reliable on active + filesystems): Amanda will still do your daily dumps. + * lots of other options; Amanda is very configurable. + . + THIS PACKAGE RELIES ON A RUNNING AMANDA SERVER IN YOUR NETWORK. + . + For important notes, see /usr/share/doc/amanda-client/README.Debian. + . + Explanation of suggested programs: + - gnuplot is needed for plotting statistics of backups + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c79243b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,41 @@ +This package was built by Bdale Garbee using sources downloaded +from + + ftp://ftp.amanda.org/pub/amanda/ + +The Amanda copyright: + +/* + * Amanda, The Advanced Maryland Automatic Network Disk Archiver + * Copyright (c) 1991-1998 University of Maryland at College Park + * All Rights Reserved. + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of U.M. not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. U.M. makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * U.M. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL U.M. + * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Authors: the Amanda Development Team. Its members are listed in a + * file named AUTHORS, in the root directory of this distribution. + */ + +/* +** This Version of Amanda contains parts of GNU programs +** (alloca.c, exclude_file.c) +*/ + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + diff --git a/debian/crontab.amanda b/debian/crontab.amanda new file mode 100644 index 0000000..62253c7 --- /dev/null +++ b/debian/crontab.amanda @@ -0,0 +1,7 @@ +# This is an example for a crontab entry for automated backup with amanda +# With these cron lines, Amanda will check that the correct tape is in +# the drive every weekday afternoon at 4pm (if it isn't, all the +# operators will get mail). At 12:45am that night the dumps will be run. +0 16 * * 1-5 /usr/sbin/amcheck -m DailySet1 +45 0 * * 2-6 /usr/sbin/amdump DailySet1 + diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..6f83607 --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/debian/patches/dumpdates-path b/debian/patches/dumpdates-path new file mode 100644 index 0000000..acf7e11 --- /dev/null +++ b/debian/patches/dumpdates-path @@ -0,0 +1,191 @@ +Description: make dumpdates path in docs match Debian configuration +Author: Bdale Garbee + +--- amanda-3.3.0.orig/man/disklist.5 ++++ amanda-3.3.0/man/disklist.5 +@@ -89,7 +89,7 @@ defined in the + \fBamanda\&.conf\fR + file\&. + \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in +-/etc/dumpdates, the disk\*(Aqs relative priority, etc\&. ++/var/lib/dumpdates, the disk\*(Aqs relative priority, etc\&. + .RE + .PP + \fIspindle\fR +--- amanda-3.3.0.orig/man/amanda.conf.5 ++++ amanda-3.3.0/man/amanda.conf.5 +@@ -1672,8 +1672,8 @@ keyword append the values to the list of + \fBrecord\fR \fIboolean\fR + .RS 4 + Default: +-\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&. +-/etc/dumpdates ++\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&. ++/var/lib/dumpdates + for DUMP or + /usr/local/var/amanda/gnutar\-lists + for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&. +--- amanda-3.3.0.orig/man/entities/global.entities.in ++++ amanda-3.3.0/man/entities/global.entities.in +@@ -98,7 +98,7 @@ + '> + + +-/etc/dumpdates'> ++/var/lib/dumpdates'> + + + amadmin'> +--- amanda-3.3.0.orig/man/xml-source/disklist.5.xml ++++ amanda-3.3.0/man/xml-source/disklist.5.xml +@@ -112,7 +112,7 @@ file. + specify backup related parameters, + such as whether to compress the backups, + whether to record backup results in +-/etc/dumpdates, the disk's relative priority, etc. ++/var/lib/dumpdates, the disk's relative priority, etc. + + + +--- amanda-3.3.0.orig/man/xml-source/amanda.conf.5.xml ++++ amanda-3.3.0/man/xml-source/amanda.conf.5.xml +@@ -2155,8 +2155,8 @@ the property to set, and the others cont + record boolean + + Default: +-yes. +-Whether to ask the backup program to update its database (e.g. /etc/dumpdates ++yes. ++Whether to ask the backup program to update its database (e.g. /var/lib/dumpdates + for DUMP or /usr/local/var/amanda/gnutar-lists for GNUTAR) of time stamps. + This is normally enabled for daily backups and turned off for periodic archival runs. + +--- amanda-3.3.0.orig/client-src/amandates.c ++++ amanda-3.3.0/client-src/amandates.c +@@ -26,7 +26,7 @@ + /* + * $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $ + * +- * manage amandates file, that mimics /etc/dumpdates, but stores ++ * manage amandates file, that mimics /var/lib/dumpdates, but stores + * GNUTAR dates + */ + +@@ -314,7 +314,7 @@ import_dumpdates( + + devname = amname_to_devname(amdp->name); + +- if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) { ++ if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) { + amfree(devname); + return; + } +--- amanda-3.3.0.orig/client-src/selfcheck.c ++++ amanda-3.3.0/client-src/selfcheck.c +@@ -1128,8 +1128,8 @@ check_overall(void) + check_file(COMPRESS_PATH, X_OK); + + if (need_dump || need_xfsdump ) { +- if (check_file_exist("/etc/dumpdates")) { +- check_file("/etc/dumpdates", ++ if (check_file_exist("/var/lib/dumpdates")) { ++ check_file("/var/lib/dumpdates", + #ifdef USE_RUNDUMP + F_OK + #else +@@ -1139,15 +1139,15 @@ check_overall(void) + } else { + #ifndef USE_RUNDUMP + if (access("/etc", R_OK|W_OK) == -1) { +- g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno)); ++ g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno)); + } + #endif + } + } + + if (need_vdump) { +- if (check_file_exist("/etc/vdumpdates")) { +- check_file("/etc/vdumpdates", F_OK); ++ if (check_file_exist("/var/lib/vdumpdates")) { ++ check_file("/var/lib/vdumpdates", F_OK); + } + } + +@@ -1159,6 +1159,7 @@ check_overall(void) + check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */ + #endif + ++ check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */ + check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */ + } + } +--- amanda-3.3.0.orig/server-src/diskfile.h ++++ amanda-3.3.0/server-src/diskfile.h +@@ -110,7 +110,7 @@ typedef struct disk_s { + char *clnt_decrypt_opt; /* client-side decryption option parameter to use */ + double comprate[2]; /* default compression rates */ + /* flag options */ +- int record; /* record dump in /etc/dumpdates ? */ ++ int record; /* record dump in /var/lib/dumpdates ? */ + int skip_incr; /* incs done externally ? */ + int skip_full; /* fulls done externally ? */ + int to_holdingdisk; /* use holding disk ? */ +--- amanda-3.3.0.orig/example/amanda.conf.in ++++ amanda-3.3.0/example/amanda.conf.in +@@ -460,7 +460,7 @@ define tapetype SEAGATE-ULTRIUM-LTO { + # program - specify the dump system to use. Valid values are "DUMP", + # or "GNUTAR". Default: [program "DUMP"]. + # record - record the backup in the time-stamp-database of the backup +-# program (e.g. /etc/dumpdates for DUMP or ++# program (e.g. /var/lib/dumpdates for DUMP or + # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.). + # Default: [record yes] + # skip-full - skip the disk when a level 0 is due, to allow full backups +@@ -621,7 +621,7 @@ define dumptype nocomp-high { + + define dumptype nocomp-test { + global +- comment "test dump without compression, no /etc/dumpdates recording" ++ comment "test dump without compression, no /var/lib/dumpdates recording" + compress none + record no + priority medium +@@ -629,7 +629,7 @@ define dumptype nocomp-test { + + define dumptype comp-test { + nocomp-test +- comment "test dump with compression, no /etc/dumpdates recording" ++ comment "test dump with compression, no /var/lib/dumpdates recording" + compress client fast + } + +--- amanda-3.3.0.orig/example/template.d/dumptypes ++++ amanda-3.3.0/example/template.d/dumptypes +@@ -106,7 +106,7 @@ + # program - specify the dump system to use. Valid values are "DUMP" + # "STAR" and "GNUTAR". Default: [program "DUMP"]. + # record - record the backup in the time-stamp-database of the backup +-# program (e.g. /etc/dumpdates for DUMP or ++# program (e.g. /var/lib/dumpdates for DUMP or + # /var/lib/amanda/gnutar-lists for GNUTAR.). + # Default: [record yes] + # skip-full - skip the disk when a level 0 is due, to allow full backups +@@ -302,7 +302,7 @@ define dumptype nocomp-high { + + define dumptype nocomp-test { + global +- comment "test dump without compression, no /etc/dumpdates recording" ++ comment "test dump without compression, no /var/lib/dumpdates recording" + compress none + record no + priority medium +@@ -310,7 +310,7 @@ define dumptype nocomp-test { + + define dumptype comp-test { + nocomp-test +- comment "test dump with compression, no /etc/dumpdates recording" ++ comment "test dump with compression, no /var/lib/dumpdates recording" + compress client fast + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4bd2880 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +dumpdates-path diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..cef83a3 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/debian/po/ar.po b/debian/po/ar.po new file mode 100644 index 0000000..1fa8267 --- /dev/null +++ b/debian/po/ar.po @@ -0,0 +1,47 @@ +# translation of ar.po to +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Ossama M. Khayat, 2005. +# Ossama M. Khayat , 2010. +msgid "" +msgstr "" +"Project-Id-Version: amanda_1:2.4.5-1\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2010-09-09 04:51+0300\n" +"Last-Translator: Ossama M. Khayat \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "الرجاء دمج /var/lib/amandates و /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"لديك كلاً من /var/lib/amandates و /var/lib/amanda/amandates. الرجاء معاينة " +"الملفات، ودمج المحتويات التي تهمك حول موقع /var/lib/amanda/amandates، وإزالة " +"الملف /var/lib/amandates القديم." + diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..d8b6636 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,42 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-06-04 17:06+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Spojte prosím /var/lib/amandates a /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"V systému máte soubor /var/lib/amandates i /var/lib/amanda/amandates. Oba " +"soubory prohlédněte, zajímavý obsah slučte do /var/lib/amanda/amandates a " +"starý soubor /var/lib/amandates smažte." diff --git a/debian/po/da.po b/debian/po/da.po new file mode 100644 index 0000000..4364cc4 --- /dev/null +++ b/debian/po/da.po @@ -0,0 +1,34 @@ +# Danish translation for amanda. +# Copyright (C) 2010 amanda og nedenstÃ¥ende oversættere. +# This file is distributed under the same license as the amanda package. +# Joe Hansen (joedalton2@yahoo.dk), 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2010-12-30 19:25+0200\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Venligst flet /var/lib/amandates og /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Du har bÃ¥de /var/lib/amandates og /var/lib/amanda/amandates. Du rÃ¥des til at " +"gennemse filerne, og flette indholdet der interesserer dig til den nye " +"lokation /var/lib/amanda/amandates og fjern den gamle fil /var/lib/amandates." diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 0000000..8453b9d --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,43 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-10-29 15:05+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Bitte vereinigen Sie /var/lib/amandates und /var/lib/amanda/amandates." + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Es existieren die beiden Verzeichnisse /var/lib/amandates und /var/lib/" +"amanda/amandates. Bitte überprüfen Sie die Dateien und verschieben Sie den " +"Inhalt, der Ihnen wichtig ist, nach /var/lib/amanda/amandates und löschen " +"Sie die alte Datei /var/lib/amandates." diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..1fa2fea --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,60 @@ +# amanda translation to spanish +# Copyright (C) 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the package. +# +# Changes: +# - Initial translation +# Manuel Porras Peralta , 2007 +# +# +# Traductores, si no conoce el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Si tiene dudas o consultas sobre esta traducción consulte con el último +# traductor (campo Last-Translator) y ponga en copia a la lista de +# traducción de Debian al español () +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2007-01-29 14:29+0100\n" +"Last-Translator: Manuel Porras Peralta «Venturi» \n" +"Language-Team: Debian Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Por favor, combine «/var/lib/amandates» y «/var/lib/amanda/amandates»" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Se han detectado los archivos «/var/lib/amandates» y «/var/lib/amanda/" +"amandates». Por favor, revíselos, combine los contenidos que necesite en el " +"archivo «/var/lib/amanda/amandates», y borre el archivo antiguo «/var/lib/" +"amandates»." diff --git a/debian/po/fi.po b/debian/po/fi.po new file mode 100644 index 0000000..3219c79 --- /dev/null +++ b/debian/po/fi.po @@ -0,0 +1,37 @@ +# Copyright (C) 2009 +# This file is distributed under the same license as the amanda package. +# +# Esko Arajärvi , 2009. +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2009-06-30 22:11+0300\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Yhdistä /var/lib/amandates ja /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Järjestelmässä on sekä tiedosto /var/lib/amandates että tiedosto " +"/var/lib/amanda/amandates. Tarkasta molemmat tiedostot ja yhdistä " +"tarvittava sisältö tiedostoon /var/lib/amanda/amandates. Poista tämän " +"jälkeen vanha tiedosto /var/lib/amandates." + diff --git a/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 0000000..93ee324 --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,49 @@ +# translation of fr.po to French +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Original french translation by an unknown contributor +# +# Christian Perrier , 2006. +msgid "" +msgstr "" +"Project-Id-Version: fr\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-05-28 17:13+0200\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "" +"Fusion indispensable de /var/lib/amandates et /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Les deux fichiers /var/lib/amandates et /var/lib/amanda/amandates existent. " +"Veuillez les examiner et fusionner les données importantes dans le fichier /" +"var/lib/amanda/amandates ; supprimez ensuite l'ancien fichier /var/lib/" +"amandates. " diff --git a/debian/po/fr.po.poedit b/debian/po/fr.po.poedit new file mode 100644 index 0000000..985e9ed --- /dev/null +++ b/debian/po/fr.po.poedit @@ -0,0 +1,7 @@ +#. This catalog was generated by poedit +#. Number of items: 2 +#. Language: French +#. Country: +#. Basepath: +#. Paths: 0 +#. Keywords: 0 diff --git a/debian/po/gl.po b/debian/po/gl.po new file mode 100644 index 0000000..c6d3a51 --- /dev/null +++ b/debian/po/gl.po @@ -0,0 +1,34 @@ +# Galician translation of amanda's debconf templates +# This file is distributed under the same license as the amanda package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2007-03-09 09:24+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Combine /var/lib/amandates e /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"No seu sistema existen os dous ficheiros, /var/lib/amandates e /var/lib/" +"amanda/amandates. Revise os ficheiros e combine o contido interesante no " +"ficheiro /var/lib/amanda/amandates e elimine o ficheiro antigo, /var/lib/" +"amandates." diff --git a/debian/po/it.po b/debian/po/it.po new file mode 100644 index 0000000..b4042fc --- /dev/null +++ b/debian/po/it.po @@ -0,0 +1,34 @@ +# Italian (it) translation of debconf templates for amanda +# Copyright (C) 2004 Software in the Public Interest +# This file is distributed under the same license as the amanda package. +# Luca Monducci , 2004-2006. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda 1:2.5.0p2 italian debconf templates\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-05-30 10:30+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Unire /var/lib/amandates e /var/lib/amanda/amndates." + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Esistono sia /var/lib/amandates che /var/lib/amanda/amandates. Controllare i " +"file e unire tutte le parti utili in /var/lib/amanda/amandates e poi " +"rimuovere il file /var/lib/amanadates." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..d07e908 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,43 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: amanda 2.5.0p2-2.1\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-10-11 00:08+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "/var/lib/amandates と /var/lib/amanda/amandates をマージしてください。" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"/var/lib/amandates と /var/lib/amanda/amandates の両方があります。ファイルを" +"確認し、/var/lib/amanda/amandates に注意が必要な内容をマージしてから、古い" +"ファイル /var/lib/amandates を削除してください。" diff --git a/debian/po/nl.po b/debian/po/nl.po new file mode 100644 index 0000000..bad639d --- /dev/null +++ b/debian/po/nl.po @@ -0,0 +1,49 @@ +# translation of amanda 1:2.5.0p2-1_templates.po to Dutch +# This file is distributed under the same license as the amanda package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Luk Claes , 2004 +# This is an unofficial translation +# +msgid "" +msgstr "" +"Project-Id-Version: amanda 1:2.5.0p2-1\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-06-18 20:45+0100\n" +"Last-Translator: Kurt De Bree \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Voeg /var/lib/amandates en /var/lib/amanda/amandates samen." + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Zowel /var/lib/amandates als /var/lib/amanda/amandates zijn op uw " +"systeemaanwezig. Kijk deze bestanden na en combineer de inhoud u belangrijk " +"vindt, in /var/lib/amanda/amandates, en verwijder het oude bestand /var/lib/" +"amandates." diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 0000000..dc86052 --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,36 @@ +# Portuguese translation of amanda debconf messages. +# Copyright (C) 2007 Carlos Lisboa +# This file is distributed under the same license as the amanda package. +# Carlos Lisboa , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2007-02-04 12:24+0000\n" +"Last-Translator: Carlos Lisboa \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "" +"Por favor faça a fusão de /var/lib/amandates e /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Possui tanto o /var/lib/amandates como o /var/lib/amanda/amandates. Por " +"favor reveja esses ficheiros, e faça a fusão do conteúdo que pretende para o " +"local /var/lib/amanda/amandates, e remova o ficheiro antigo /var/lib/" +"amandates." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po new file mode 100644 index 0000000..6e58cac --- /dev/null +++ b/debian/po/pt_BR.po @@ -0,0 +1,44 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +#, fuzzy +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Por favor junte /var/lib/amandates e /var/lib/amanda/amandates." + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Você possui ambos /var/lib/amandates e /var/lib/amanda/amandates. Por favor " +"revise os arquivos, junte os conteúdos que lhe importam para a localização /" +"var/lib/amanda/amandates e remova o antigo arquivo /var/lib/amandates." diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..fcc49ee --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,46 @@ +# translation of amanda_1:2.5.2p1-1_ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Yuri Kozlov , 2008. +msgid "" +msgstr "" +"Project-Id-Version: amanda 1:2.5.2p1-1\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2008-03-15 13:30+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "" +"Объедините настройки из /var/lib/amandates и /var/lib/amanda/amandates." + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"В системе найдены файлы: /var/lib/amandates и /var/lib/amanda/amandates. " +"Просмотрите эти файлы, объедините их настройки в файле /var/lib/amanda/" +"amandates и удалите старый файл /var/lib/amandates." diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..f00f0d4 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,42 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda 1:2.5.0p2-1\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2006-06-27 23:05+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Sammanfoga /var/lib/amandates och /var/lib/amanda/amandates" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Du har både /var/lib/amandates och /var/lib/amanda/amandates. Granska dessa " +"filer och sammanfoga innehållet som du bryr dig om till den nya platsen /var/" +"lib/amanda/amandates. Ta sedan bort den gamla filen /var/lib/amandates." diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..a4f22cf --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,32 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "" + +#. Type: error +#. Description +#: ../templates:1001 +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 0000000..e6e9363 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,33 @@ +# Vietnamese Translation for Amanda. +# Copyright © 2010 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2010. +# +msgid "" +msgstr "" +"Project-Id-Version: amanda 1/3.1.0-1\n" +"Report-Msgid-Bugs-To: amanda@packages.debian.org\n" +"POT-Creation-Date: 2008-04-16 01:13-0600\n" +"PO-Revision-Date: 2010-10-31 13:45+1030\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.8\n" + +#: ../templates:1001 +#. Type: error +#. Description +msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" +msgstr "Hòa trộn « /var/lib/amandates » và « /var/lib/amanda/amandates »" + +#: ../templates:1001 +#. Type: error +#. Description +msgid "" +"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please " +"review the files, and merge the contents you care about to the /var/lib/" +"amanda/amandates location, and remove the old file /var/lib/amandates." +msgstr "" +"Đồng thời có cả hai tập tin « /var/lib/amandates » và « /var/lib/amanda/amandates ». Hãy xem lại hai tập tin đó, sau đó hoà trộn nội dung muốn giữ lại vào vị trí « /var/lib/amanda/amandates », và gỡ bỏ tập tin cÅ© « /var/lib/amandates »." diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..8995e70 --- /dev/null +++ b/debian/rules @@ -0,0 +1,152 @@ +#!/usr/bin/make -f +# Copyright 1998-2011 by Bdale Garbee. License GPL v2 + +export DH_VERBOSE=1 + +r=$(shell pwd)/debian/amanda-common +s=$(shell pwd)/debian/amanda-server +c=$(shell pwd)/debian/amanda-client + +configure: configure-stamp +configure-stamp: + dh_testdir + # pick up latest config files provided by autotools-dev + cp -f /usr/share/misc/config.sub config/config.sub + cp -f /usr/share/misc/config.guess config/config.guess + # do we need --{htmldir,dvidir,pdfdir,psdir} to force subdirectories? + # should we re-craft this to use --without-server and --without-client, + # and lose the amanda-common package? + MAILER=/usr/bin/mail \ + SSH=/usr/bin/ssh \ + ./configure \ + --prefix=/usr \ + --bindir=/usr/sbin \ + --libexecdir=/usr/lib/amanda \ + --without-amlibexecdir \ + --without-amperldir \ + --sysconfdir=/etc \ + --sharedstatedir=/var/lib \ + --localstatedir=/var/lib \ + --with-user=backup \ + --with-group=backup \ + --with-tcpportrange=50000,50100 \ + --with-udpportrange=840,860 \ + --with-debugging=/var/log/amanda \ + --with-gnutar-listdir=/var/lib/amanda/gnutar-lists \ + --with-index-server=localhost \ + --with-bsd-security \ + --with-smbclient=/usr/bin/smbclient \ + --with-amandahosts \ + --with-ssh-security \ + --with-bsdtcp-security \ + --with-bsdudp-security \ + --without-ipv6 \ + --enable-s3-device + + touch missing + touch configure-stamp + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: configure-stamp + dh_testdir + MAILER=/usr/bin/mail $(MAKE) CFLAGS="-O2 -g -Wall \ + -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \ + -DIGNORE_TAR_ERRORS " + touch build-stamp + +clean: + dh_testdir + dh_testroot + [ ! -f Makefile ] || make clean + [ ! -f Makefile ] || make distclean + -rm -f build-stamp configure-stamp missing config/config.h common-src/genversion + -find . -type d -name .deps -exec rm -rf {} \; + dh_clean + +# call this before packaging for upload when updating template English text +updatepo: + -rm -f debian/po/templates.pot + debconf-updatepo + +binary-indep: build + +binary-arch: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + make install DESTDIR=$(r) + sed -i "/dependency_libs/ s/'.*'/''/" `find $(r)/usr/lib/amanda/ -name '*.la'` + install -m 644 debian/amandahosts $(r)/etc/amandahosts + dh_installdocs -a + dh_installexamples -a + ln -s ../amanda/example $(r)/usr/share/doc/examples + cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog + cp example/xinetd.amandaserver $(r)/etc/xinetd.d/amanda + dh_installmenu -a + dh_installcron -a + dh_installchangelogs -a + dh_installdebconf -a + dh_installman -a + dh_strip -a + dh_compress -a + dh_movefiles -a --sourcedir=debian/amanda-common + rm -r $(r)/usr/share/amanda + dh_fixperms -av + # fix perms manually + chown -R backup:backup debian/*/var/lib/* + chmod -R u=rwX,g=rwX,o-rwx debian/*/var/lib/* + chown -R backup:backup $(s)/var/log/amanda + chmod -R u=rwX,g=rwX,o-rwx $(s)/var/log/amanda + chown -R backup:backup $(s)/etc/amanda + chmod -R u=rwX,g=rwX,o-rwx $(s)/etc/amanda + chown -R backup:backup $(c)/var/lib/amanda/gnutar-lists + chmod -R u=rwX,g=rwX,o-rwx $(c)/var/lib/amanda/gnutar-lists + # .. setuid + chown root:backup \ + $(c)/usr/lib/amanda/application/amgtar \ + $(c)/usr/lib/amanda/application/amstar \ + $(c)/usr/lib/amanda/calcsize \ + $(c)/usr/lib/amanda/killpgrp \ + $(c)/usr/lib/amanda/rundump \ + $(c)/usr/lib/amanda/runtar \ + $(s)/usr/lib/amanda/dumper \ + $(s)/usr/lib/amanda/planner \ + $(s)/usr/sbin/amcheck + chmod u=srwx,g=rx,o=r \ + $(c)/usr/lib/amanda/application/amgtar \ + $(c)/usr/lib/amanda/application/amstar \ + $(c)/usr/lib/amanda/calcsize \ + $(c)/usr/lib/amanda/killpgrp \ + $(c)/usr/lib/amanda/rundump \ + $(c)/usr/lib/amanda/runtar \ + $(s)/usr/lib/amanda/dumper \ + $(s)/usr/lib/amanda/planner \ + $(s)/usr/sbin/amcheck + install -o root -g root -m 0644 debian/amanda-client.lintian \ + $(c)/usr/share/lintian/overrides/amanda-client + install -o root -g root -m 0644 debian/amanda-common.lintian \ + $(r)/usr/share/lintian/overrides/amanda-common + install -o root -g root -m 0644 debian/amanda-server.lintian \ + $(s)/usr/share/lintian/overrides/amanda-server + dh_makeshlibs -pamanda-common --noscripts + dh_installdeb -a + dh_perl -a usr/lib/amanda/perl + dh_shlibdeps -a -l"debian/amanda-common/usr/lib:debian/amanda-client/usr/lib:debian/amanda-server/usr/lib" + # strip out the non-versioned amanda-common references, we need + # the versioned ones in the control file and dupes are ugly... + sed -e 's/amanda-common, //' < debian/amanda-server.substvars > debian/blah + mv debian/blah debian/amanda-server.substvars + sed -e 's/amanda-common, //' < debian/amanda-client.substvars > debian/blah + mv debian/blah debian/amanda-client.substvars + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: configure build-indep build-arch build clean binary-indep binary-arch binary diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/templates b/debian/templates new file mode 100644 index 0000000..b3256ee --- /dev/null +++ b/debian/templates @@ -0,0 +1,7 @@ +Template: amanda-common/merge_amandates +Type: error +_Description: Please merge /var/lib/amandates and /var/lib/amanda/amandates + You have both /var/lib/amandates and /var/lib/amanda/amandates. Please + review the files, and merge the contents you care about to the + /var/lib/amanda/amandates location, and remove the old file + /var/lib/amandates. diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..bc5d697 --- /dev/null +++ b/debian/watch @@ -0,0 +1,7 @@ +# debian/watch for amanda +# format version number, currently 3; this line is compulsory! +version=3 +# If your package is located on sourceforge, use the following format +# to automatically use the qa.debian.org redirector, avoiding SF's +# difficult mirror system. +http://sf.net/amanda/amanda-([0-9]+\.[0-9]+\.[0-9]+[^b]*)\.tar\.gz debian uupdate diff --git a/example/amanda.conf.in b/example/amanda.conf.in index 692dcc5..158f961 100644 --- a/example/amanda.conf.in +++ b/example/amanda.conf.in @@ -460,7 +460,7 @@ define tapetype SEAGATE-ULTRIUM-LTO { # program - specify the dump system to use. Valid values are "DUMP", # or "GNUTAR". Default: [program "DUMP"]. # record - record the backup in the time-stamp-database of the backup -# program (e.g. /etc/dumpdates for DUMP or +# program (e.g. /var/lib/dumpdates for DUMP or # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.). # Default: [record yes] # skip-full - skip the disk when a level 0 is due, to allow full backups @@ -621,7 +621,7 @@ define dumptype nocomp-high { define dumptype nocomp-test { global - comment "test dump without compression, no /etc/dumpdates recording" + comment "test dump without compression, no /var/lib/dumpdates recording" compress none record no priority medium @@ -629,7 +629,7 @@ define dumptype nocomp-test { define dumptype comp-test { nocomp-test - comment "test dump with compression, no /etc/dumpdates recording" + comment "test dump with compression, no /var/lib/dumpdates recording" compress client fast } diff --git a/example/template.d/dumptypes b/example/template.d/dumptypes index d73639a..62172d3 100644 --- a/example/template.d/dumptypes +++ b/example/template.d/dumptypes @@ -106,7 +106,7 @@ # program - specify the dump system to use. Valid values are "DUMP" # "STAR" and "GNUTAR". Default: [program "DUMP"]. # record - record the backup in the time-stamp-database of the backup -# program (e.g. /etc/dumpdates for DUMP or +# program (e.g. /var/lib/dumpdates for DUMP or # /var/lib/amanda/gnutar-lists for GNUTAR.). # Default: [record yes] # skip-full - skip the disk when a level 0 is due, to allow full backups @@ -302,7 +302,7 @@ define dumptype nocomp-high { define dumptype nocomp-test { global - comment "test dump without compression, no /etc/dumpdates recording" + comment "test dump without compression, no /var/lib/dumpdates recording" compress none record no priority medium @@ -310,7 +310,7 @@ define dumptype nocomp-test { define dumptype comp-test { nocomp-test - comment "test dump with compression, no /etc/dumpdates recording" + comment "test dump with compression, no /var/lib/dumpdates recording" compress client fast } diff --git a/gnulib/regenerate/regenerate b/gnulib/regenerate/regenerate old mode 100755 new mode 100644 diff --git a/man/amanda.conf.5 b/man/amanda.conf.5 index 0fba0e2..a412d96 100644 --- a/man/amanda.conf.5 +++ b/man/amanda.conf.5 @@ -1702,8 +1702,8 @@ keyword append the values to the list of values for that property\&. \fBrecord\fR \fIboolean\fR .RS 4 Default: -\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&. -/etc/dumpdates +\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&. +/var/lib/dumpdates for DUMP or /usr/local/var/amanda/gnutar\-lists for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&. diff --git a/man/disklist.5 b/man/disklist.5 index 84bd2d4..915248b 100644 --- a/man/disklist.5 +++ b/man/disklist.5 @@ -98,7 +98,7 @@ defined in the \fBamanda\&.conf\fR file\&. \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in -/etc/dumpdates, the disk\*(Aqs relative priority, etc\&. +/var/lib/dumpdates, the disk\*(Aqs relative priority, etc\&. .RE .PP \fIspindle\fR diff --git a/man/entities/global.entities.in b/man/entities/global.entities.in index d55b6e8..47f6059 100644 --- a/man/entities/global.entities.in +++ b/man/entities/global.entities.in @@ -98,7 +98,7 @@ '> -/etc/dumpdates'> +/var/lib/dumpdates'> amadmin'> diff --git a/man/xml-source/amanda.conf.5.xml b/man/xml-source/amanda.conf.5.xml index 33353eb..cb33c5f 100644 --- a/man/xml-source/amanda.conf.5.xml +++ b/man/xml-source/amanda.conf.5.xml @@ -2182,8 +2182,8 @@ the property to set, and the others contains its values. record boolean Default: -yes. -Whether to ask the backup program to update its database (e.g. /etc/dumpdates +yes. +Whether to ask the backup program to update its database (e.g. /var/lib/dumpdates for DUMP or /usr/local/var/amanda/gnutar-lists for GNUTAR) of time stamps. This is normally enabled for daily backups and turned off for periodic archival runs. diff --git a/man/xml-source/disklist.5.xml b/man/xml-source/disklist.5.xml index d8abab6..a4bd049 100644 --- a/man/xml-source/disklist.5.xml +++ b/man/xml-source/disklist.5.xml @@ -112,7 +112,7 @@ file. specify backup related parameters, such as whether to compress the backups, whether to record backup results in -/etc/dumpdates, the disk's relative priority, etc. +/var/lib/dumpdates, the disk's relative priority, etc. diff --git a/server-src/diskfile.h b/server-src/diskfile.h index 28ed50e..9fae30e 100644 --- a/server-src/diskfile.h +++ b/server-src/diskfile.h @@ -111,7 +111,7 @@ typedef struct disk_s { char *clnt_decrypt_opt; /* client-side decryption option parameter to use */ double comprate[2]; /* default compression rates */ /* flag options */ - int record; /* record dump in /etc/dumpdates ? */ + int record; /* record dump in /var/lib/dumpdates ? */ int skip_incr; /* incs done externally ? */ int skip_full; /* fulls done externally ? */ int to_holdingdisk; /* use holding disk ? */