From 414dc1f3815a9ee3fba565492c63936e6dd8234d Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 3 Aug 2011 11:13:35 +0200
Subject: [PATCH] update changelog

---
 bacula/ChangeLog                | 13 ++++++++++++-
 bacula/release/git2changelog.pl | 17 ++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 0fb8c2023c..94bc69e0fa 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,7 +1,18 @@
               Changelog on version 5.2.0
 
 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 
+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.
+ - Use a helper script to link the correct database backend.
+ - Sync libtool to 2.4 version.
+ - Fix #1741 about possible problems with fnmatch
+
+07Jul11
+ - Add missing stream in bscan, fix #1749
+ - Change intmax_t to int64_t to fix #1664
+ - Fix compilation with gcc 4.6.1
 
 06Jul11
 - Add mutex priority check for changer mutex
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.2