From: John Wright Date: Sat, 15 May 2010 01:22:18 +0000 (-0600) Subject: Update debhelper compatibility level to 7 and use dh X-Git-Tag: 0.97.7-3~5 X-Git-Url: http://git.johnwright.org/?p=fmit.git;a=commitdiff_plain;h=e11ccfe5893365ffef44407a23b56600fa451e45 Update debhelper compatibility level to 7 and use dh --- diff --git a/debian/changelog b/debian/changelog index 257b234..9c7d177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ fmit (0.97.7-3) UNRELEASED; urgency=low * Change Build-Depends on fftw3-dev to libfftw3-dev, to avoid depending on a virtual package * Upgrade to "3.0 (quilt)" source format + * Update debhelper compatibility level to 7 and use dh -- John Wright Fri, 18 Jan 2008 17:12:25 -0700 diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index d610041..9097ef8 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fmit Section: sound Priority: optional Maintainer: John Wright -Build-Depends: debhelper (>= 4), autotools-dev, libqt3-mt-dev, libfftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev +Build-Depends: debhelper (>= 7.0.50), autotools-dev, libqt3-mt-dev, libfftw3-dev, freeglut3-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev Standards-Version: 3.7.3 Homepage: http://home.gna.org/fmit/ Vcs-Hg: http://debian.johnwright.org/hg/fmit @@ -10,7 +10,7 @@ Vcs-Browser: http://debian.johnwright.org/hg/fmit Package: fmit Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Free Music Instrument Tuner fmit is a graphical utility for tuning your musical instruments, with error and volume history and advanced features like waveform shape, diff --git a/debian/fmit.install b/debian/fmit.install deleted file mode 100644 index f7177e8..0000000 --- a/debian/fmit.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/share diff --git a/debian/rules b/debian/rules index 4186fec..d0b7def 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) # Disable Alsa on non-Linux architectures ifneq (,$(findstring $(DEB_HOST_ARCH_OS), kfreebsd hurd)) @@ -22,100 +7,8 @@ else DEB_CONFIGURE_ALSA = --enable-alsa endif +%: + dh $@ -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_testdir - # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-Qt-dir=/usr/share/qt3 $(DEB_CONFIGURE_ALSA) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/fmit.sgml > fmit.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - rm -f $(CURDIR)/config.sub $(CURDIR)/config.guess - - # If we're not in a mercurial repository, make sure no hg metadata is - # lying around - if ! [ -d .hg ]; then \ - rm -f .hg*; \ - fi - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - -# 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_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_configure: + dh_auto_configure -- --with-Qt-dir=/usr/share/qt3 $(DEB_CONFIGURE_ALSA)