Update debian packages (more compliant to policy)

diff --git a/Makefile b/Makefile
index 4a8193482b489661dc561f284db2ca698fc4f319..ef12f9e2ddc633d43a68716ac9307d15330de8fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ install: all
        $(INSTALL) -m 644 ptabtools.pc $(DESTDIR)$(pkgconfigdir)
        $(INSTALL) -d $(DESTDIR)$(datadir)
        $(INSTALL) -m 644 ptbxml2musicxml.xsl $(DESTDIR)$(datadir)
+       $(INSTALL) -m 644 ptbxml.dtd $(DESTDIR)$(datadir)
 
 test: all ptb2ptb
        $(MAKE) -C tests

diff --git a/configure.in b/configure.in
index f72dd43877d613dea62e687d09fe31131cb7d675..2282c5c0513eb44c9f8390bf53c942a4e9b9f1d4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
+AC_PREREQ(2.50)
 AC_INIT(ptabtools, 0.4.2, [jelmer@samba.org])
 AC_CONFIG_SRCDIR([ptb.c])
 AC_CONFIG_HEADER([config.h])

diff --git a/debian/control b/debian/control
index 7b72494ef6c57283493c436f5c82760987390dd9..e2e7eb6faf787972cc1c98646e21ad96b1764d4b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.6.1.0
-Build-Depends: debmake, libxml2-dev, libxslt1-dev, libpopt-dev
+Build-Depends: debmake, libxml2-dev, libxslt1-dev, libpopt-dev, debhelper (>> 4.0.0)
 
 Package: libptb0
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index ae1f9488b6c6100c28a184976e1b0affb62634cd..68b61bb783ddc89231737ff17c370b178b4b39b0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,24 @@ Sun,  9 May 2004 22:20:20 +0200.
 
 It was downloaded from http://jelmer.vernstok.nl/oss/ptabtools/
 
-Copyright: 2005 by Jelmer Vernooij <jelmer@samba.org>
+Author: Jelmer Vernooij <jelmer@samba.org>
 
-License: GNU General Public License 
+Copyright:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ See /usr/share/common-licenses/LGPL-2 on your debian system.
 
-<Must follow here>

diff --git a/debian/docs b/debian/ptabtools.docs
similarity index 100%
rename from debian/docs
rename to debian/ptabtools.docs

diff --git a/debian/ptabtools.files b/debian/ptabtools.files
index d0f844f544d3206277ffcf5127520ed3a6947818..6bf635b9af2196e16601040054894957b81bc1ff 100644 (file)
--- a/debian/ptabtools.files
+++ b/debian/ptabtools.files
@@ -1,7 +1,15 @@
 usr/bin/ptb2ly
+usr/share/man/man1/ptb2ly.1
 usr/bin/ptb2ascii
+usr/share/man/man1/ptb2ascii.1
 usr/bin/gp2ly
+usr/share/man/man1/gp2ly.1
 usr/bin/ptbdict
+usr/share/man/man1/ptbdict.1
 usr/bin/ptb2abc
+usr/share/man/man1/ptb2abc.1
 usr/bin/ptb2xml
+usr/share/man/man1/ptb2xml.1
 usr/bin/ptbinfo
+usr/share/man/man1/ptbinfo.1
+usr/share/ptabtools/*

diff --git a/debian/rules b/debian/rules
index e9d6251a303683c7a68753f020365f32262300d5..715d74288d937ac5df017f7f7cd2d288b06acc08 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -4,51 +4,62 @@
 
 package=ptabtools
 
-build: configure
-       $(checkdir)
+build: build-stamp
+build-stamp:
+       dh_testdir
+       ./autogen.sh
        ./configure --prefix=/usr
        $(MAKE)
-       touch build
+       touch $@
 
-configure:
-       $(checkdir)
-       ./autogen.sh
-       rm -rf autom4te.cache
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       $(MAKE) install DESTDIR=debian/tmp
+       dh_movefiles
 
 clean:
-       $(checkdir)
-       rm -f build
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp
        -$(MAKE) clean
-       rm -f `find . -name "*~"`
-       rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
-       rm -f debian/*substvars
+       rm -rf autom4te.cache
+       dh_clean
+
+binary-indep: build install
+       dh_testdir -i
+       dh_testroot -i
+       dh_installdocs -i
+       dh_installchangelogs -i ChangeLog
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
-binary-indep: checkroot build
-       $(checkdir)
 # There are no architecture-independent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
 
-binary-arch: checkroot build
-       $(checkdir)
-       rm -rf debian/tmp `find debian/* -type d ! -name CVS`
-       install -d debian/tmp
-       cd debian/tmp && install -d `cat ../dirs`
-       $(MAKE) install DESTDIR=`pwd`/debian/tmp prefix=/usr
-       debstd ChangeLog README TODO 
-       dpkg-gencontrol -isp -pptabtools
-       chown -R root:root debian/tmp
-       chmod -R go=rX debian/tmp
-       dpkg --build debian/tmp ..
-
-define checkdir
-       test -f debian/rules
-endef
-
-binary: binary-indep binary-arch
-
-checkroot:
-       $(checkdir)
-       test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+binary-arch: build install
+       dh_testdir -a
+       dh_testroot -a
+       dh_installchangelogs -a ChangeLog
+       dh_installdocs -a
+       dh_installman -a
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_makeshlibs -plibptb0
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
+
+binary: binary-arch # binary-indep
+
+.PHONY: binary binary-arch binary-indep clean