[p4est] 03/04: Update control files for version bump, update patches

Matthias Maier tamiko-guest at moszumanska.debian.org
Tue Nov 15 21:06:25 UTC 2016 

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

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

commit 8b13709f0bea371cb5e583eefce061d76707687c
Author: Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>
Date:   Tue Nov 15 20:19:39 2016 +0000

    Update control files for version bump, update patches
---
 debian/changelog                                   |  6 ++++
 debian/control                                     |  8 ++---
 ....1.install => libp4est-1.1+git20161115.install} |  0
 ... => libp4est-1.1+git20161115.lintian-overrides} |  2 +-
 ...install => libp4est-sc-1.1+git20161115.install} |  0
 .../libp4est-sc-1.1+git20161115.lintian-overrides  |  4 +++
 debian/libp4est-sc-1.1.lintian-overrides           |  4 ---
 debian/patches/do_not_declare_library_dirty.patch  |  4 +--
 .../do_not_export_arch_dependent_config_h.patch    | 36 +++-------------------
 debian/rules                                       |  2 +-
 10 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e7b751..07100ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+p4est (1.1+git20161115-1) UNRELEASED; urgency=medium
+
+  * version bump to snapshot on 20161115 (Closes: #837058, #840776)
+
+ -- Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>  Tue, 15 Nov 2016 20:14:58 +0000
+
 p4est (1.1-3) unstable; urgency=medium
 
   * Add build-dependency on mpi-default-bin needed by openmpi 2
diff --git a/debian/control b/debian/control
index f1efbad..9b93485 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 (= ${binary:Version}),
-         libp4est-sc-1.1 (= ${binary:Version}),
+Depends: libp4est-1.1+git20161115 (= ${binary:Version}),
+         libp4est-sc-1.1+git20161115 (= ${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
+Package: libp4est-1.1+git20161115
 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
+Package: libp4est-sc-1.1+git20161115
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libp4est-1.1.install b/debian/libp4est-1.1+git20161115.install
similarity index 100%
rename from debian/libp4est-1.1.install
rename to debian/libp4est-1.1+git20161115.install
diff --git a/debian/libp4est-1.1.lintian-overrides b/debian/libp4est-1.1+git20161115.lintian-overrides
similarity index 56%
rename from debian/libp4est-1.1.lintian-overrides
rename to debian/libp4est-1.1+git20161115.lintian-overrides
index b354f39..c39d011 100644
--- a/debian/libp4est-1.1.lintian-overrides
+++ b/debian/libp4est-1.1+git20161115.lintian-overrides
@@ -1,2 +1,2 @@
 # ABI is too unstable to warrant extra work with a symbols file
-libp4est-1.1: no-symbols-control-file
+libp4est-1.1+git20161115: no-symbols-control-file
diff --git a/debian/libp4est-sc-1.1.install b/debian/libp4est-sc-1.1+git20161115.install
similarity index 100%
rename from debian/libp4est-sc-1.1.install
rename to debian/libp4est-sc-1.1+git20161115.install
diff --git a/debian/libp4est-sc-1.1+git20161115.lintian-overrides b/debian/libp4est-sc-1.1+git20161115.lintian-overrides
new file mode 100644
index 0000000..85d384d
--- /dev/null
+++ b/debian/libp4est-sc-1.1+git20161115.lintian-overrides
@@ -0,0 +1,4 @@
+# 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.lintian-overrides b/debian/libp4est-sc-1.1.lintian-overrides
deleted file mode 100644
index 1a176e6..0000000
--- a/debian/libp4est-sc-1.1.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/patches/do_not_declare_library_dirty.patch b/debian/patches/do_not_declare_library_dirty.patch
index f5d155b..dbdedc6 100644
--- a/debian/patches/do_not_declare_library_dirty.patch
+++ b/debian/patches/do_not_declare_library_dirty.patch
@@ -1,12 +1,12 @@
 diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index b6c9d41..7d0f9d7 100755
+index f1a255c..7d0f9d7 100755
 --- a/build-aux/git-version-gen
 +++ b/build-aux/git-version-gen
 @@ -141,7 +141,7 @@ v=`echo "$v" |sed 's/^v//'`
  # Don't declare a version "dirty" merely because a time stamp has changed.
  git status > /dev/null 2>&1
  
--dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+-dirty=`sh -c 'git diff-index --name-only HEAD --ignore-submodules=untracked' 2>/dev/null` || dirty=
 +dirty=
  case "$dirty" in
    '') ;;
diff --git a/debian/patches/do_not_export_arch_dependent_config_h.patch b/debian/patches/do_not_export_arch_dependent_config_h.patch
index 86a34ec..46f56e4 100644
--- a/debian/patches/do_not_export_arch_dependent_config_h.patch
+++ b/debian/patches/do_not_export_arch_dependent_config_h.patch
@@ -1,38 +1,8 @@
-diff --git a/example/p6est/p6est_vtk.c b/example/p6est/p6est_vtk.c
-index 86d0f1b..dd2df85 100644
---- a/example/p6est/p6est_vtk.c
-+++ b/example/p6est/p6est_vtk.c
-@@ -23,6 +23,7 @@
- 
- #include <p6est_vtk.h>
- #include <sc_io.h>
-+#include <endian.h>
- 
- #define P4EST_VTK_CELL_TYPE     11      /* VTK_VOXEL */
- 
-@@ -205,7 +206,7 @@ p6est_vtk_write_header (p6est_t * p6est,
- #if defined P4EST_VTK_BINARY && defined P4EST_VTK_COMPRESSION
-   fprintf (vtufile, " compressor=\"vtkZLibDataCompressor\"");
- #endif
--#ifdef SC_IS_BIGENDIAN
-+#if __BYTE_ORDER == __BIG_ENDIAN
-   fprintf (vtufile, " byte_order=\"BigEndian\">\n");
- #else
-   fprintf (vtufile, " byte_order=\"LittleEndian\">\n");
-@@ -515,7 +516,7 @@ p6est_vtk_write_header (p6est_t * p6est,
- #if defined P4EST_VTK_BINARY && defined P4EST_VTK_COMPRESSION
-     fprintf (pvtufile, " compressor=\"vtkZLibDataCompressor\"");
- #endif
--#ifdef SC_IS_BIGENDIAN
-+#if __BYTE_ORDER == __BIG_ENDIAN
-     fprintf (pvtufile, " byte_order=\"BigEndian\">\n");
- #else
-     fprintf (pvtufile, " byte_order=\"LittleEndian\">\n");
 diff --git a/sc/configure.ac b/sc/configure.ac
-index 11c4f52..69b4673 100644
+index 50199c5..e4abf38 100644
 --- a/sc/configure.ac
 +++ b/sc/configure.ac
-@@ -73,14 +73,9 @@ echo "o---------------------------------------"
+@@ -56,16 +56,9 @@ echo "o---------------------------------------"
  echo "| Checking keywords and types"
  echo "o---------------------------------------"
  
@@ -40,10 +10,12 @@ index 11c4f52..69b4673 100644
  AC_C_CONST
  AC_C_INLINE
  AC_C_RESTRICT
+-AC_CHECK_SIZEOF([int])
 -AC_CHECK_SIZEOF([long])
 -AC_CHECK_SIZEOF([long long])
 -AC_CHECK_SIZEOF([unsigned long])
 -AC_CHECK_SIZEOF([unsigned long long])
+-AC_CHECK_SIZEOF([void *])
  AC_TYPE_SIZE_T
  AC_TYPE_SSIZE_T
  
diff --git a/debian/rules b/debian/rules
index 71b6c02..42485dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_configure:
 	--enable-mpi \
 	--enable-mpiio
 
-VERSION := 1.1
+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

More information about the debian-science-commits mailing list