[med-svn] [dcmtk] 03/05: Update alignof patch

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository dcmtk.

commit 71fd75785922beb5d83567a6f2e32a17d0fa7c2f
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Jul 3 13:15:47 2016 +0000

    Update alignof patch
---
 debian/changelog                                              |  3 ++-
 .../patches/04_Fixed-OFoptional-by-introducing-OFalign.patch  | 11 +----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b810f9d..c39cc59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-dcmtk (3.6.1~20160216-2) UNRELEASED; urgency=medium
+dcmtk (3.6.1~20160216-2) unstable; urgency=medium
 
   * d/p/08: remove SYSTEM_PROCESSOR usage for reproducible builds 
   * d/p/09: add patch to enable compileing against openssl-1.1
     Closes: #828281
+  * d/p/04: update patch to remove duplicate entries
 
  -- Gert Wollny <gw.fossdev at gmail.com>  Thu, 26 May 2016 15:47:40 +0000
 
diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index c03769d..84d18e3 100644
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -19,19 +19,10 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 
 --- a/CMake/osconfig.h.in
 +++ b/CMake/osconfig.h.in
-@@ -1137,4 +1137,16 @@
+@@ -1137,4 +1137,7 @@
  /* The path on the Android device that should be used for temporary files */
  #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
  
-+/* Define if the compiler supports __alignof__ */
-+#cmakedefine HAVE_GNU_ALIGNOF
-+
-+/* Define if the compiler supports __alignof */
-+#cmakedefine HAVE_MS_ALIGNOF
-+
-+/* Define if the compiler supports __attribute__(aligned) */
-+#cmakedefine HAVE_ATTRIBUTE_ALIGNED
-+
 +/* Define if the compiler supports __declspec(align) */
 +#cmakedefine HAVE_DECLSPEC_ALIGN
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git