[med-svn] [Git][med-team/charls][master] 7 commits: Do not Build-Depend dpkg-dev
Andreas Tille
gitlab at salsa.debian.org
Sun Oct 28 05:52:12 GMT 2018
Andreas Tille pushed to branch master at Debian Med / charls
Commits:
963142e6 by Andreas Tille at 2018-10-27T22:43:33Z
Do not Build-Depend dpkg-dev
- - - - -
0dd112bc by Andreas Tille at 2018-10-28T05:42:45Z
debhelper 11
- - - - -
d4f116e1 by Andreas Tille at 2018-10-28T05:42:52Z
Point Vcs fields to salsa.debian.org
- - - - -
bc66fe29 by Andreas Tille at 2018-10-28T05:42:52Z
Standards-Version: 4.2.1
- - - - -
d752cb00 by Andreas Tille at 2018-10-28T05:42:52Z
Remove trailing whitespace in debian/copyright
- - - - -
235b0410 by Andreas Tille at 2018-10-28T05:48:03Z
Remove unneeded quilt patches
- - - - -
694d62a0 by Andreas Tille at 2018-10-28T05:50:53Z
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- − debian/patches/charls_add_cmake_install_target.patch
- − debian/patches/charls_add_sharedlib_soname.patch
- − debian/patches/charls_fix_tests.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-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 at 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 at debian.org> Sun, 28 Oct 2018 06:49:29 +0100
charls (1.1.0+dfsg-2) unstable; urgency=medium
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
@@ -3,12 +3,11 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at 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/copyright
=====================================
@@ -21,28 +21,28 @@ Copyright: © 2011-2012 Mathieu Malaterre <malat at debian.org>
License: BSD-3-clause
License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
+ Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
- * Redistributions of source code must retain the above copyright notice, this
+ * Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
- * Neither the name of my employer, nor the names of its contributors may be
- used to endorse or promote products derived from this software without
+ * Neither the name of my employer, nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
specific prior written permission.
.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=====================================
debian/patches/charls_add_cmake_install_target.patch deleted
=====================================
@@ -1,26 +0,0 @@
-Description: Fix broken installation rules
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at 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 deleted
=====================================
@@ -1,40 +0,0 @@
-Description: Fix broken SOVERSION rules
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at 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 deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix broken test
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at 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)
View it on GitLab: https://salsa.debian.org/med-team/charls/compare/d49e56cdf08263943b2829cbb23fd7e46149ba06...694d62a05da2e7154d625cae26db9f8b5904bc4a
--
View it on GitLab: https://salsa.debian.org/med-team/charls/compare/d49e56cdf08263943b2829cbb23fd7e46149ba06...694d62a05da2e7154d625cae26db9f8b5904bc4a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181028/c6ceedad/attachment-0001.html>
More information about the debian-med-commit
mailing list