Skip to content

Commit

Permalink
add custom git log to debian changelog script
Browse files Browse the repository at this point in the history
  • Loading branch information
trapexit committed Aug 15, 2014
1 parent f54bb04 commit d76fa66
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 30 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@
*.lai
*.la
*.a

# Debian files
debian/files
debian/changelog
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ INSTALL = $(shell which install)
MKTEMP = $(shell which mktemp)
STRIP = $(shell which strip)
PANDOC = $(shell which pandoc)
GIT2DEBCL = ./tools/git2debcl

ifeq ($(PKGCONFIG),"")
$(error "pkg-config not installed"
Expand Down Expand Up @@ -108,7 +109,7 @@ clean:
$(FIND) -name "*~" -delete

distclean: clean
$(GIT) clean -ifd
$(GIT) clean -fd

install: $(TARGET) $(MANPAGE)
$(INSTALL) -m 0755 -D "$(TARGET)" "$(INSTALLTARGET)"
Expand Down Expand Up @@ -137,7 +138,7 @@ tarball: clean changelog man

deb:
$(eval VERSION := $(shell $(GIT) describe --always --tags --dirty))
$(GIT) dch --auto --release --new-version="$(VERSION)"
$(GIT2DEBCL) $(TARGET) $(VERSION) > debian/changelog
$(GIT) buildpackage --git-ignore-new

.PHONY: all clean install help
Expand Down
27 changes: 0 additions & 27 deletions debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion debian/files

This file was deleted.

58 changes: 58 additions & 0 deletions tools/git2debcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#!/usr/bin/python

# The MIT License (MIT)

# Copyright (c) 2014 Antonio SJ Musumeci <[email protected]>

# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:

# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

import sys
import subprocess

packagename = sys.argv[1]
version = sys.argv[2]

args = ["git", "tag", '-l']
tags = subprocess.check_output(args)
tags = tags.split()
tags.reverse()

if version in tags:
idx = tags.index(version)
tags = tags[idx:]
tags = zip(tags,tags)
else:
tags = zip(tags,tags)
tags.insert(0,(version,'HEAD'))

tag = tags[0]
for prev in tags[1:]:
print packagename, "("+tag[0]+")", "trusty;", "urgency=medium"
print

args = ['git','log','--oneline',tag[1]+'...'+prev[1]]
for line in subprocess.check_output(args).strip().split('\n'):
print " * " + line
print

args = ['git','log','-1','--format=-- %an <%ae> %cD',tag[1]]
authorandtime = subprocess.check_output(args).strip()
print ' ' + authorandtime + '\n'

tag = prev

0 comments on commit d76fa66

Please sign in to comment.