From: martin f. krafft <madduck@debian.org>
Date: Sat, 7 Oct 2006 11:11:08 +0000 (+0200)
Subject: Imported Debian patch 2.5.0p2-2.1
X-Git-Tag: debian/2.5.0p2-2.1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a589e709eb0c3882e6547686e63eb6fc32e4a5af;p=debian%2Famanda

Imported Debian patch 2.5.0p2-2.1
---

diff --git a/debian/changelog b/debian/changelog
index 7e0a977..935b1f6 100644
--- 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 bec53fd..4a9d350 100644
--- 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 b06aa92..97aa346 100644
--- 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"