diff -Nru libvshadow-20190323/debian/changelog libvshadow-20190323/debian/changelog --- libvshadow-20190323/debian/changelog 2020-11-19 17:33:41.000000000 +0000 +++ libvshadow-20190323/debian/changelog 2021-01-27 09:03:41.000000000 +0000 @@ -1,8 +1,21 @@ -libvshadow (20190323-1.1build1) hirsute; urgency=medium +libvshadow (20190323-2) unstable; urgency=medium - * No-change rebuild to build with python3.9 as default. + [ Samuel Henrique ] + * Configure git-buildpackage for Debian - -- Matthias Klose Thu, 19 Nov 2020 18:33:41 +0100 + [ Debian Janitor ] + * Use secure copyright file specification URI. + * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse. + * Update standards version to 4.5.0, no changes needed. + * Remove Section on libvshadow1 that duplicates source. + * Update watch file format version to 4. + * Use cross-build compatible macro for finding pkg-config. + + [ Sébastien Delafond ] + * Disable memory tests on riscv-64 (Closes: #978530) + + -- Sebastien Delafond Wed, 27 Jan 2021 10:03:41 +0100 libvshadow (20190323-1.1) unstable; urgency=low diff -Nru libvshadow-20190323/debian/compat libvshadow-20190323/debian/compat --- libvshadow-20190323/debian/compat 2020-01-18 22:13:38.000000000 +0000 +++ libvshadow-20190323/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libvshadow-20190323/debian/control libvshadow-20190323/debian/control --- libvshadow-20190323/debian/control 2020-01-18 22:13:38.000000000 +0000 +++ libvshadow-20190323/debian/control 2021-01-27 09:03:41.000000000 +0000 @@ -2,11 +2,12 @@ Priority: optional Maintainer: Debian Security Tools Uploaders: Hilko Bengen -Build-Depends: debhelper (>= 11~), dh-python, +Build-Depends: debhelper-compat (= 11), + dh-python, pkg-config, libbfio-dev, libfuse-dev, python3-dev, -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Section: libs Homepage: https://github.com/libyal/libvshadow Vcs-Git: https://salsa.debian.org/pkg-security-team/libvshadow.git @@ -26,7 +27,6 @@ This package includes the development support files. Package: libvshadow1 -Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} diff -Nru libvshadow-20190323/debian/copyright libvshadow-20190323/debian/copyright --- libvshadow-20190323/debian/copyright 2020-01-18 22:13:38.000000000 +0000 +++ libvshadow-20190323/debian/copyright 2021-01-27 09:03:41.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libvshadow Source: https://github.com/libyal/libvshadow diff -Nru libvshadow-20190323/debian/gbp.conf libvshadow-20190323/debian/gbp.conf --- libvshadow-20190323/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ libvshadow-20190323/debian/gbp.conf 2021-01-27 09:03:41.000000000 +0000 @@ -0,0 +1,15 @@ +[DEFAULT] +debian-branch = debian/master +pristine-tar = True + +[buildpackage] +sign-tags = True + +[import-orig] +filter-pristine-tar = True + +[pq] +patch-numbers = False + +[dch] +multimaint-merge = True diff -Nru libvshadow-20190323/debian/patches/ac-path-pkgconfig.patch libvshadow-20190323/debian/patches/ac-path-pkgconfig.patch --- libvshadow-20190323/debian/patches/ac-path-pkgconfig.patch 1970-01-01 00:00:00.000000000 +0000 +++ libvshadow-20190323/debian/patches/ac-path-pkgconfig.patch 2021-01-27 09:03:41.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Use cross-build compatible macro for finding pkg-config. + . + The package uses AC_PATH_PROG to discover the location of pkg-config(1). This + macro fails to select the correct version to support cross-compilation. + . + This patch changes it to use AC_PATH_TOOL. + . + Refer to https://bugs.debian.org/884798 for details. +Origin: other +Last-Update: 2020-12-28 + +=== modified file 'configure.ac' +--- a/configure.ac 2019-04-21 19:38:30 +0000 ++++ b/configure.ac 2020-12-28 14:30:49 +0000 +@@ -29,7 +29,7 @@ + AC_SUBST(LIBTOOL_DEPS) + + dnl Check for pkg-config +-AC_PATH_PROG(PKGCONFIG,[pkg-config]) ++AC_PATH_TOOL(PKGCONFIG,[pkg-config]) + + dnl Support of internationalization (i18n) + AM_GNU_GETTEXT([external]) + diff -Nru libvshadow-20190323/debian/patches/disable-memory-tests-on-riscv64.patch libvshadow-20190323/debian/patches/disable-memory-tests-on-riscv64.patch --- libvshadow-20190323/debian/patches/disable-memory-tests-on-riscv64.patch 1970-01-01 00:00:00.000000000 +0000 +++ libvshadow-20190323/debian/patches/disable-memory-tests-on-riscv64.patch 2021-01-27 09:03:41.000000000 +0000 @@ -0,0 +1,11 @@ +--- libvshadow/tests/vshadow_test_memory.h.bak 2021-01-27 10:03:29.402870743 +0100 ++++ libvshadow/tests/vshadow_test_memory.h 2021-01-27 10:03:39.910709967 +0100 +@@ -28,7 +28,7 @@ + extern "C" { + #endif + +-#if defined( HAVE_GNU_DL_DLSYM ) && defined( __GNUC__ ) && !defined( LIBVSHADOW_DLL_IMPORT ) && !defined( __arm__ ) && !defined( __clang__ ) && !defined( __CYGWIN__ ) && !defined( __hppa__ ) && !defined( __mips__ ) && !defined( __sparc__ ) && !defined( HAVE_ASAN ) ++#if defined( HAVE_GNU_DL_DLSYM ) && defined( __GNUC__ ) && !defined( LIBVSHADOW_DLL_IMPORT ) && !defined( __arm__ ) && !defined( __clang__ ) && !defined( __CYGWIN__ ) && !defined( __hppa__ ) && !defined( __mips__ ) && !defined( __sparc__ ) && !defined( __riscv ) && !defined( HAVE_ASAN ) + #define HAVE_VSHADOW_TEST_MEMORY 1 + #endif + diff -Nru libvshadow-20190323/debian/patches/series libvshadow-20190323/debian/patches/series --- libvshadow-20190323/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libvshadow-20190323/debian/patches/series 2021-01-27 09:03:41.000000000 +0000 @@ -0,0 +1,2 @@ +ac-path-pkgconfig.patch +disable-memory-tests-on-riscv64.patch diff -Nru libvshadow-20190323/debian/upstream/metadata libvshadow-20190323/debian/upstream/metadata --- libvshadow-20190323/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libvshadow-20190323/debian/upstream/metadata 2021-01-27 09:03:41.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/libyal/libvshadow/issues +Bug-Submit: https://github.com/libyal/libvshadow/issues/new +Repository: https://github.com/libyal/libvshadow.git +Repository-Browse: https://github.com/libyal/libvshadow diff -Nru libvshadow-20190323/debian/watch libvshadow-20190323/debian/watch --- libvshadow-20190323/debian/watch 2020-01-18 22:13:38.000000000 +0000 +++ libvshadow-20190323/debian/watch 2021-01-27 09:03:41.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 https://github.com/libyal/libvshadow/releases /.*/libvshadow-.*-(.*)\.tar\.gz