From d443f3def9e231304edd0121b1748b55af437bf6 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 19 Sep 2011 14:37:41 +0200
Subject: [PATCH] update changelog

---
 bacula/ChangeLog                | 51 +++++++++++++++++++++++++++++++--
 bacula/release/git2changelog.pl | 17 +++++++++--
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 94bc69e0fa..21d5405f19 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,7 +1,54 @@
-              Changelog on version 5.2.0
+              Changelog on version 5.2.0rc2
+
+19Sep11
+ - Update auth troubleshooting URL to use MANUAL_AUTH_URL macro
+ - Define MANUAL_AUTH_URL in baconfig.h
+
+17Sep11
+ - Fix #1762 about bat version browser performance problem
+
+16Sep11
+ - On restore we don't have a full FF_PKT so we lstat the file.
+ - Add XATTR and ACL flags for backup and restore.
+ - Lower some messages from level M_ERROR to M_WARNING in acl/xatttr.
+
+07Sep11
+ - Fix spooldata and ignoreduplicates run command options to use JCR instead of 
+  the Job resource.
+
+30Aug11
+ - Fix #1761 about create_postgresql_database
+
+22Aug11
+ - Apply htmldir fix provided by Philipp
+
+20Aug11
+ - Fix possible buffer overrun in exchange plugin
+
+17Aug11
+ - Add help for "use" command as suggested by Thomas Mueller
+ - Fix error message with bad dot commands
+
+16Aug11
+ - Drop unused sqlite_dump function from make_catalog_backup.pl
+ - Adapt make_catalog_backup.pl for backend
+
+09Aug11
+ - Fix backtrace detection in configure
+
+06Aug11
+ - Make bat run dialog present only allowed levels
+
+05Aug11
+ - Fix bat seg fault in FileSet view
+
+Bug fixes
+1761 1762
+
+Version 5.2.0rc1
 
 Bug fixes
-1389 1444 1448 1466 1467 1468 1476 1481 1486 1488 1493 1494 1497 1499 1501 1502 1504 1509 1511 1513 1516 1524 1526 1527 1532 1536 1538 1541 1542 1549 1551 1553 1554 1558 1559 1560 1564 1567 1568 1569 1571 1574 1577 1581 1582 1584 1587 1594 1595 1600 1601 1603 1604 1606 1608 1610 1612 1623 1624 1633 1643 1648 1655 1661 1666 1669 1672 1675 1684 1685 1695 1696 1699 1700 1703 1735 1664 1741 1749
+1389 1444 1448 1466 1467 1468 1476 1481 1486 1488 1493 1494 1497 1499 1501 1502 1504 1509 1511 1513 1516 1524 1526 1527 1532 1536 1538 1541 1542 1549 1551 1553 1554 1558 1559 1560 1564 1567 1568 1569 1571 1574 1577 1581 1582 1584 1587 1594 1595 1600 1601 1603 1604 1606 1608 1610 1612 1623 1624 1633 1643 1648 1655 1661 1666 1669 1672 1675 1684 1685 1695 1696 1699 1700 1703 1735 1664 1741 1749 
 
 08Jul11
  - Fix libtool definition and make the helper script executable.
diff --git a/bacula/release/git2changelog.pl b/bacula/release/git2changelog.pl
index 379e2a4bd7..6b8b74c96e 100755
--- a/bacula/release/git2changelog.pl
+++ b/bacula/release/git2changelog.pl
@@ -13,6 +13,8 @@ use strict;
 use POSIX q/strftime/;
 
 my $d='';
+my $cur;
+my %elt;
 my $last_txt='';
 my %bugs;
 my $refs = shift || '';
@@ -24,6 +26,8 @@ while (my $l = <FP>) {
     next if ($l =~ /(tweak|typo|cleanup|regress:|again|.gitignore|fix compilation|technotes)/ixs);
     next if ($l =~ /update (version|technotes|kernstodo|projects|releasenotes|version|home|release|todo|notes|changelog|tpl|configure)/i);
 
+    next if ($l =~ /bacula-web:/);
+
     if ($for_bweb) {
         next if ($l !~ /bweb/ixs);
         $l =~ s/bweb: *//ig;
@@ -42,6 +46,7 @@ while (my $l = <FP>) {
     if ($l =~ /(\d+): (.+)/) {
         # use date as 01Jan70
         my $dnow = strftime('%d%b%y', localtime($1));
+        my $cur = strftime('%Y%m%d', localtime($1));
         my $txt = $2;
 
         # avoid identical multiple commit message
@@ -54,10 +59,12 @@ while (my $l = <FP>) {
 
         # if we are the same day, just add entry
         if ($dnow ne $d) {
-            print "\n$dnow\n";
             $d = $dnow;
+            if (!exists $elt{$cur}) {
+                push @{$elt{$cur}}, "\n\n$dnow";
+            }
         }
-        print "- $txt\n";
+        push @{$elt{$cur}},  " - $txt";
 
     } else {
         print STDERR "invalid format: $l\n";
@@ -66,5 +73,9 @@ while (my $l = <FP>) {
 
 close(FP);
 
-print "\nBug fixes\n";
+foreach my $d (sort {$b <=> $a} keys %elt) {
+    print join("\n", @{$elt{$d}});
+}
+
+print "\n\nBug fixes\n";
 print join(" ", sort keys %bugs), "\n";
-- 
2.39.5