diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | .gitignore | 42 | ||||
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | bin/.cvsignore | 2 | ||||
| -rw-r--r-- | compat/.cvsignore | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/.cvsignore | 1 | ||||
| -rw-r--r-- | doc/.cvsignore | 1 | ||||
| -rwxr-xr-x | git-desc | 9 | ||||
| -rw-r--r-- | lib/.cvsignore | 1 | ||||
| -rw-r--r-- | po/.cvsignore | 1 | ||||
| -rw-r--r-- | quilt/.cvsignore | 30 | ||||
| -rw-r--r-- | quilt/scripts/.cvsignore | 1 | ||||
| -rw-r--r-- | test/.cvsignore | 2 |
14 files changed, 59 insertions, 58 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 055caa7..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -README build-stamp configure-stamp quilt.spec *.tar.gz configure Makefile autom4te.cache config.log config.status diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dbc0590 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +autom4te.cache/ +build-stamp +config.log +config.status +configure +configure-stamp +Makefile +quilt.spec +README +quilt-*.tar.bz2 + +bin/guards +bin/guards.1 +bin/patch-wrapper +bin/quilt + +debian/files +debian/quilt +debian/quilt.substvars + +doc/quilt.1 +doc/quilt.aux +doc/quilt.dvi +doc/quilt.log +doc/quilt.ps +doc/README + +lib/backup-files + +po/*.mo + +quilt/* +!quilt/*.in + +quilt/scripts/* +!quilt/scripts/*.in + +compat/* +!compat/*.in + +test/.*.ok +test/.depend diff --git a/Makefile.in b/Makefile.in index 4787464..f0300a2 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) +GIT_DESC := $(shell ./git-desc) TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) DIRT += test/.depend $(wildcard test/.*.ok) @@ -164,7 +164,7 @@ publish : dist scp $(PACKAGE)-$(VERSION).tar.gz{,.sig} \ dl.sv.nongnu.org:/releases/quilt/ -snapshot : $(PACKAGE)-$(VERSION)_cvs$(ISODATE).tar.bz2 +snapshot : $(PACKAGE)-$(GIT_DESC).tar.bz2 rpm rpmbuild : $(PACKAGE)-$(VERSION).tar.gz $(RPMBUILD) -ta $< @@ -239,11 +239,11 @@ $(PACKAGE)-$(VERSION).tar.gz : $(SRC) configure $(PACKAGE).spec rm -f $(PACKAGE)-$(VERSION) @echo "File $@ created." -$(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) +$(PACKAGE)-$(GIT_DESC).tar.bz2 : $(SRC) configure $(PACKAGE).spec + rm -f $(PACKAGE)-$(GIT_DESC) $@ + ln -s . $(PACKAGE)-$(GIT_DESC) + tar chf - $(+:%=$(PACKAGE)-$(GIT_DESC)/%) | bzip2 -9 > $@ + rm -f $(PACKAGE)-$(GIT_DESC) @echo "File $@ created." $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile diff --git a/bin/.cvsignore b/bin/.cvsignore deleted file mode 100644 index cceeec4..0000000 --- a/bin/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -quilt guards.1 guards -patch-wrapper diff --git a/compat/.cvsignore b/compat/.cvsignore deleted file mode 100644 index e85c848..0000000 --- a/compat/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -awk -bash -column -date -diffstat -getopt -mktemp -rpmbuild -sed -sendmail diff --git a/configure.ac b/configure.ac index 1a6e1af..026a36c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([quilt],[0.47],[quilt-dev@nongnu.org]) +AC_INIT([quilt],[0.48],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) AC_REVISION ($Revision: 1.84 $) diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index f9bde02..0000000 --- a/debian/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -files quilt quilt.substvars diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index fca2547..0000000 --- a/doc/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -quilt.1 quilt.dvi quilt.ps README quilt.aux quilt.log diff --git a/git-desc b/git-desc new file mode 100755 index 0000000..b5dd0c5 --- /dev/null +++ b/git-desc @@ -0,0 +1,9 @@ +#! /bin/sh + +tag=$(git describe --tags HEAD 2> /dev/null || \ + git rev-parse --short HEAD) +dirty=$(git update-index --refresh --unmerged > /dev/null + if git diff-index --name-only HEAD | read dummy; then + echo -dirty + fi) +echo $tag$dirty diff --git a/lib/.cvsignore b/lib/.cvsignore deleted file mode 100644 index d672ac5..0000000 --- a/lib/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -apatch backup-files rpatch patchfns parse-patch spec2series diff --git a/po/.cvsignore b/po/.cvsignore deleted file mode 100644 index 19e4435..0000000 --- a/po/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*~ *.mo diff --git a/quilt/.cvsignore b/quilt/.cvsignore deleted file mode 100644 index ebb7ff9..0000000 --- a/quilt/.cvsignore +++ /dev/null @@ -1,30 +0,0 @@ -add -annotate -applied -delete -diff -edit -files -fold -fork -graph -grep -header -import -mail -new -next -patches -pop -previous -push -refresh -remove -rename -revert -series -setup -snapshot -top -unapplied -upgrade diff --git a/quilt/scripts/.cvsignore b/quilt/scripts/.cvsignore deleted file mode 100644 index ba1dbb8..0000000 --- a/quilt/scripts/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -dependency-graph edmail inspect parse-patch patchfns remove-trailing-ws diff --git a/test/.cvsignore b/test/.cvsignore deleted file mode 100644 index 30cd2b7..0000000 --- a/test/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.*.ok -.depend |