debian/changelog

-charls (1.1.0+dfsg-3) UNRELEASED; urgency=medium
+charls (1.1.0+dfsg-3) unstable; urgency=medium
 
   [ Mathieu Malaterre ]
   * Remove self from Uploaders
@@ -6,7 +6,15 @@ charls (1.1.0+dfsg-3) UNRELEASED; urgency=medium
   [ Jelmer Vernooij ]
   * Use secure copyright file specification URI.
 
- -- Mathieu Malaterre <malat@debian.org>  Mon, 20 Feb 2017 13:17:19 +0100
+  [ Andreas Tille ]
+  * Do not Build-Depend dpkg-dev
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+  * Remove trailing whitespace in debian/copyright
+  * Remove unneeded quilt patches
+
+ -- Andreas Tille <tille@debian.org>  Sun, 28 Oct 2018 06:49:29 +0100
 
 charls (1.1.0+dfsg-2) unstable; urgency=medium
 

debian/compat

-9
+11

debian/control

@@ -3,12 +3,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
 Uploaders: Andreas Tille <tille@debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               dpkg-dev (>= 1.18.0),
+Build-Depends: debhelper (>= 11~),
                cmake
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/charls.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/charls.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/charls
+Vcs-Git: https://salsa.debian.org/med-team/charls.git
 Homepage: https://github.com/team-charls/charls
 
 Package: libcharls-dev

debian/patches/charls_add_cmake_install_target.patch

-Description: Fix broken installation rules
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat@debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,11 @@ SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3" )
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- ENDIF(NOT CMAKE_BUILD_TYPE)
- 
-+SET( charls_HEADERS "colortransform.h"  "context.h" "decoderstrategy.h"  "encoderstrategy.h"  "interface.h"
-+    "losslesstraits.h"  "scan.h"    "streams.h" "config.h"          "contextrunmode.h"  "defaulttraits.h"
-+    "header.h"           "lookuptable.h"  "processline.h"      "util.h" "publictypes.h"
-+)
-+
- OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
- SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
- 
-@@ -21,3 +26,7 @@ add_library(CharLS header.cpp  interface
- add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
- target_link_libraries (charlstest CharLS)
- 
-+# Installs the header files into the {build_dir}/include/libcharls directory
-+install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
-+
-+

debian/patches/charls_add_sharedlib_soname.patch

-Description: Fix broken SOVERSION rules
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat@debian.org>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,8 +20,23 @@ SET( charls_HEADERS "colortransform.h"
- OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
- SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
- 
--add_library(CharLS header.cpp  interface.cpp  jpegls.cpp  )
-+# Add soname to generated shared lib
- 
-+SET(CHARLS_LIB_MAJOR_VERSION 1)
-+SET(CHARLS_LIB_MINOR_VERSION 0)
-+
-+IF(BUILD_SHARED_LIBS)
-+       add_library(CharLS SHARED header.cpp  interface.cpp  jpegls.cpp  
-+         stdafx.cpp
-+         )
-+       set_target_properties( CharLS PROPERTIES
-+                              VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION}
-+                              SOVERSION ${CHARLS_LIB_MAJOR_VERSION}
-+                              ) 
-+                            set_property(TARGET CharLS PROPERTY LINK_INTERFACE_LIBRARIES "")
-+                             
-+
-+ENDIF(BUILD_SHARED_LIBS)
- 
- add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp)
- target_link_libraries (charlstest CharLS)
-@@ -29,4 +44,8 @@ target_link_libraries (charlstest CharLS
- # Installs the header files into the {build_dir}/include/libcharls directory
- install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
- 
-+# Installs the target file (libCharLS.so) into the {build_dir}/lib directory
-+install(TARGETS CharLS LIBRARY DESTINATION lib${LIB_SUFFIX})
-+
-+
- 

debian/patches/charls_fix_tests.patch

-Description: Fix broken test
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat@debian.org>
-
---- a/defaulttraits.h
-+++ b/defaulttraits.h
-@@ -2,7 +2,7 @@
- // (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. 
- // 
- 
--
-+#include "header.h"
- #ifndef CHARLS_DEFAULTTRAITS
- #define CHARLS_DEFAULTTRAITS
- 

debian/rules

@@ -14,7 +14,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
 
 %:
-	dh $@ --parallel --buildsystem=cmake
+	dh $@ --buildsystem=cmake
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)