Merge lp:~pkgcrosswire/sword/dh-style into lp:sword/debian

[Dimitri John Ledkov]

Complete ravamp of libsword packaging

* debhelper 7 with dh tiny rules style

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-22 19:35:43 +0000
+++ debian/changelog	2010-05-26 17:17:27 +0000
@@ -1,3 +1,11 @@
+sword (1.6.1+dfsg-3) UNRELEASED; urgency=low
+  
+  [ Dmitrijs Ledkovs ]
+  * Revamped debian/rules to use dh tiny rules style
+  * Raised compat to debhelper 7 and change associated packaging files
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 26 May 2010 17:11:22 +0000
+
 sword (1.6.1+dfsg-2) unstable; urgency=low
 
   [ Dmitrijs Ledkovs ]

=== added file 'debian/clean'
--- debian/clean	1970-01-01 00:00:00 +0000
+++ debian/clean	2010-05-26 17:17:27 +0000
@@ -0,0 +1,1 @@
+*.1

=== modified file 'debian/compat'
--- debian/compat	2009-01-27 01:27:16 +0000
+++ debian/compat	2010-05-26 17:17:27 +0000
@@ -1,1 +1,1 @@
-5
+7

=== added file 'debian/dfsg.sh'
--- debian/dfsg.sh	1970-01-01 00:00:00 +0000
+++ debian/dfsg.sh	2010-05-26 17:17:27 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+format=`echo $3 | sed "s/\(.*\.\)\(.*\)/\2/"`
+newname=`echo $3 | sed "s/\(\.orig\)/\+dfsg\1/"`
+case $format in
+    gz)
+        compr=gzip
+        ;;
+    bz2)
+        compr=bzip2
+        ;;
+    lzma)
+        compr=lzma
+        ;;
+    xz)
+        compr=xz
+        ;;
+esac
+$compr -d -c $3 | tar --wildcards --delete `cat debian/files.non-dfsg` | \
+$compr -9 -f > $newname
+rm -f $3

=== modified file 'debian/diatheke.manpages'
--- debian/diatheke.manpages	2009-04-11 21:57:36 +0000
+++ debian/diatheke.manpages	2010-05-26 17:17:27 +0000
@@ -1,1 +1,1 @@
-debian/diatheke.1
+debian/man/diatheke.1

=== added file 'debian/files.non-dfsg'
--- debian/files.non-dfsg	1970-01-01 00:00:00 +0000
+++ debian/files.non-dfsg	2010-05-26 17:17:27 +0000
@@ -0,0 +1,7 @@
+*/src/utilfuns/zlib/[a-tv-z]*
+*/src/utilfuns/zlib/uncompr.c
+*/include/zlib.h
+*/src/utilfuns/regex.c
+*/include/internal/regex/regex.h
+*/src/utilfuns/win32
+*/bindings/gsoap/include/stdsoap.h

=== modified file 'debian/libsword-dev.install'
--- debian/libsword-dev.install	2009-09-08 19:48:21 +0000
+++ debian/libsword-dev.install	2010-05-26 17:17:27 +0000
@@ -1,4 +1,3 @@
 usr/include
-usr/lib/libsword.so
 usr/lib/libsword.a
 usr/lib/pkgconfig

=== modified file 'debian/libsword8.manpages'
--- debian/libsword8.manpages	2009-04-24 08:10:52 +0000
+++ debian/libsword8.manpages	2010-05-26 17:17:27 +0000
@@ -1,13 +1,13 @@
-imp2gbs.1
-imp2ld.1
-imp2vs.1
-installmgr.1
-mod2imp.1
-addld.1
-mkfastmod.1
-osis2mod.1
-tei2mod.1
-vpl2mod.1
-vs2osisref.1
-xml2gbs.1
+debian/man/imp2gbs.1
+debian/man/imp2ld.1
+debian/man/imp2vs.1
+debian/man/installmgr.1
+debian/man/mod2imp.1
+debian/man/addld.1
+debian/man/mkfastmod.1
+debian/man/osis2mod.1
+debian/man/tei2mod.1
+debian/man/vpl2mod.1
+debian/man/vs2osisref.1
+debian/man/xml2gbs.1
 

=== added directory 'debian/man'
=== renamed file 'debian/addld.1.pod' => 'debian/man/addld.1.pod'
=== renamed file 'debian/diatheke.1' => 'debian/man/diatheke.1'
=== renamed file 'debian/imp2gbs.1.pod' => 'debian/man/imp2gbs.1.pod'
=== renamed file 'debian/imp2ld.1.pod' => 'debian/man/imp2ld.1.pod'
=== renamed file 'debian/imp2vs.1.pod' => 'debian/man/imp2vs.1.pod'
=== renamed file 'debian/installmgr.1.pod' => 'debian/man/installmgr.1.pod'
=== renamed file 'debian/mkfastmod.1.pod' => 'debian/man/mkfastmod.1.pod'
=== renamed file 'debian/mod2imp.1.pod' => 'debian/man/mod2imp.1.pod'
=== renamed file 'debian/osis2mod.1.pod' => 'debian/man/osis2mod.1.pod'
=== renamed file 'debian/tei2mod.1.pod' => 'debian/man/tei2mod.1.pod'
=== renamed file 'debian/vpl2mod.1.pod' => 'debian/man/vpl2mod.1.pod'
=== renamed file 'debian/vs2osisref.1.pod' => 'debian/man/vs2osisref.1.pod'
=== renamed file 'debian/xml2gbs.1.pod' => 'debian/man/xml2gbs.1.pod'
=== modified file 'debian/rules'
--- debian/rules	2010-03-22 19:17:56 +0000
+++ debian/rules	2010-05-26 17:17:27 +0000
@@ -1,74 +1,47 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu --enable-tests --enable-debug --without-internalregex
-DEB_DH_MAKESHLIBS_ARGS_libsword8 := -V"libsword8 (>= 1.6)"
-DEB_SHLIBDEPS_INCLUDE_libsword8 := debian/tmp/usr/lib
-DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword8/usr/lib
-DEB_DBG_PACKAGE_libsword8 := libsword-dbg
-#CppUnitTestSuite - currently broken
-#DEB_MAKE_CHECK_TARGET := check
-DEB_OPT_FLAG := -g -O3 -Wall -Werror
-DEB_INSTALL_CHANGELOGS_ALL = ChangeLog
-
-build/libsword8::
-	#Running Shell based Testsuite
+WFLAGS   := -Wall -Werror
+CFLAGS    = -g $(WFLAGS)
+CXXFLAGS  = -g $(WFLAGS)
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS   += -O0
+CXXFLAGS += -O0
+else
+CFLAGS   += -O3
+CXXFLAGS += -O3
+endif
+ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
+
+%:
+	dh --with quilt $@
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	--enable-tests \
+	--enable-debug
+debian/man/%.1: debian/man/%.1.pod
+	pod2man --release=$$VERSION --center "" $< > $@
+override_dh_auto_build: $(basename $(wildcard debian/man/*.pod))
+	dh_auto_build --parallel
+override_dh_auto_test:
 	$(shell cd tests/testsuite && ./runall.sh 1>&2)
-	# The next three rules use chrpath to remove unwanted rpath info 
-	# from the compiled binaries when they are built on amd64.
-	chrpath -d $(CURDIR)/lib/.libs/libsword.so*
-	chrpath -d $(CURDIR)/utilities/.libs/*
-	chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke
-
-	for file in `ls debian/*.pod`;\
-	do\
-		base=`basename $$file .pod`;\
-		name=`basename $$base .1 | tr '[a-z]' '[A-Z]'`;\
-		pod2man --release=$$VERSION --center "" -n $$name $$file > $$base;\
-	done
-
-binary: list-missing
-	#checking for missing files
-clean/::
-	rm -f *.1
-
-# Makefile arcanery warning:
-# $(dir $(_)) gives us the path containing this rules file.
-# This magic care of Emmet Hickory:
-# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html)
-
-TEMP_DIR := $(shell mktemp -d)
-SOURCE_DIR = $(shell ls $(TEMP_DIR) | grep sword- | grep .tar.gz | sed s/.tar.gz//)
-SOURCE_VER = $(shell echo $(notdir $(SOURCE_DIR)) | sed s/sword-//)
-
-download-tarball:
-	uscan --download --package sword --destdir=$(TEMP_DIR) \
-	      --no-symlink --upstream-version 0 --watchfile=$(dir $(_))/watch
-	cd $(TEMP_DIR) && tar zxf sword-*.tar.gz
-
-remove-unwanted-files: download-tarball
-	# zlib is (mostly) an old copy of the zlib library
-	# Leave only untgz.c which is needed and not part of zlib
-	rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/[a-tv-z]*
-	rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/uncompr.c
-	rm $(TEMP_DIR)/$(SOURCE_DIR)/include/zlib.h
-	# regex.c and regex.h are GNU C library files
-	rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/regex.c
-	rm $(TEMP_DIR)/$(SOURCE_DIR)/include/internal/regex/regex.h
-	# src/utilfuns/win32/* are a non-free dirent for Windows 
-	rm -r $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/win32
-	# stdsoap.h is non-free
-	rm $(TEMP_DIR)/$(SOURCE_DIR)/bindings/gsoap/include/stdsoap.h
-
-repack-source: remove-unwanted-files
-	cd $(TEMP_DIR) && mv $(SOURCE_DIR) $(SOURCE_DIR)+dfsg && \
-		tar zcf sword_$(SOURCE_VER)+dfsg.orig.tar.gz \
-		$(notdir $(SOURCE_DIR)+dfsg)
-
-get-orig-source: repack-source
-	mv $(TEMP_DIR)/sword_$(SOURCE_VER)+dfsg.orig.tar.gz $(CURDIR)
-	rm -r $(TEMP_DIR)
+override_dh_install:
+	chrpath -d debian/tmp/usr/bin/* debian/tmp/usr/lib/*so*
+	dh_install --list-missing
+override_dh_strip:
+	dh_strip --dbg-package=libsword-dbg
+override_dh_makeshlibs:
+	dh_makeshlibs -V"libsword8 (>= 1.6)"
+override_dh_clean:
+	dh_clean $(patsubst %.pod, %.1, $(wildcard debian/man/*.pod))
+
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+SOURCE_DIR = $(dir $(MAKEFILE))/..
+get-orig-source:
+	chmod +x $(SOURCE_DIR)/debian/dfsg.sh
+	cd $(SOURCE_DIR) && uscan --force-download --rename --destdir .
+
+override_dh_builddeb:
+ifeq ($(ppa),)
+	dh_builddeb
+else
+	dh_builddeb -- -Zlzma
+endif

=== modified file 'debian/watch'
--- debian/watch	2010-01-22 02:41:29 +0000
+++ debian/watch	2010-05-26 17:17:27 +0000
@@ -1,4 +1,4 @@
 version=3
 opts=dversionmangle=s/\+dfsg\d*// \
-  http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz
-
+  http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz \
+debian ./debian/dfsg.sh