alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

debian: include the number of git patches in the version

Browse source 
* configure.ac, debian/changelog.in: Adjust.
* debian/source/format: Distribute this.
* Makefile.am (deb): New target.
This commit is contained in:
Alexandre Duret-Lutz 2015-02-28 18:24:43 +01:00
parent 1f0bb428b0
commit 176a7bf199
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Makefile.am
View file

@ -32,10 +32,14 @@ SUBDIRS = buddy lib src wrap ltdl iface doc $(NEVER_BENCH)
UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \ UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \
utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h
DEBIAN = debian/changelog.in debian/compat debian/control \ DEBIAN = debian/changelog debian/changelog.in debian/compat \
debian/copyright debian/docs debian/rules debian/spot-doc.docs \ debian/control debian/copyright debian/docs debian/rules \
debian/spot-doc.install debian/spot-doc.doc-base \ debian/source/format debian/spot-doc.docs debian/spot-doc.install \
debian/spot.install debian/libspot-dev.install debian/spot-doc.doc-base debian/spot.install \
debian/libspot-dev.install
debian/changelog: configure.ac
$(top_builddir)/config.status --file debian/changelog
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = HACKING ChangeLog.1 tools/gitlog-to-changelog \ EXTRA_DIST = HACKING ChangeLog.1 tools/gitlog-to-changelog \
@ -45,7 +49,7 @@ EXTRA_DIST = HACKING ChangeLog.1 tools/gitlog-to-changelog \
dist-hook: gen-ChangeLog dist-hook: gen-ChangeLog
gen_start = 2012-03-10 gen_start = 2012-03-10
.PHONY: gen-ChangeLog .PHONY: gen-ChangeLog deb
gen-ChangeLog: gen-ChangeLog:
if test -d .git; then \ if test -d .git; then \
## Generate all commits in the form "SHA1 subject" ## Generate all commits in the form "SHA1 subject"
@ -62,3 +66,13 @@ gen-ChangeLog:
rm -f $(distdir)/ChangeLog; \ rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi fi
# Build Debian packages.
# Run it with: make DEBUILDFLAGS=-j8 deb -j8
deb: dist
rm -rf spot-$(VERSION) spot-$(VERSION)$(GITPATCH)
tar zxvf spot-$(VERSION).tar.gz
mv spot-$(VERSION) spot-$(VERSION)$(GITPATCH)
tar Jcvf spot_$(VERSION)$(GITPATCH).orig.tar.xz \
spot-$(VERSION)$(GITPATCH)
cd spot-$(VERSION)$(GITPATCH) && debuild $(DEBUILDFLAGS) -us -uc

6
configure.ac
View file

@ -160,6 +160,11 @@ AC_CHECK_PROGS([SWIG], [swig3.0 swig], [swig])
AC_SUBST([CROSS_COMPILING], [$cross_compiling]) AC_SUBST([CROSS_COMPILING], [$cross_compiling])
AC_SUBST([GITPATCH], [$(if (git rev-parse) >/dev/null 2>&1; then
echo -n .
git rev-list $(git rev-list --tags --no-walk --max-count=1)..HEAD --count
fi)])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
bench/Makefile bench/Makefile
@ -173,7 +178,6 @@ AC_CONFIG_FILES([
bench/spin13/Makefile bench/spin13/Makefile
bench/wdba/Makefile bench/wdba/Makefile
bench/stutter/Makefile bench/stutter/Makefile
debian/changelog
doc/Doxyfile doc/Doxyfile
doc/Makefile doc/Makefile
doc/tl/Makefile doc/tl/Makefile

2
debian/changelog.in vendored
View file

@ -1,4 +1,4 @@
spot (@VERSION@-1) unstable; urgency=low spot (@VERSION@@GITPATCH@-1) unstable; urgency=low
* Initial release * Initial release

1
debian/source/format vendored Normal file
View file

@ -0,0 +1 @@
3.0 (quilt)