Package: gkrellm-volume Version: 2.1.13-1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for gkrellm-volume (versioned as 2.1.13-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- WBR, wRAR
diff -Nru gkrellm-volume-2.1.13/debian/changelog gkrellm-volume-2.1.13/debian/changelog --- gkrellm-volume-2.1.13/debian/changelog 2016-11-20 22:13:01.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/changelog 2016-11-20 19:32:28.000000000 +0500 @@ -1,3 +1,14 @@ +gkrellm-volume (2.1.13-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update packaging to modern standards (Closes: #800295, #817340). + * Add Homepage. + * Enable all hardening options. + * Enable -Wl,--as-needed. + * Disable unconditional stripping (Closes: #437034). + + -- Andrey Rahmatullin <[email protected]> Sun, 20 Nov 2016 19:32:28 +0500 + gkrellm-volume (2.1.13-1) unstable; urgency=medium * New upstream release diff -Nru gkrellm-volume-2.1.13/debian/compat gkrellm-volume-2.1.13/debian/compat --- gkrellm-volume-2.1.13/debian/compat 1970-01-01 05:00:00.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/compat 2016-11-20 19:32:28.000000000 +0500 @@ -0,0 +1 @@ +10 diff -Nru gkrellm-volume-2.1.13/debian/control gkrellm-volume-2.1.13/debian/control --- gkrellm-volume-2.1.13/debian/control 2016-11-20 22:13:01.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/control 2016-11-20 19:32:28.000000000 +0500 @@ -2,13 +2,14 @@ Section: sound Priority: optional Maintainer: Sjoerd Simons <[email protected]> -Build-Depends: debhelper (>> 3.0.0), gkrellm (>= 2.0.0), libgtk2.0-dev, libasound2-dev -Standards-Version: 3.5.7 +Build-Depends: debhelper (>= 10), gkrellm (>= 2.0.0), libgtk2.0-dev, libasound2-dev +Standards-Version: 3.9.8 +Homepage: http://gkrellm.luon.net/volume.php Package: gkrellm-volume Architecture: any Conflicts: gkrellm-volume2 Replaces: gkrellm-volume2 -Depends: ${shlibs:Depends}, gkrellm (>= 2.0.0) +Depends: ${shlibs:Depends}, gkrellm (>= 2.0.0), ${misc:Depends} Description: A mixer plugin for GKrellM This GKrellM plugin allows you to control the mixer of your soundcard. diff -Nru gkrellm-volume-2.1.13/debian/patches/fix-makefile.patch gkrellm-volume-2.1.13/debian/patches/fix-makefile.patch --- gkrellm-volume-2.1.13/debian/patches/fix-makefile.patch 1970-01-01 05:00:00.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/patches/fix-makefile.patch 2016-11-20 19:32:28.000000000 +0500 @@ -0,0 +1,33 @@ +Description: Honor $LDFLAGS, don't strip the binary +Author: Andrey Rahmatullin <[email protected]> +Last-Update: 2016-11-20 + +Index: gkrellm-volume-2.1.13/Makefile +=================================================================== +--- gkrellm-volume-2.1.13.orig/Makefile ++++ gkrellm-volume-2.1.13/Makefile +@@ -16,7 +16,7 @@ GTK_LIB = `$(GTK_CONFIG) --libs` + + FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) +-LFLAGS = -shared ++LDFLAGS += -shared + + OBJS = volume.o mixer.o oss_mixer.o + +@@ -34,13 +34,13 @@ endif + CC = gcc $(CFLAGS) $(FLAGS) + + INSTALL = install -c +-INSTALL_PROGRAM = $(INSTALL) -s ++INSTALL_PROGRAM = $(INSTALL) + + all: volume.so + (cd po && ${MAKE} all ) + + volume.so: $(OBJS) +- $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) ++ $(CC) $(LDFLAGS) $(OBJS) -o volume.so $(LIBS) + + clean: + rm -f *.o core *.so* *.bak *~ diff -Nru gkrellm-volume-2.1.13/debian/patches/series gkrellm-volume-2.1.13/debian/patches/series --- gkrellm-volume-2.1.13/debian/patches/series 1970-01-01 05:00:00.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/patches/series 2016-11-20 19:32:28.000000000 +0500 @@ -0,0 +1 @@ +fix-makefile.patch diff -Nru gkrellm-volume-2.1.13/debian/rules gkrellm-volume-2.1.13/debian/rules --- gkrellm-volume-2.1.13/debian/rules 2016-11-20 22:13:01.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/rules 2016-11-20 19:32:28.000000000 +0500 @@ -1,96 +1,15 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS=hardening=+all -# This is the debhelper compatibility version to use. -export DH_COMPAT=3 +%: + dh $@ +override_dh_auto_build: + dh_auto_build -- enable_nls=1 enable_alsa=1 - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) enable_nls=1 enable_alsa=1 - LOCALEDIR=$(CURDIR)/debian/gkrellm-volume/usr/share/locale - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/gkrellm-volume2. - make install \ - PLUGIN_DIR=$(CURDIR)/debian/gkrellm-volume/usr/lib/gkrellm2/plugins \ - LOCALEDIR=$(CURDIR)/debian/gkrellm-volume/usr/share/locale \ - enable_nls=1 - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installman -# dh_installinfo -# dh_undocumented - dh_installchangelogs Changelog - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_install: + dh_auto_install -- enable_nls=1 \ + PLUGIN_DIR=$(CURDIR)/debian/gkrellm-volume/usr/lib/gkrellm2/plugins \ + LOCALEDIR=$(CURDIR)/debian/gkrellm-volume/usr/share/locale diff -Nru gkrellm-volume-2.1.13/debian/source/format gkrellm-volume-2.1.13/debian/source/format --- gkrellm-volume-2.1.13/debian/source/format 1970-01-01 05:00:00.000000000 +0500 +++ gkrellm-volume-2.1.13/debian/source/format 2016-11-20 19:32:28.000000000 +0500 @@ -0,0 +1 @@ +3.0 (quilt)
signature.asc
Description: PGP signature
