From eacd4d1dcbd0a0d06a01b757864a714ebac5f9be Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Fri, 24 Jul 2015 11:58:34 +0200 Subject: Set proper version information based on git-tags. Use this information with the newly added debian packaging files. TODO: changelog/author stuff Signed-off-by: Olliver Schinagl --- .gitignore | 3 +++ configure.ac | 5 +++-- packaging/Makefile.am | 2 +- packaging/debian/Makefile.am | 6 ++++++ packaging/debian/changelog | 0 packaging/debian/compat | 1 + packaging/debian/control | 15 +++++++++++++++ packaging/debian/copyright | 1 + packaging/debian/rules | 3 +++ packaging/debian/source/format | 1 + 10 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 packaging/debian/Makefile.am create mode 100644 packaging/debian/changelog create mode 100644 packaging/debian/compat create mode 100644 packaging/debian/control create mode 100644 packaging/debian/copyright create mode 100755 packaging/debian/rules create mode 100644 packaging/debian/source/format diff --git a/.gitignore b/.gitignore index ee1c9d7..c664136 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,6 @@ po/stamp-po /src/tests/skeleton_tests.* /src/tests/test-suite.log /src/tests/check-results.xml + +# for now, ignore the generated changelog file +packaging/debian/changelog diff --git a/configure.ac b/configure.ac index cc967d4..da5e488 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -EFL_VERSION([0], [0], [1], [dev]) -AC_INIT([eulogium], [efl_version], [support@ultimaker.com], [], [http://www.ultimaker.com]) +EFL_VERSION([1], [8], [5]) +AC_INIT([eulogium], [m4_esyscmd_s([git describe --always --tags --abbrev=1 --dirty])], [support@ultimaker.com], [], [http://www.ultimaker.com]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([configure.ac]) @@ -72,6 +72,7 @@ data/themes/ulticontroller_2.0/Makefile doc/Makefile packaging/Makefile packaging/slackware/Makefile +packaging/debian/Makefile packaging/pkgbuild/Makefile po/Makefile.in src/Makefile diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 47eb174..c72f279 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -1,4 +1,4 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = slackware pkgbuild +SUBDIRS = slackware pkgbuild debian diff --git a/packaging/debian/Makefile.am b/packaging/debian/Makefile.am new file mode 100644 index 0000000..4c3ea39 --- /dev/null +++ b/packaging/debian/Makefile.am @@ -0,0 +1,6 @@ +MAINTAINERCLEANFILES = Makefile.in + +EXTRA_DIST = changelog compat control copyright Makefile.am rules source/format +dist-hook: + chmod u+w $(distdir)/changelog + printf "eulogium (${VERSION}) UNRELEASED; urgency=low\n\n * Initial release.\n\n -- Olliver Schinagl `date -R`\n" date -R > changelog diff --git a/packaging/debian/changelog b/packaging/debian/changelog new file mode 100644 index 0000000..e69de29 diff --git a/packaging/debian/compat b/packaging/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/packaging/debian/compat @@ -0,0 +1 @@ +9 diff --git a/packaging/debian/control b/packaging/debian/control new file mode 100644 index 0000000..921f248 --- /dev/null +++ b/packaging/debian/control @@ -0,0 +1,15 @@ +Source: eulogium +Maintainer: Olliver Schinagl +Section: misc +Priority: optional +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9) +#libelementary +#libeeze + +Package: eulogium +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Ultimaker Jedi HMI + Eulogium is the Human Machine Intererface part of griffin, + the printer controller. diff --git a/packaging/debian/copyright b/packaging/debian/copyright new file mode 100644 index 0000000..f712806 --- /dev/null +++ b/packaging/debian/copyright @@ -0,0 +1 @@ +SPDX-License-Identifier: AGPL-3.0+ diff --git a/packaging/debian/rules b/packaging/debian/rules new file mode 100755 index 0000000..7f478e0 --- /dev/null +++ b/packaging/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ --parallel diff --git a/packaging/debian/source/format b/packaging/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/packaging/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v0.12