diff -Nru alure-1.2/debian/changelog alure-1.2/debian/changelog --- alure-1.2/debian/changelog 2021-01-01 23:12:04.000000000 +0000 +++ alure-1.2/debian/changelog 2021-01-04 02:08:34.000000000 +0000 @@ -1,9 +1,18 @@ -alure (1.2-6.1) unstable; urgency=medium +alure (1.2-7) unstable; urgency=low - * Non maintainer upload by the Reproducible Builds team. - * No source change upload to rebuild on buildd with .buildinfo files. + * Team upload - -- Holger Levsen Sat, 02 Jan 2021 00:12:04 +0100 + [ Ansgar Burchardt ] + * debian/control: Remove DM-Upload-Allowed. + + [ Bastian Germann ] + * Disable DYNLOAD which causes problems (Closes: #960707) + * Enable modplug without patch + * Patch: Link FLAC correctly + * Remove unneeded lintian overrides + * debian/control: Set Vcs-* to salsa + + -- Bastian Germann Mon, 04 Jan 2021 03:08:34 +0100 alure (1.2-6) unstable; urgency=low diff -Nru alure-1.2/debian/control alure-1.2/debian/control --- alure-1.2/debian/control 2012-05-27 10:34:53.000000000 +0000 +++ alure-1.2/debian/control 2021-01-04 02:08:34.000000000 +0000 @@ -2,14 +2,13 @@ Priority: optional Maintainer: Debian Games Team Uploaders: Andres Mejia , Tobias Hansen -DM-Upload-Allowed: yes Build-Depends: debhelper (>= 8.1.3~), cmake, libopenal-dev, libsndfile-dev, libvorbis-dev, libflac-dev, libmpg123-dev, libdumb1-dev, libfluidsynth-dev, libmodplug-dev, Standards-Version: 3.9.3 Section: libs -Vcs-Git: git://anonscm.debian.org/pkg-games/alure.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/alure.git +Vcs-Git: https://salsa.debian.org/games-team/alure.git +Vcs-Browser: https://salsa.debian.org/games-team/alure Homepage: http://kcat.strangesoft.net/alure.html Package: libalure-dev @@ -44,7 +43,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: ${shlibs:Recommends} Description: AL Utilities REtooled (shared library) ALURE is a utility library to help manage common tasks with OpenAL applications. This includes device enumeration and initialization, file diff -Nru alure-1.2/debian/patches/enable-modplug.patch alure-1.2/debian/patches/enable-modplug.patch --- alure-1.2/debian/patches/enable-modplug.patch 2012-05-27 10:34:53.000000000 +0000 +++ alure-1.2/debian/patches/enable-modplug.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Patch to set modplug support on by default. -Origin: http://anonscm.debian.org/gitweb/?p=pkg-games/alure.git;a=tree;f=debian/patches - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -169,7 +169,7 @@ - OPTION(FLAC "FLAC support (for FLAC and Ogg FLAC)" ON) - OPTION(MPG123 "MPG123 support (for MP1/MP2/MP3)" ON) - OPTION(DUMB "DUMB support (for IT/XM/S3M/MOD)" ON) --OPTION(MODPLUG "ModPlug support (for IT/XM/S3M/MOD)" OFF) -+OPTION(MODPLUG "ModPlug support (for IT/XM/S3M/MOD)" ON) - OPTION(FLUIDSYNTH "FluidSynth support (for MID)" ON) - - IF(WIN32) diff -Nru alure-1.2/debian/patches/Link-FLAC-correctly.patch alure-1.2/debian/patches/Link-FLAC-correctly.patch --- alure-1.2/debian/patches/Link-FLAC-correctly.patch 1970-01-01 00:00:00.000000000 +0000 +++ alure-1.2/debian/patches/Link-FLAC-correctly.patch 2021-01-04 02:08:34.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Link FLAC correctly +Origin: http://repo.or.cz/alure.git/commit/6934c17f9ace7fc19ea94623dab0a4b37d11a879 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -286,7 +286,7 @@ IF(FLAC) + SET(ALURE_OBJS ${ALURE_OBJS} src/codec_flac.cpp) + ENDIF(HAS_FLAC) + ELSE(FLAC) +- SET(LIBFLAC_LIBRARIES "") ++ SET(FLAC_LIBRARIES "") + ENDIF(FLAC) + + # MPG123 support +@@ -387,7 +387,7 @@ ENDIF(FLUIDSYNTH) + + + IF(NOT DYNLOAD) +- SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${LIBFLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS}) ++ SET(EXTRA_LIBS ${SNDFILE_LIBRARIES} ${VORBISFILE_LIBRARIES} ${FLAC_LIBRARIES} ${MPG123_LIBRARIES} ${DUMB_LIBRARIES} ${MODPLUG_LIBRARIES} ${FLUIDSYNTH_LIBRARIES} ${EXTRA_LIBS}) + ELSE(NOT DYNLOAD) + ADD_DEFINITIONS(-DDYNLOAD=1) + ENDIF(NOT DYNLOAD) diff -Nru alure-1.2/debian/patches/link-libdumb.so.1.patch alure-1.2/debian/patches/link-libdumb.so.1.patch --- alure-1.2/debian/patches/link-libdumb.so.1.patch 2012-05-27 10:34:53.000000000 +0000 +++ alure-1.2/debian/patches/link-libdumb.so.1.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Patch to correct libdumb library to dlopen. -Origin: http://anonscm.debian.org/gitweb/?p=pkg-games/alure.git;a=tree;f=debian/patches - ---- a/src/codec_dumb.cpp -+++ b/src/codec_dumb.cpp -@@ -93,7 +93,7 @@ - #elif defined(__APPLE__) - #define DUMB_LIB "libdumb.dylib" - #else --#define DUMB_LIB "libdumb.so" -+#define DUMB_LIB "libdumb.so.1" - #endif - - dumb_handle = OpenLib(DUMB_LIB); diff -Nru alure-1.2/debian/patches/series alure-1.2/debian/patches/series --- alure-1.2/debian/patches/series 2012-05-27 10:35:57.000000000 +0000 +++ alure-1.2/debian/patches/series 2021-01-04 02:08:34.000000000 +0000 @@ -1,4 +1,3 @@ -enable-modplug.patch compiler-flags-change.patch -link-libdumb.so.1.patch fix-build-with-gcc-4.7.patch +Link-FLAC-correctly.patch diff -Nru alure-1.2/debian/rules alure-1.2/debian/rules --- alure-1.2/debian/rules 2012-05-27 10:34:53.000000000 +0000 +++ alure-1.2/debian/rules 2021-01-04 02:08:34.000000000 +0000 @@ -15,6 +15,8 @@ # Use this variable to allow options passed to cmake to be overridable DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DDYNLOAD=OFF \ + -DMODPLUG=ON \ -DCMAKE_BUILD_TYPE=$(TYPE) \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ @@ -39,8 +41,6 @@ override_dh_shlibdeps: debian/tmp/alure-dummy.so dh_shlibdeps -O--parallel - # Need to manually add dependencies for dlopened libs. - dpkg-shlibdeps -dRecommends -edebian/tmp/alure-dummy.so -xlibc6 -O >>debian/libalure1.substvars debian/tmp/alure-dummy.so: mkdir -p debian/tmp diff -Nru alure-1.2/debian/source/lintian-overrides alure-1.2/debian/source/lintian-overrides --- alure-1.2/debian/source/lintian-overrides 2012-05-27 10:34:53.000000000 +0000 +++ alure-1.2/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# Ignore this since only debhelper (>= 8.1.3~) is needed for multiarch -package-needs-versioned-debhelper-build-depends