diff -Nru clxclient-3.9.0/debian/changelog clxclient-3.9.0/debian/changelog --- clxclient-3.9.0/debian/changelog 2017-02-06 06:41:21.000000000 +0000 +++ clxclient-3.9.0/debian/changelog 2018-12-16 12:08:37.000000000 +0000 @@ -1,9 +1,26 @@ -clxclient (3.9.0-4ubuntu1) zesty; urgency=medium +clxclient (3.9.0-5) unstable; urgency=medium - * debian/patches/04-makefile.patch: Move -shared after LDFLAGS to fix FTBFS - with PIE hardening. + * Team upload. - -- Logan Rosen Mon, 06 Feb 2017 01:41:21 -0500 + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + * d/control: Set Vcs-* to salsa.debian.org + * d/changelog: Remove trailing whitespaces + + [ Felipe Sateler ] + * Change maintainer address to debian-multimedia@lists.debian.org + + [ Sebastian Ramacher ] + * debian/control: + - Bump Standards-Version. + - Require binary:Version in Depends of -dev package. + - B-D on pkg-config. + * debian/rules: Include architecture.mk instead of using dpkg-architecture. + * debian/patches: Use pkg-config to handle xft and x11. Thanks to Helmut + Grohne for the initial patch. (Closes: #914554) + * debian/: Bump debhelper compat to 11 + + -- Sebastian Ramacher Sun, 16 Dec 2018 13:08:37 +0100 clxclient (3.9.0-4) unstable; urgency=medium @@ -48,13 +65,13 @@ -- Alessio Treglia Sat, 06 Jul 2013 23:49:45 +0100 clxclient (3.6.1-6) unstable; urgency=low - + * Fix symbols file (Closes: #674815) -- Jaromír Mikeš Mon, 28 May 2012 16:47:32 +0200 clxclient (3.6.1-5) unstable; urgency=low - + [ Jaromír Mikeš ] * Bump Standards * Updated copyright file to format 1.0 @@ -66,7 +83,7 @@ -- Jaromír Mikeš Tue, 08 May 2012 17:35:01 +0200 clxclient (3.6.1-4) unstable; urgency=low - + * Build with Multi-Arch * Fixed URL in watch file * Fixed Homepage @@ -96,7 +113,7 @@ -- Alessio Treglia Thu, 08 Jul 2010 10:25:38 +0200 clxclient (3.6.1-2) unstable; urgency=low - + * Reordered control file * Corrected dependency in control file * Bump to Standards-Version: 3.8.4 @@ -109,7 +126,7 @@ * Added patch descriptions * Added README.source file * Added entry for NMU to changelog - + -- Jaromír Mikeš Fri, 21 May 2010 21:55:58 +0200 clxclient (3.6.1-1.1) unstable; urgency=low @@ -129,9 +146,9 @@ * Changed architecture from "any" to "all" * Set maintainer to Debian Multimedia Maintainers * Add Vcs-Git and Vcs-Browser - * Update debian/watch + * Update debian/watch * Added debian/symbols file - + -- Free Ekanayaka Sat, 14 Mar 2009 00:55:50 +0100 clxclient (3.3.2-1) unstable; urgency=low @@ -160,4 +177,3 @@ * Initial release (Closes: #420518) -- Free Ekanayaka Sun, 22 Apr 2007 23:28:46 +0200 - diff -Nru clxclient-3.9.0/debian/compat clxclient-3.9.0/debian/compat --- clxclient-3.9.0/debian/compat 2016-12-03 19:15:25.000000000 +0000 +++ clxclient-3.9.0/debian/compat 2018-12-16 12:04:12.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru clxclient-3.9.0/debian/control clxclient-3.9.0/debian/control --- clxclient-3.9.0/debian/control 2017-02-06 06:41:21.000000000 +0000 +++ clxclient-3.9.0/debian/control 2018-12-16 12:04:17.000000000 +0000 @@ -1,29 +1,28 @@ Source: clxclient Section: sound Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: Free Ekanayaka , Alessio Treglia , Jaromír Mikeš Build-Depends: - debhelper (>= 10), + debhelper (>= 11), libasound2-dev, libclthreads-dev, libx11-dev, - libxft-dev -Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/clxclient.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/clxclient.git + libxft-dev, + pkg-config +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/multimedia-team/clxclient.git +Vcs-Browser: https://salsa.debian.org/multimedia-team/clxclient Homepage: http://kokkinizita.linuxaudio.org/linuxaudio/ Package: libclxclient-dev Section: libdevel Architecture: any Depends: - libclxclient3 (<< ${source:Upstream-Version}+1~), - libclxclient3 (>= ${source:Version}), + libclxclient3 (= ${binary:Version}), libxft-dev, ${misc:Depends} Multi-Arch: same diff -Nru clxclient-3.9.0/debian/copyright clxclient-3.9.0/debian/copyright --- clxclient-3.9.0/debian/copyright 2017-01-29 15:27:14.000000000 +0000 +++ clxclient-3.9.0/debian/copyright 2018-12-16 11:41:21.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: clxclient Upstream-Contact: Fons Adriaensen Source: http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html diff -Nru clxclient-3.9.0/debian/patches/0004-Use-pkg-config-to-handle-xft-and-x11.patch clxclient-3.9.0/debian/patches/0004-Use-pkg-config-to-handle-xft-and-x11.patch --- clxclient-3.9.0/debian/patches/0004-Use-pkg-config-to-handle-xft-and-x11.patch 1970-01-01 00:00:00.000000000 +0000 +++ clxclient-3.9.0/debian/patches/0004-Use-pkg-config-to-handle-xft-and-x11.patch 2018-12-16 12:00:39.000000000 +0000 @@ -0,0 +1,32 @@ +From: Sebastian Ramacher +Date: Sun, 16 Dec 2018 13:00:05 +0100 +Subject: Use pkg-config to handle xft and x11 + +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1a911c2..704ccee 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,15 +31,16 @@ MINVERS = 9.0 + VERSION = $(MAJVERS).$(MINVERS) + + +-CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L/usr/X11R6/$(LIBDIR) -Wl,--as-needed `freetype-config --libs` ++PKG_CONFIG ?= pkg-config ++CPPFLAGS += -pthread -Wall -I. `$(PKG_CONFIG) xft x11 --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 ++LDFLAGS += -pthread -Wl,--as-needed + LDLIBS += + + + CLXCLIENT_SO = libclxclient.so + CLXCLIENT_MAJ = $(CLXCLIENT_SO).$(MAJVERS) + CLXCLIENT_MIN = $(CLXCLIENT_MAJ).$(MINVERS) +-CLXCLIENT_DEP = -lpthread -lXft -lX11 -lclthreads ++CLXCLIENT_DEP = `$(PKG_CONFIG) xft x11 --libs` -lclthreads + CLXCLIENT_O = xdisplay.o xresman.o xhandler.o xwindow.o xdraw.o \ + button.o textip.o enumip.o menuwin.o scale.o slider.o scroll.o mclist.o meter.o + CLXCLIENT_H = clxclient.h diff -Nru clxclient-3.9.0/debian/patches/04-makefile.patch clxclient-3.9.0/debian/patches/04-makefile.patch --- clxclient-3.9.0/debian/patches/04-makefile.patch 2017-02-06 06:41:21.000000000 +0000 +++ clxclient-3.9.0/debian/patches/04-makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -46,7 +46,7 @@ - - - $(CLXCLIENT_MIN): $(CLXCLIENT_O) -- $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) -+ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) - - - install: $(CLXCLIENT_MIN) diff -Nru clxclient-3.9.0/debian/patches/series clxclient-3.9.0/debian/patches/series --- clxclient-3.9.0/debian/patches/series 2017-02-06 06:41:03.000000000 +0000 +++ clxclient-3.9.0/debian/patches/series 2018-12-16 12:00:39.000000000 +0000 @@ -1,4 +1,4 @@ 01-makefile.patch 02-makefile.patch 03-makefile.patch -04-makefile.patch +0004-Use-pkg-config-to-handle-xft-and-x11.patch diff -Nru clxclient-3.9.0/debian/rules clxclient-3.9.0/debian/rules --- clxclient-3.9.0/debian/rules 2016-12-03 19:20:03.000000000 +0000 +++ clxclient-3.9.0/debian/rules 2018-12-16 12:02:48.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +include /usr/share/dpkg/architecture.mk + export PREFIX=/usr export LIBDIR=lib/$(DEB_HOST_MULTIARCH) export DESTDIR=$(CURDIR)/debian/tmp