re-mark 1.29b-2 as not yet uploaded (merge madness!)

[debian/tar] / Make.rules

diff --git a/Make.rules b/Make.rules
index 09ad1c1c3a120922b20131e288cb39fbef05138d..a454459f89a27222ea272460c5a8eeddc1358943 100644 (file)
--- a/Make.rules
+++ b/Make.rules
@@ -1,26 +1,6 @@
 # This file is part of GNU paxutils
 #
-# Copyright (c) 2009 Free Software Foundation, Inc.
-#
-# Written by Sergey Poznyakoff
-#
-# GNU Paxutils is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any later
-# version.
-#
-# GNU Paxutils is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose.  see the gnu general
-# public license for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with GNU Paxutils; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file is part of GNU paxutils
-#
-# Copyright (c) 2009 Free Software Foundation, Inc.
+# Copyright (c) 2009, 2014 Free Software Foundation, Inc.
 #
 # Written by Sergey Poznyakoff
 #
@@ -39,9 +19,10 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Define the following variables in order to use the ChangeLog rule below:
-#  prev_change_log  [optional]  Name of the previous ChangeLog file.
-#  gen_start_date   [optional]  Start ChangeLog from this date. 
-#  changelog_dir    [mandatory] Directory where to create ChangeLog
+#  prev_change_log      [optional]  Name of the previous ChangeLog file.
+#  gen_start_date       [optional]  Start ChangeLog from this date. 
+#  changelog_dir        [mandatory] Directory where to create ChangeLog
+#  changelog_amend_file [optional]  Amendment file
 
 .PHONY: ChangeLog
 ChangeLog: 
@@ -50,6 +31,9 @@ ChangeLog:
          if test -n "$(gen_start_date)"; then                             \
            cmd="$$cmd --since=\"$(gen_start_date)\"";                     \
          fi;                                                              \
+         if test -n "$(changelog_amend_file)"; then                       \
+           cmd="$$cmd --amend=$(changelog_amend_file)";                   \
+         fi;                                                              \
          $$cmd --format='%s%n%n%b%n' |                                    \
             sed '/<unknown>$$/d' | fmt -s > $(changelog_dir)/cl-t;         \
           if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \