Imported Debian patch 2.5.2p1-3 debian/2.5.2p1-3
authorBdale Garbee <bdale@gag.com>
Wed, 16 Apr 2008 06:02:13 +0000 (00:02 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 20 May 2008 04:48:10 +0000 (22:48 -0600)
28 files changed:
debian/amanda-client.files
debian/amanda-common.dirs
debian/amanda-common.examples [new file with mode: 0644]
debian/amanda-server.README.Debian
debian/amanda-server.dirs
debian/amanda-server.examples [new file with mode: 0644]
debian/amanda-server.files
debian/amanda-server.lintian
debian/changelog
debian/po/ar.po
debian/po/cs.po
debian/po/da.po
debian/po/de.po
debian/po/es.po
debian/po/fr.po
debian/po/gl.po
debian/po/it.po
debian/po/ja.po
debian/po/nl.po
debian/po/pt.po
debian/po/pt_BR.po
debian/po/ru.po
debian/po/sv.po
debian/po/templates.pot
debian/po/vi.po
debian/rules
server-src/amcleanup.sh.in
server-src/amverify.sh.in

index 6ffcd58741c7f1e844c224a686ed17a826e50c8c..e5ea96ec513acf9308e2b563db4cd276b717a32c 100644 (file)
@@ -8,5 +8,10 @@ usr/lib/amanda/selfcheck
 usr/lib/amanda/sendbackup
 usr/lib/amanda/sendsize
 usr/lib/amanda/versionsuffix
+usr/share/man/man8/amfetchdump.8.gz
 usr/share/man/man8/amrecover.8.gz
+usr/share/man/man8/amrestore.8.gz
+usr/sbin/amfetchdump
+usr/sbin/amoldrecover
 usr/sbin/amrecover
+usr/sbin/amrestore
index c5b03cbd52a2c255ead1153fd5becfd861ffd794..3605183669e763f6fb84ff1bd27baecf30ecc628 100644 (file)
@@ -1,3 +1,4 @@
 etc/xinetd.d
 usr/lib
+usr/share/doc/amanda-common/examples
 usr/share/lintian/overrides
diff --git a/debian/amanda-common.examples b/debian/amanda-common.examples
new file mode 100644 (file)
index 0000000..0bbe99e
--- /dev/null
@@ -0,0 +1 @@
+example/*
index 652ace49a292db886b5971af5002c2fd167766a1..809b966f89199517ea58d27b88d05b357f995c60 100644 (file)
@@ -1,21 +1,47 @@
 amanda for DEBIAN
 -----------------
 
-To configure your server, as root do:
+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. for a simple setup edit the files (see explanations there) 
-       /etc/amanda/DailySet1/amanda.conf
-       /etc/amanda/DailySet1/disklist
-       /etc/amanda/crontab
+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.
 
-2. prepare the holding disk if you use one by 
        chown -R backup:backup <holding disk location>
 
-3. do 
-       crontab -u backup /etc/amanda/crontab.amanda
+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 may find it necessary to put each client
+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
@@ -31,8 +57,8 @@ 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).
+Another Note: if you use floppy tapes you have to use the sftape interface 
+for use with ftape(>=3.03).
 
 Jean Pierre LeJacq <jplejacq@mail.quoininc.com> reports the following about
 his experience using ftape:
@@ -55,16 +81,19 @@ 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/libamanda/dumper is suid.
+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.  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.
+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
index 162ec8c669997d4653fd3bdc7d2a8fb35a2d23ae..1e626aef566dea07e8cba33fa9aa15e4b7dc3b65 100644 (file)
@@ -1,7 +1,7 @@
+etc/amanda
 etc/xinetd.d
-etc/amanda/DailySet1
 usr/sbin
-usr/share/doc/amanda-server
+usr/share/doc/amanda-server/examples
 usr/share/lintian/overrides
-var/lib/amanda/DailySet1/index
-var/log/amanda/DailySet1
+var/lib/amanda
+var/log/amanda
diff --git a/debian/amanda-server.examples b/debian/amanda-server.examples
new file mode 100644 (file)
index 0000000..739d64e
--- /dev/null
@@ -0,0 +1,3 @@
+debian/amanda.conf.in
+debian/crontab.amanda
+debian/disklist
index 3f5ba4403cf4d188ecd0696d2ca5eef9172d1688..69bdb41b75fbdd9365c3d3302a18fe0d512f134c 100644 (file)
@@ -15,32 +15,40 @@ usr/sbin/amadmin
 usr/sbin/amcheck
 usr/sbin/amcheckdb
 usr/sbin/amcleanup
+usr/sbin/amdd
 usr/sbin/amdump
 usr/sbin/amflush
 usr/sbin/amgetconf
 usr/sbin/amlabel
+usr/sbin/ammt
 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/sbin/amverify
+usr/sbin/amverifyrun
 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/amcleanup.8.gz
+usr/share/man/man8/amdd.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/ammt.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
 usr/share/man/man8/amverify.8.gz
+usr/share/man/man8/amverifyrun.8.gz
index fe25afee3a8714618e0bb4f3beda30851960a2b3..ef0e04091b687fb8d5032781a6744e19c5071c31 100644 (file)
@@ -1,16 +1,9 @@
 amanda-server: non-standard-dir-perm etc/amanda/ 0770 != 0755
-amanda-server: non-standard-dir-perm etc/amanda/DailySet1/ 0770 != 0755
-amanda-server: non-standard-file-perm etc/amanda/DailySet1/amanda.conf 0660 != 0644
-amanda-server: non-standard-file-perm etc/amanda/DailySet1/disklist 0660 != 0644
-amanda-server: non-standard-file-perm etc/amanda/crontab.amanda 0660 != 0644
 amanda-server: setuid-binary usr/sbin/amcheck 4754 root/backup
 amanda-server: setuid-binary usr/lib/amanda/dumper 4754 root/backup
 amanda-server: setuid-binary usr/lib/amanda/planner 4754 root/backup
 amanda-server: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
-amanda-server: non-standard-dir-perm var/lib/amanda/DailySet1/ 0770 != 0755
-amanda-server: non-standard-dir-perm var/lib/amanda/DailySet1/index/ 0770 != 0755
 amanda-server: non-standard-dir-perm var/log/amanda/ 0770 != 0755
-amanda-server: non-standard-dir-perm var/log/amanda/DailySet1/ 0770 != 0755
 amanda-server: executable-not-elf-or-script ./usr/lib/amanda/chg-lib.sh
 amanda-server: maintainer-script-needs-depends-on-update-inetd postinst
 amanda-server: maintainer-script-needs-depends-on-update-inetd prerm
index 7af4eb659726f48d8222ba3a6e45d41a75fd4fd0..f22eed7bff99dccb02745f62efd74af36bd95ce2 100644 (file)
@@ -1,3 +1,15 @@
+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 <bdale@gag.com>  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,
index 760f4f83b531c0fd5442964826bf80d441224ff9..c0b947c45687f4c8102bb19021cdb13c61596612 100644 (file)
@@ -15,7 +15,7 @@ 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-03-20 18:11-0600\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
 "PO-Revision-Date: 2005-07-19 18:48+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <debian-l10n-arabic@lists.debian.org>\n"
index fb4027cc0eebed0b14e0065143ab46af1a87245e..d8b66369442bc46566d174563e4986a11139fbe1 100644 (file)
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
index 0492cb53b94aefe5827c2192cae7112f6fc7c2f1..f6986c822d5bb6ee8385cade1d595ee35d5afbdd 100644 (file)
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
index 2249965641cb6677985338f2ddea56208374971c..8453b9d0fdfc460454ec4cc0fd33fe8d17b98b0e 100644 (file)
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
index 40a75c6e6724d3963b6691879353cbc5f1139443..1fa2feaf16e7c6cd1d6092d775241b2607ce8d29 100644 (file)
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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» <venturi.debian@gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
index 2992c55b49d7fd8e99b47d91fdb0f72852381d96..93ee324fa8fd91d781d24e8c7b55bb817881df54 100644 (file)
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
index 9af66e6585e4e6ec8f9020aa4bf3e6a119954b72..c6d3a51912145a2d0a23979988bcfc9cd84ab493 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
index 976dbdb3fd88a6c42e0fcdb85e61bda3e98f9b8d..b4042fc0d0cfb3b6f4fe6445e5618f7ba2a4e8ee 100644 (file)
@@ -7,7 +7,7 @@ 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-03-20 18:11-0600\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 <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
index 1c5b91b5685e124132aed8e15b7dde4ac051bcfa..d07e908f5b0735c57ce3b874858ee0e4271d9f7a 100644 (file)
@@ -16,7 +16,7 @@ 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-03-20 18:11-0600\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) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
index 032bd5845c20a429ae173de6cd192151e992b81c..bad639d0361fbfe4d8704245ec613fb9b8e71d5c 100644 (file)
@@ -21,7 +21,7 @@ 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-03-20 18:11-0600\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 <kdebree(AT)telenet(DOT)be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
index 56df7d9881e1859dcc0e14ce94135ece98ac4305..dc8605207bf01c82b88329a6a8ad9b95fd800ecd 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <carloslisboa@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
index 538efc10b15f5c89f298eb02b2c6bed20cbfebbb..6e58cac05fe10ffc897b0f4f83e65a793c5fbe0e 100644 (file)
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
index 9b55820cef1ce2799d48fe60a4545936d030cae5..fcc49ee5bc53f74fcc466d9aa8b5594bce1dd684 100644 (file)
@@ -1,35 +1,37 @@
+# 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
-#
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
 #    Developers do not need to manually edit POT or PO files.
 #
-#, fuzzy
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: amanda 1:2.5.2p1-1\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.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 <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\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
-#, fuzzy
 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
-msgstr "ðÏÖÁÌÕÊÓÔÁ, ÓÏÅÄÉÎÉÔÅ /var/lib/amandates É /var/lib/amanda/amandates."
+msgstr ""
+"Объедините настройки из /var/lib/amandates и /var/lib/amanda/amandates."
 
 #. Type: error
 #. Description
@@ -39,6 +41,6 @@ msgid ""
 "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."
+"В системе найдены файлы: /var/lib/amandates и /var/lib/amanda/amandates. "
+"Просмотрите эти файлы, объедините их настройки в файле /var/lib/amanda/"
+"amandates и удалите старый файл /var/lib/amandates."
index 106451a91d08e36baf66a7de9d2ee31dbdb1c78b..f00f0d4eb1845a398db4f3ae83a6aa9d7f79400d 100644 (file)
@@ -15,7 +15,7 @@ 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-03-20 18:11-0600\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 <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
index dea51d93ba66e8b77c8e425c6b718c1a45236f2a..a4f22cf61a6896267b770b6db9521cbc2fca9e99 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
index f93c680a05038a823e678fc31650e5ed70cc72d2..10472214721b60f5101ebf907ca78618358f3409 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda 1/2.4.4p3-2\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
-"POT-Creation-Date: 2008-03-20 18:11-0600\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
 "PO-Revision-Date: 2005-05-05 13:29+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
index 8055cf664161dd2a1068fca3c4fb3c2ae9f6af9e..8d4592bf2d27aa70f3fa3ce9e7c94f45d946e712 100755 (executable)
@@ -9,9 +9,8 @@
 #export DH_VERBOSE=1
 
 r=$(shell pwd)/debian/amanda-common
-server=$(shell pwd)/debian/amanda-server
-client=$(shell pwd)/debian/amanda-client
-common=$(shell pwd)/debian/amanda-common
+s=$(shell pwd)/debian/amanda-server
+c=$(shell pwd)/debian/amanda-client
 
 build: build-stamp 
 build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot
@@ -34,7 +33,7 @@ build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot
                --with-ssh-security \
                --with-bsdtcp-security --with-bsdudp-security
        touch missing
-       make CFLAGS="-O2 -g -Wall \
+       MAILER=/usr/bin/mail make CFLAGS="-O2 -g -Wall \
                -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
                -DIGNORE_TAR_ERRORS "
        touch build-stamp
@@ -66,17 +65,12 @@ binary-arch: build
        dh_clean -k
        dh_installdirs -a
        make install DESTDIR=$(r)
-       install -m 644 debian/amanda.conf.in \
-               $(server)/etc/amanda/DailySet1/amanda.conf
-       install -m 644 debian/disklist $(server)/etc/amanda/DailySet1/disklist
-       install -m 644 debian/crontab.amanda $(server)/etc/amanda
        install -m 644 debian/amandahosts $(r)/etc/amandahosts
        dh_installdocs -a
-       install -d $(r)/usr/share/doc/amanda-common/examples
-       cp -a example/* $(r)/usr/share/doc/amanda-common/examples
+       dh_installexamples -a
        cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog
-       cp debian/xinetd.d/amandaidx $(server)/etc/xinetd.d
-       cp debian/xinetd.d/amidxtape $(server)/etc/xinetd.d
+       cp debian/xinetd.d/amandaidx $(s)/etc/xinetd.d
+       cp debian/xinetd.d/amidxtape $(s)/etc/xinetd.d
        cp debian/xinetd.d/amanda $(r)/etc/xinetd.d                     
        dh_installmenu -a
        dh_installcron -a
@@ -85,38 +79,38 @@ binary-arch: build
        dh_strip -a
        dh_compress -a
        dh_movefiles -a --sourcedir=debian/amanda-common
-       rm $(server)/usr/lib/amanda/chg-mtx
+       rm $(s)/usr/lib/amanda/chg-mtx
        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 $(server)/var/log/amanda
-       chmod -R u=rwX,g=rwX,o-rwx $(server)/var/log/amanda
-       chown -R backup:backup $(server)/etc/amanda
-       chmod -R u=rwX,g=rwX,o-rwx $(server)/etc/amanda
-       chown -R backup:backup $(client)/var/lib/amanda/gnutar-lists
-       chmod -R u=rwX,g=rwX,o-rwx $(client)/var/lib/amanda/gnutar-lists
+       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 \
-               $(client)/usr/lib/amanda/killpgrp \
-               $(client)/usr/lib/amanda/rundump \
-               $(client)/usr/lib/amanda/runtar \
-               $(server)/usr/lib/amanda/dumper \
-               $(server)/usr/lib/amanda/planner \
-               $(server)/usr/sbin/amcheck
+               $(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 \
-               $(client)/usr/lib/amanda/killpgrp \
-               $(client)/usr/lib/amanda/rundump \
-               $(client)/usr/lib/amanda/runtar \
-               $(server)/usr/lib/amanda/dumper \
-               $(server)/usr/lib/amanda/planner \
-               $(server)/usr/sbin/amcheck
+               $(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 \
-               $(client)/usr/share/lintian/overrides/amanda-client
+               $(c)/usr/share/lintian/overrides/amanda-client
        install -o root -g root -m 0644 debian/amanda-common.lintian \
-               $(common)/usr/share/lintian/overrides/amanda-common
+               $(r)/usr/share/lintian/overrides/amanda-common
        install -o root -g root -m 0644 debian/amanda-server.lintian \
-               $(server)/usr/share/lintian/overrides/amanda-server
+               $(s)/usr/share/lintian/overrides/amanda-server
        dh_makeshlibs -a
        dh_installdeb -a
        dh_shlibdeps -a -l"debian/amanda-common/usr/lib:debian/amanda-client/usr/lib:debian/amanda-server/usr/lib"
index f301c5c84ed7bdbf46d151c01db383e60ed19e76..cd60001ff165eb6c96526577bbda7eec227763d0 100644 (file)
@@ -48,7 +48,7 @@ else
 fi
 
 if test -h /proc/1/exe ; then
-       if test $# -ge 2 && test "$1" == "-k" ; then
+       if test $# -ge 2 && test "$1" = "-k" ; then
                KILL_ENABLE=1
                conf=$2
                shift
@@ -183,9 +183,9 @@ if test ${KILL_ENABLE} -eq 1 ; then
                while test ${KEEP_CHECKING} -ne 0 ; do
                        PIDS_THIS_PASS=0
                        for search_user in ${dumpuser} root ; do
-                               if test "${search_user}" == "${dumpuser}" ; then
+                               if test "${search_user}" = "${dumpuser}" ; then
                                        PROCESS_NAMES=${USER_PROCESS_NAMES}
-                               elif test "${search_user}" == "root" ; then
+                               elif test "${search_user}" = "root" ; then
                                        PROCESS_NAMES=${ROOT_PROCESS_NAMES}
                                fi
                                for search_pid in [0-9]* ; do
@@ -193,7 +193,7 @@ if test ${KILL_ENABLE} -eq 1 ; then
                                                ls -l /proc/${search_pid}/exe 2>/dev/null | grep ${search_name} >/dev/null
                                                match_name=$?
                                                pid_uid="`cat /proc/${search_pid}/status 2>/dev/null | grep Uid | awk '//{split($_,i); print i[2]}'`"
-                                               if test ${match_name} -eq 0  && test "${pid_uid}" == "${search_user}" ; then
+                                               if test ${match_name} -eq 0  && test "${pid_uid}" = "${search_user}" ; then
                                                        echo "amcleanup: Process ${search_name} found running at pid #${search_pid}."
                                                        kill_pid=${search_pid}
                                                        kill_name=${search_name}
@@ -208,11 +208,11 @@ if test ${KILL_ENABLE} -eq 1 ; then
                                        if test ! -z "${kill_pid}" ; then
                                                if test -d /proc/${kill_pid} ; then
                                                        echo "amcleanup: Sending process ${kill_pid} the TERM signal."
-                                                       kill -15 -- ${kill_pid}
+                                                       kill TERM -- ${kill_pid}
                                                        sleep 5
                                                        if test -d /proc/${kill_pid} ; then
                                                                echo "amcleanup: Sending process  ${kill_pid} the KILL signal."
-                                                               kill -9 -- ${kill_pid}
+                                                               kill KILL -- ${kill_pid}
                                                        fi
                                                        sleep 5
                                                        if test -d /proc/${kill_pid} ; then
index 21e111d4a7ba7441adaa3df6eb82e0465aab003b..d146043e38924c8046e53a7401a305d53f530295 100644 (file)
@@ -331,7 +331,7 @@ fi
 cd @AMANDA_TMPDIR@ || exit 1
 
 TEMP=@AMANDA_TMPDIR@/amverify.$$
-trap 'rm -fr $TEMP' 0
+trap 'rm -fr $TEMP' EXIT
 if ( umask 077 ; mkdir $TEMP ) ; then
        :
 else
@@ -343,7 +343,7 @@ REPORT=$TEMP/report; rm -f $REPORT
 TAPELIST=
 EXITSTAT=$TEMP/amrecover.exit; rm -rf $EXITSTAT
 
-trap 'report "aborted!"; echo "aborted!" >> $DEFECTS; sendreport; rm -fr $TEMP; exit 1' 1 2 3 4 5 6 7 8 10 12 13 14 15
+trap 'report "aborted!"; echo "aborted!" >> $DEFECTS; sendreport; rm -fr $TEMP; exit 1' EXIT
 
 $Echoe "Defects file is $DEFECTS"
 report "amverify $CONFIG"