Convert to short-hand dh and to 3.0 (quilt) format

6 files changed, 15 insertions, 58 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7df3fd2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
diff --git a/debian/control b/debian/control
index 01669aa..0292186 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,14 @@ Priority: extra
 Maintainer: Debian TTS team <tts-project@lists.alioth.debian.org>
 Uploaders:
  Paul Gevers <elbrus@debian.org>,
-Standards-Version: 3.9.5
+Standards-Version: 4.1.2
 Build-Depends:
  debhelper (>= 9),
- quilt,
 
 Package: festvox-suopuhe-lj
 Architecture: all
 Depends:
- festival (>= 1.4.3-9),
+ festival,
  festvox-suopuhe-common,
  ${misc:Depends},
 Recommends:
diff --git a/debian/festvox-suopuhe-common.docs b/debian/festvox-suopuhe-common.docs
new file mode 100644
index 0000000..680c917
--- /dev/null
+++ b/debian/festvox-suopuhe-common.docs
@@ -0,0 +1 @@
+lib/voices/finnish/suo_fi_lj_diphone/README.lj
diff --git a/debian/festvox-suopuhe-lj.links b/debian/festvox-suopuhe-lj.links
new file mode 100644
index 0000000..335e73d
--- /dev/null
+++ b/debian/festvox-suopuhe-lj.links
@@ -0,0 +1 @@
+usr/share/festival/voices/finnish/suopuhe.common usr/share/festival/voices/finnish/suo_fi_lj_diphone/festvox
diff --git a/debian/rules b/debian/rules
index da28a4d..4c6fcd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,58 +1,19 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+README=lib/voices/finnish/suo_fi_lj_diphone/README.lj
 
-PACKAGE=festvox-suopuhe-lj
-COMMON=festvox-suopuhe-common
-ORIGNAME=suo_fi_lj_diphone
+%:
+	dh ${@}
 
-build: patch
-# Nothing to do.
-
-build-arch: build
-build-indep: build
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-# Build architecture-dependent files here.
-binary-arch: build
-# We have nothing to do.
-
-# Build architecture-independent files here.
-binary-indep: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs -p ${PACKAGE} usr/share/festival/voices/finnish/${ORIGNAME}/group
-
-	# "search-for-voices" in /usr/share/festival/voices.scm ignores directories containing '.'
-	dh_installdirs -p ${COMMON}  usr/share/festival/voices/finnish/suopuhe.common
-
-	dh_install -p ${PACKAGE}
-	dh_install -p ${COMMON}
-
-	dh_link -p ${PACKAGE} usr/share/festival/voices/finnish/suopuhe.common \
-                              usr/share/festival/voices/finnish/${ORIGNAME}/festvox
-	dh_installdocs -p ${PACKAGE}
-	dh_installdocs -p ${COMMON}
+override_dh_auto_clean:
+	if [ -f $(README).org ] ; then mv $(README).org $(README) ; fi
+	dh_auto_clean
 
+override_dh_auto_build:
+	dh_auto_build
 	# recode the upstream README into UTF-8
-	iconv -f ISO-8859-1 -t UTF-8 \
-		lib/voices/finnish/suo_fi_lj_diphone/README.lj \
-		-o debian/${COMMON}/usr/share/doc/festvox-suopuhe-common/README.lj
-
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+	if [ ! -f $(README).org ] ; then cp -p $(README) $(README).org ; fi
+	iconv -f ISO-8859-1 -t UTF-8 $(README).org -o $(README)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)