[p4est] 01/01: improve changelog, reset binary version to 1.1

[Matthias Maier]

This is an automated email from the git hooks/post-receive script.

tamiko-guest pushed a commit to branch master
in repository p4est.

commit a6dc62a3f6f1442cfc3b5a7da990bf1b3f770d3e
Author: Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>
Date:   Tue Nov 15 23:06:57 2016 +0000

    improve changelog, reset binary version to 1.1
---
 debian/changelog                                                  | 4 +++-
 debian/control                                                    | 8 ++++----
 debian/{libp4est-1.1+git20161115.install => libp4est-1.1.install} | 0
 ...t20161115.lintian-overrides => libp4est-1.1.lintian-overrides} | 2 +-
 debian/libp4est-sc-1.1+git20161115.lintian-overrides              | 4 ----
 ...ibp4est-sc-1.1+git20161115.install => libp4est-sc-1.1.install} | 0
 debian/libp4est-sc-1.1.lintian-overrides                          | 4 ++++
 debian/rules                                                      | 7 ++++---
 8 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07100ac..a303467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 p4est (1.1+git20161115-1) UNRELEASED; urgency=medium
 
-  * version bump to snapshot on 20161115 (Closes: #837058, #840776)
+  * version bump to snapshot on 20161115
+  * remove failing loadsave tests (Closes: #837058)
+  * fix compatibility with OpenMPI 2 (Closes: #840776)
 
  -- Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>  Tue, 15 Nov 2016 20:14:58 +0000
 
diff --git a/debian/control b/debian/control
index 9b93485..f1efbad 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Package: libp4est-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libp4est-1.1+git20161115 (= ${binary:Version}),
-         libp4est-sc-1.1+git20161115 (= ${binary:Version}),
+Depends: libp4est-1.1 (= ${binary:Version}),
+         libp4est-sc-1.1 (= ${binary:Version}),
          ${misc:Depends}
 Description: Algorithms for Parallel Adaptive Mesh Refinement - development files
  The p4est software library enables the dynamic management of a collection of
@@ -30,7 +30,7 @@ Description: Algorithms for Parallel Adaptive Mesh Refinement - development file
  .
  This package contains the development files.
 
-Package: libp4est-1.1+git20161115
+Package: libp4est-1.1
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -41,7 +41,7 @@ Description: Algorithms for Parallel Adaptive Mesh Refinement - shared library
  .
  This package contains the shared library.
 
-Package: libp4est-sc-1.1+git20161115
+Package: libp4est-sc-1.1
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libp4est-1.1+git20161115.install b/debian/libp4est-1.1.install
similarity index 100%
rename from debian/libp4est-1.1+git20161115.install
rename to debian/libp4est-1.1.install
diff --git a/debian/libp4est-1.1+git20161115.lintian-overrides b/debian/libp4est-1.1.lintian-overrides
similarity index 56%
rename from debian/libp4est-1.1+git20161115.lintian-overrides
rename to debian/libp4est-1.1.lintian-overrides
index c39d011..b354f39 100644
--- a/debian/libp4est-1.1+git20161115.lintian-overrides
+++ b/debian/libp4est-1.1.lintian-overrides
@@ -1,2 +1,2 @@
 # ABI is too unstable to warrant extra work with a symbols file
-libp4est-1.1+git20161115: no-symbols-control-file
+libp4est-1.1: no-symbols-control-file
diff --git a/debian/libp4est-sc-1.1+git20161115.lintian-overrides b/debian/libp4est-sc-1.1+git20161115.lintian-overrides
deleted file mode 100644
index 85d384d..0000000
--- a/debian/libp4est-sc-1.1+git20161115.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# ABI is too unstable to warrant extra work with a symbols file
-libp4est-sc-1.1+git20161115: no-symbols-control-file
-
-libp4est-sc-1.1+git20161115: package-name-doesnt-match-sonames *
diff --git a/debian/libp4est-sc-1.1+git20161115.install b/debian/libp4est-sc-1.1.install
similarity index 100%
rename from debian/libp4est-sc-1.1+git20161115.install
rename to debian/libp4est-sc-1.1.install
diff --git a/debian/libp4est-sc-1.1.lintian-overrides b/debian/libp4est-sc-1.1.lintian-overrides
new file mode 100644
index 0000000..1a176e6
--- /dev/null
+++ b/debian/libp4est-sc-1.1.lintian-overrides
@@ -0,0 +1,4 @@
+# ABI is too unstable to warrant extra work with a symbols file
+libp4est-sc-1.1: no-symbols-control-file
+
+libp4est-sc-1.1: package-name-doesnt-match-sonames *
diff --git a/debian/rules b/debian/rules
index 42485dc..3afc83e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+VERSION := 1.1
+
 include /usr/share/dpkg/pkg-info.mk
 
 export OMPI_MCA_plm_rsh_agent=/bin/false
@@ -8,8 +10,8 @@ export OMPI_MCA_plm_rsh_agent=/bin/false
 	dh $@ --with=autoreconf --parallel
 
 override_dh_autoreconf:
-	echo $(DEB_VERSION_UPSTREAM) > .tarball-version
-	echo $(DEB_VERSION_UPSTREAM) > sc/.tarball-version
+	echo $(VERSION) > .tarball-version
+	echo $(VERSION) > sc/.tarball-version
 	dh_autoreconf ./bootstrap
 
 override_dh_auto_configure:
@@ -17,7 +19,6 @@ override_dh_auto_configure:
 	--enable-mpi \
 	--enable-mpiio
 
-VERSION := 1.1+git20161115
 get-orig-source:
 	wget --no-clobber -O p4est-$(VERSION).tar.gz https://github.com/cburstedde/p4est/archive/v${VERSION}.tar.gz
 	wget --no-clobber -O libsc-$(VERSION).tar.gz https://github.com/cburstedde/libsc/archive/v${VERSION}.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/p4est.git