Imported Debian patch 2.5.0p2-2.1

diff --git a/debian/changelog b/debian/changelog
index 7e0a977eab9dffca45e55d8b05a96a7abc70c1be..935b1f61ea341287596030435ed674ffb2755abc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+amanda (1:2.5.0p2-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Added Replaces:amanda-client to amanda-common control information; thanks
+    to Bill Alombert (closes: #391026).
+
+ -- martin f. krafft <madduck@debian.org>  Sat,  7 Oct 2006 13:11:08 +0200
+
 amanda (1:2.5.0p2-2) unstable; urgency=low
 
   * merge updated French translation, closes: #369243

diff --git a/debian/control b/debian/control
index bec53fd056797198588b28c30c042ec8d8c76aa3..4a9d350da40027a4cdb3f18abc4581ca748aa72b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, netbase (>=3.03), tar (>=1.12), perl5, mailx, debconf | debconf-2.0, adduser
 Suggests: amanda-server (= ${Source-Version}) | amanda-client (= ${Source-Version})
 Conflicts: amanda
-Replaces: 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.

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b06aa929d4f55f6898a1caea239538b6290eaa21..97aa346b25f3fbf71cdde07460081f2e4f2df104 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2006-08-28 13:34-0400\n"
+"POT-Creation-Date: 2006-10-07 11:13+0000\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"