summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2007-10-29 23:22:59 +0000
committerAndreas Gruenbacher <agruen@suse.de>2007-10-29 23:22:59 +0000
commita8247be8982f453a617389e9ea5414546090a97b (patch)
treeff29172e54a11c321b3263f69c80a80efa2b1e5a
parent3278efea39b8c208c6fb959c648d9627548aa6d6 (diff)
downloadquilt-a8247be8982f453a617389e9ea5414546090a97b.tar.gz
- Fix `make snapshot'.
- Make the changelog file chronological.
-rw-r--r--Makefile.in14
-rw-r--r--quilt.changes20
2 files changed, 20 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in
index afe5586..f357647 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,7 +123,7 @@ SRC += changes2changelog
NON_EXEC_IN := doc/quilt.1 doc/README quilt/scripts/patchfns
-ISODATE := $(shell date +%Y-%m-%d)
+ISODATE := $(shell date +%Y%m%d)
TESTS := $(wildcard test/*.test)
DIRT += test/.depend $(wildcard test/.*.ok)
@@ -159,7 +159,7 @@ scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) \
dist : clean $(PACKAGE)-$(VERSION).tar.gz
-snapshot : $(PACKAGE)-$(ISODATE).tar.bz2
+snapshot : $(PACKAGE)-$(VERSION)_cvs$(ISODATE).tar.bz2
rpm rpmbuild : $(PACKAGE)-$(VERSION).tar.gz
$(RPMBUILD) -ta $<
@@ -234,11 +234,11 @@ $(PACKAGE)-$(VERSION).tar.gz : $(SRC) configure $(PACKAGE).spec
rm -f $(PACKAGE)-$(VERSION)
@echo "File $@ created."
-$(PACKAGE)-$(ISODATE).tar.bz2 : configure $(PACKAGE).spec
- rm -f $(PACKAGE)-$(ISODATE) $@
- ln -s . $(PACKAGE)-$(ISODATE)
- tar chf - $(+:%=$(PACKAGE)-$(ISODATE)/%) | bzip2 -9 > $@
- rm -f $(PACKAGE)-$(ISODATE)
+$(PACKAGE)-$(VERSION)_cvs$(ISODATE).tar.bz2 : $(SRC) configure $(PACKAGE).spec
+ rm -f $(PACKAGE)-$(VERSION)_cvs$(ISODATE) $@
+ ln -s . $(PACKAGE)-$(VERSION)_cvs$(ISODATE)
+ tar chf - $(+:%=$(PACKAGE)-$(VERSION)_cvs$(ISODATE)/%) | bzip2 -9 > $@
+ rm -f $(PACKAGE)-$(VERSION)_cvs$(ISODATE)
@echo "File $@ created."
$(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile
diff --git a/quilt.changes b/quilt.changes
index 923f465..3f2b77a 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Oct 30 00:24:20 CET 2007 - agruen@suse.de
+
+- Fix `make snapshot'.
+- Make the changelog file chronological again.
+
+-------------------------------------------------------------------
Mon Oct 29 20:38:25 CET 2007 - agruen@suse.de
- quilt/mail.in: Ran into a bash ``Broken pipe'' problem in
@@ -51,13 +57,6 @@ Fri Aug 10 15:16:12 CEST 2007 - agruen@suse.de
intro and patch messages.
-------------------------------------------------------------------
-Thu Aug 2 12:37:19 MDT 2007 - paul@pwsan.com
-
-- quilt mail: strip closing angle brackets from the mail sender
- address before it is inserted into the message ID. (Changed
- by agruen@suse.de.)
-
--------------------------------------------------------------------
Wed Aug 8 12:13:16 CEST 2007 - agruen@suse.de
- quilt setup: replace the --path argument with --sourcedir for
@@ -68,6 +67,13 @@ Wed Aug 8 12:13:16 CEST 2007 - agruen@suse.de
test.quiltrc.
-------------------------------------------------------------------
+Thu Aug 2 12:37:19 MDT 2007 - paul@pwsan.com
+
+- quilt mail: strip closing angle brackets from the mail sender
+ address before it is inserted into the message ID. (Changed
+ by agruen@suse.de.)
+
+-------------------------------------------------------------------
Thu Jul 26 13:53:09 CEST 2007 - agruen@suse.de
- quilt diff: don't colorize the output when the --diff=... option