summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-03-29 10:40:31 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-03-29 10:42:36 +0200
commit6eca46160316017961e1738603a7647752b210f0 (patch)
tree85b139705e75f350756d6074be480cf7ec3fb81c
parent38179d4377a85a0d77cfe5dfe2e5680c0f531179 (diff)
downloadgnutls-6eca46160316017961e1738603a7647752b210f0.tar.gz
Simplified the generation of ChangeLog [ci skip]
Removed the dependency on git2cl and utilize git log directly. git2cl seems to provide incorrect output. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--.clcopying7
-rw-r--r--README.md5
-rw-r--r--cfg.mk3
3 files changed, 3 insertions, 12 deletions
diff --git a/.clcopying b/.clcopying
deleted file mode 100644
index c0366afaf4..0000000000
--- a/.clcopying
+++ /dev/null
@@ -1,7 +0,0 @@
- -----
-
- Copyright (C) 2005-2012 Free Software Foundation, Inc.
-
- Copying and distribution of this file, with or without
- modification, are permitted provided the copyright notice
- and this notice are preserved.
diff --git a/README.md b/README.md
index 9f3b11b03a..1c3fc122f5 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,6 @@ We require several tools to check out and build the software, including:
* [Libidn2](https://www.gnu.org/software/libidn/#libidn2) (optional, for internationalization of DNS, IDNA 2008)
* [Libunistring](http://www.gnu.org/software/libunistring/) (optional, for internationalization)
* [AWK](http://www.gnu.org/software/awk/) (for make dist, pmccabe2html)
-* [git2cl](http://savannah.nongnu.org/projects/git2cl/) (for make dist, ChangeLog)
* [bison](http://www.gnu.org/software/bison) (for datetime parser in certtool)
* [libunbound](https://unbound.net/) (for DANE support)
* [abi-compliance-checker](http://ispras.linuxbase.org/index.php/ABI_compliance_checker) (for make dist)
@@ -56,7 +55,7 @@ Debian/Ubuntu:
```
apt-get install -y git-core autoconf libtool gettext autopoint
apt-get install -y automake autogen nettle-dev libp11-kit-dev libtspi-dev libunistring-dev
-apt-get install -y guile-2.0-dev libtasn1-6-dev libidn11-dev gawk gperf git2cl
+apt-get install -y guile-2.0-dev libtasn1-6-dev libidn11-dev gawk gperf
apt-get install -y libunbound-dev dns-root-data bison help2man gtk-doc-tools
apt-get install -y texinfo texlive texlive-generic-recommended texlive-extra-utils
```
@@ -65,7 +64,7 @@ Fedora/RHEL:
```
yum install -y git autoconf libtool gettext-devel automake autogen
yum install -y nettle-devel p11-kit-devel autogen-libopts-devel libunistring-devel
-yum install -y trousers-devel guile-devel libtasn1-devel libidn-devel gawk gperf git2cl
+yum install -y trousers-devel guile-devel libtasn1-devel libidn-devel gawk gperf
yum install -y libtasn1-tools unbound-devel bison help2man gtk-doc texinfo texlive
```
diff --git a/cfg.mk b/cfg.mk
index cb86baaa91..251956d90d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -120,8 +120,7 @@ clang-copy:
# Release
ChangeLog:
- git log --pretty --numstat --summary --since="2014 November 07" -- | git2cl > ChangeLog
- cat .clcopying >> ChangeLog
+ git log --no-merges --no-decorate --pretty --since="2014 November 07"|grep -v ^'commit' > ChangeLog
tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`