diff -Nru mixer.app-1.8.0/debian/changelog mixer.app-1.8.0/debian/changelog --- mixer.app-1.8.0/debian/changelog 2012-05-01 02:38:28.000000000 +0000 +++ mixer.app-1.8.0/debian/changelog 2012-03-11 12:01:07.000000000 +0000 @@ -1,3 +1,12 @@ +mixer.app (1.8.0-5) unstable; urgency=low + + * Sync control with override: sound/optional -> gnustep/optional. + * Convert to 3.0 (quilt). + * Switch to dh, compat level (v9). + * Add -Wl,--as-needed to LDFLAGS. + + -- Andreas Metzler Sun, 11 Mar 2012 12:20:04 +0100 + mixer.app (1.8.0-4) unstable; urgency=low * revert unnecessary change for non-bug #420978 diff -Nru mixer.app-1.8.0/debian/compat mixer.app-1.8.0/debian/compat --- mixer.app-1.8.0/debian/compat 2012-05-01 02:38:28.000000000 +0000 +++ mixer.app-1.8.0/debian/compat 2012-03-11 11:29:11.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru mixer.app-1.8.0/debian/control mixer.app-1.8.0/debian/control --- mixer.app-1.8.0/debian/control 2012-05-01 02:38:28.000000000 +0000 +++ mixer.app-1.8.0/debian/control 2012-03-11 12:01:28.000000000 +0000 @@ -1,15 +1,13 @@ Source: mixer.app -Section: sound +Section: gnustep Priority: optional Maintainer: Andreas Metzler -Build-Depends: libxpm-dev, libxext-dev, libx11-dev, debhelper (>= 5.0.0) -Standards-Version: 3.7.2.2 +Build-Depends: libxpm-dev, libxext-dev, libx11-dev, debhelper (>= 9) +Standards-Version: 3.9.3 Package: mixer.app Architecture: any -Section: sound -Priority: optional -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: wmaker Description: Another mixer application designed for WindowMaker There's nothing in the program that makes it *require* WindowMaker, diff -Nru mixer.app-1.8.0/debian/manpages mixer.app-1.8.0/debian/manpages --- mixer.app-1.8.0/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ mixer.app-1.8.0/debian/manpages 2012-03-11 11:51:08.000000000 +0000 @@ -0,0 +1 @@ +debian/Mixer.app.1 diff -Nru mixer.app-1.8.0/debian/Mixer.app.1 mixer.app-1.8.0/debian/Mixer.app.1 --- mixer.app-1.8.0/debian/Mixer.app.1 2012-05-01 02:38:28.000000000 +0000 +++ mixer.app-1.8.0/debian/Mixer.app.1 2012-03-11 11:53:46.000000000 +0000 @@ -72,6 +72,6 @@ .SH AUTHOR This manual page was generated from the README shipped with the source-code -and \(lq./Mixer.app --help\(rq by Andreas Metzler +and \(lq./Mixer.app \-\-help\(rq by Andreas Metzler , for the Debian GNU/Linux system (but may be used by others). diff -Nru mixer.app-1.8.0/debian/rules mixer.app-1.8.0/debian/rules --- mixer.app-1.8.0/debian/rules 2012-05-01 02:38:28.000000000 +0000 +++ mixer.app-1.8.0/debian/rules 2012-03-11 12:00:07.000000000 +0000 @@ -1,56 +1,16 @@ #!/usr/bin/make -f -# Modified from the sample debian/rules that uses debhelper. -# GNU copyright 1998 by Marcelo Magallon. -# GNU copyright 1997 by Joey Hess. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 -CXXFLAGS = -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -CXXFLAGS += -O0 -else -CXXFLAGS += -O2 -endif +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed +override_dh_auto_clean: + rm -f Mixer.app + dh_auto_clean - -build: build-stamp -build-stamp: - dh_testdir - CXXFLAGS="$(CXXFLAGS)" $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - -$(MAKE) clean - dh_clean Mixer.app - -# Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_install: $(MAKE) X11_BINDIR=/usr/bin DESTDIR=`pwd`/debian/mixer.app install-x11 - dh_installdocs - dh_installmenu - dh_installman debian/Mixer.app.1 - dh_installchangelogs ChangeLog - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +%: + dh $@ diff -Nru mixer.app-1.8.0/debian/source/format mixer.app-1.8.0/debian/source/format --- mixer.app-1.8.0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ mixer.app-1.8.0/debian/source/format 2012-05-01 02:38:28.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru mixer.app-1.8.0/Makefile mixer.app-1.8.0/Makefile --- mixer.app-1.8.0/Makefile 2012-05-01 02:38:28.000000000 +0000 +++ mixer.app-1.8.0/Makefile 2002-09-15 16:37:33.000000000 +0000 @@ -7,8 +7,8 @@ X11_BINDIR = /usr/X11R6/bin CXX=c++ -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -LDFLAGS += -lXpm -lXext -lX11 +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include +LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 OBJECTS = Main.o Mixer.o Xpm.o