pull last change pending from pre-git CVS tree

diff --git a/debian/amanda.conf.in b/debian/amanda.conf.in
index bd190d4335c27a2130cbebe9ed5dd42886ae9b8a..566007030b0d488b11bf6d1d0113083fdbb9feb7 100644 (file)
--- a/debian/amanda.conf.in
+++ b/debian/amanda.conf.in
@@ -114,7 +114,7 @@ changerdev "@DEFAULT_CHANGER_DEVICE@"
 # Use with caution.
 ## label_new_tapes "DailySet1-%%%"
 
-maxdumpsize -1         # Maximum number of bytes the planner will schedule
+# maxdumpsize -1       # Maximum number of bytes the planner will schedule
                        # for a run (default: runtapes * tape_length).
 tapetype HP-DAT                # what kind of tape it is (see tapetypes below)
 labelstr "^DailySet1-[0-9][0-9]*$"     # label constraint regex: all tapes must match

diff --git a/debian/changelog b/debian/changelog
index 4d68735cbdd13af07b6e7ef2ca215248a302c4f2..268906e7074f04a7881202152ebf10f8b7c108bb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-amanda (1:2.5.2p1-4) UNRELEASED; urgency=low
+amanda (1:2.5.2p1-4) UNRELEASED; urgency=high
 
-  * bug fix version intended for inclusion in lenny release
+  * 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
 
  -- Bdale Garbee <bdale@gag.com>  Sat, 16 Aug 2008 12:05:05 -0300

diff --git a/debian/control b/debian/control
index 4f89fb81d07a5f9a01e8af867aed5d459a8f2d0d..bac41f4e967caf788dd98d39640fd6504659e116 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Package: amanda-server
 Architecture: any
 Depends: ${shlibs:Depends}, amanda-common (= ${binary:Version}), mailx
 Suggests: perl5, gnuplot, amanda-client (= ${binary:Version}), cpio | mt-st
-Conflicts: amanda
-Replaces: amanda-common (<< 1:2.4.4)
+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
@@ -67,8 +67,8 @@ Package: amanda-client
 Architecture: any
 Depends: ${shlibs:Depends}, amanda-common (= ${binary:Version})
 Suggests: gnuplot, dump, smbclient
-Conflicts: amanda, amanda-common (<< 1:2.4.2)
-Replaces: amanda-common (<< 1:2.4.2)
+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