The SWORD Project

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

  1. dh-style
  2. Merge into main
Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~pkgcrosswire/sword/dh-style
Merge into: lp:sword/debian
Diff against target: 260 lines (+97/-89)
10 files modified
debian/changelog (+8/-0)
debian/clean (+1/-0)
debian/compat (+1/-1)
debian/dfsg.sh (+20/-0)
debian/diatheke.manpages (+1/-1)
debian/files.non-dfsg (+7/-0)
debian/libsword-dev.install (+0/-1)
debian/libsword8.manpages (+12/-12)
debian/rules (+45/-72)
debian/watch (+2/-2)
To merge this branch: bzr merge lp:~pkgcrosswire/sword/dh-style
Reviewer Review Type Date Requested Status
Sword Developers Pending
Review via email: mp+26079@code.launchpad.net

Description of the change

Complete ravamp of libsword packaging

* debhelper 7 with dh tiny rules style

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1sword (1.6.1+dfsg-3) UNRELEASED; urgency=low
2
3 [ Dmitrijs Ledkovs ]
4 * Revamped debian/rules to use dh tiny rules style
5 * Raised compat to debhelper 7 and change associated packaging files
6
7 -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Wed, 26 May 2010 17:11:22 +0000
8
1sword (1.6.1+dfsg-2) unstable; urgency=low9sword (1.6.1+dfsg-2) unstable; urgency=low
210
3 [ Dmitrijs Ledkovs ]11 [ Dmitrijs Ledkovs ]
412
=== 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*.1
02
=== 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 @@
1517
22
=== 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 @@
1#!/bin/sh
2format=`echo $3 | sed "s/\(.*\.\)\(.*\)/\2/"`
3newname=`echo $3 | sed "s/\(\.orig\)/\+dfsg\1/"`
4case $format in
5 gz)
6 compr=gzip
7 ;;
8 bz2)
9 compr=bzip2
10 ;;
11 lzma)
12 compr=lzma
13 ;;
14 xz)
15 compr=xz
16 ;;
17esac
18$compr -d -c $3 | tar --wildcards --delete `cat debian/files.non-dfsg` | \
19$compr -9 -f > $newname
20rm -f $3
021
=== 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 @@
1debian/diatheke.11debian/man/diatheke.1
22
=== 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 @@
1*/src/utilfuns/zlib/[a-tv-z]*
2*/src/utilfuns/zlib/uncompr.c
3*/include/zlib.h
4*/src/utilfuns/regex.c
5*/include/internal/regex/regex.h
6*/src/utilfuns/win32
7*/bindings/gsoap/include/stdsoap.h
08
=== 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 @@
1usr/include1usr/include
2usr/lib/libsword.so
3usr/lib/libsword.a2usr/lib/libsword.a
4usr/lib/pkgconfig3usr/lib/pkgconfig
54
=== 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 @@
1imp2gbs.11debian/man/imp2gbs.1
2imp2ld.12debian/man/imp2ld.1
3imp2vs.13debian/man/imp2vs.1
4installmgr.14debian/man/installmgr.1
5mod2imp.15debian/man/mod2imp.1
6addld.16debian/man/addld.1
7mkfastmod.17debian/man/mkfastmod.1
8osis2mod.18debian/man/osis2mod.1
9tei2mod.19debian/man/tei2mod.1
10vpl2mod.110debian/man/vpl2mod.1
11vs2osisref.111debian/man/vs2osisref.1
12xml2gbs.112debian/man/xml2gbs.1
1313
1414
=== 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 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2include /usr/share/cdbs/1/rules/debhelper.mk2WFLAGS := -Wall -Werror
3include /usr/share/cdbs/1/class/autotools.mk3CFLAGS = -g $(WFLAGS)
4include /usr/share/cdbs/1/rules/utils.mk 4CXXFLAGS = -g $(WFLAGS)
5include /usr/share/cdbs/1/rules/patchsys-quilt.mk5ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
66CFLAGS += -O0
7DEB_DH_INSTALL_SOURCEDIR := debian/tmp7CXXFLAGS += -O0
8DEB_CONFIGURE_EXTRA_FLAGS := --with-zlib --with-clucene=/usr --with-icu --enable-tests --enable-debug --without-internalregex8else
9DEB_DH_MAKESHLIBS_ARGS_libsword8 := -V"libsword8 (>= 1.6)"9CFLAGS += -O3
10DEB_SHLIBDEPS_INCLUDE_libsword8 := debian/tmp/usr/lib10CXXFLAGS += -O3
11DEB_SHLIBDEPS_INCLUDE_diatheke := debian/libsword8/usr/lib11endif
12DEB_DBG_PACKAGE_libsword8 := libsword-dbg12ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
13#CppUnitTestSuite - currently broken13
14#DEB_MAKE_CHECK_TARGET := check14%:
15DEB_OPT_FLAG := -g -O3 -Wall -Werror15 dh --with quilt $@
16DEB_INSTALL_CHANGELOGS_ALL = ChangeLog16override_dh_auto_configure:
1717 dh_auto_configure -- \
18build/libsword8::18 --enable-tests \
19 #Running Shell based Testsuite19 --enable-debug
20debian/man/%.1: debian/man/%.1.pod
21 pod2man --release=$$VERSION --center "" $< > $@
22override_dh_auto_build: $(basename $(wildcard debian/man/*.pod))
23 dh_auto_build --parallel
24override_dh_auto_test:
20 $(shell cd tests/testsuite && ./runall.sh 1>&2)25 $(shell cd tests/testsuite && ./runall.sh 1>&2)
21 # The next three rules use chrpath to remove unwanted rpath info 26override_dh_install:
22 # from the compiled binaries when they are built on amd64.27 chrpath -d debian/tmp/usr/bin/* debian/tmp/usr/lib/*so*
23 chrpath -d $(CURDIR)/lib/.libs/libsword.so*28 dh_install --list-missing
24 chrpath -d $(CURDIR)/utilities/.libs/*29override_dh_strip:
25 chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke30 dh_strip --dbg-package=libsword-dbg
2631override_dh_makeshlibs:
27 for file in `ls debian/*.pod`;\32 dh_makeshlibs -V"libsword8 (>= 1.6)"
28 do\33override_dh_clean:
29 base=`basename $$file .pod`;\34 dh_clean $(patsubst %.pod, %.1, $(wildcard debian/man/*.pod))
30 name=`basename $$base .1 | tr '[a-z]' '[A-Z]'`;\35
31 pod2man --release=$$VERSION --center "" -n $$name $$file > $$base;\36MAKEFILE = $(firstword $(MAKEFILE_LIST))
32 done37SOURCE_DIR = $(dir $(MAKEFILE))/..
3338get-orig-source:
34binary: list-missing39 chmod +x $(SOURCE_DIR)/debian/dfsg.sh
35 #checking for missing files40 cd $(SOURCE_DIR) && uscan --force-download --rename --destdir .
36clean/::41
37 rm -f *.142override_dh_builddeb:
3843ifeq ($(ppa),)
39# Makefile arcanery warning:44 dh_builddeb
40# $(dir $(_)) gives us the path containing this rules file.45else
41# This magic care of Emmet Hickory:46 dh_builddeb -- -Zlzma
42# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html)47endif
43
44TEMP_DIR := $(shell mktemp -d)
45SOURCE_DIR = $(shell ls $(TEMP_DIR) | grep sword- | grep .tar.gz | sed s/.tar.gz//)
46SOURCE_VER = $(shell echo $(notdir $(SOURCE_DIR)) | sed s/sword-//)
47
48download-tarball:
49 uscan --download --package sword --destdir=$(TEMP_DIR) \
50 --no-symlink --upstream-version 0 --watchfile=$(dir $(_))/watch
51 cd $(TEMP_DIR) && tar zxf sword-*.tar.gz
52
53remove-unwanted-files: download-tarball
54 # zlib is (mostly) an old copy of the zlib library
55 # Leave only untgz.c which is needed and not part of zlib
56 rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/[a-tv-z]*
57 rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/zlib/uncompr.c
58 rm $(TEMP_DIR)/$(SOURCE_DIR)/include/zlib.h
59 # regex.c and regex.h are GNU C library files
60 rm $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/regex.c
61 rm $(TEMP_DIR)/$(SOURCE_DIR)/include/internal/regex/regex.h
62 # src/utilfuns/win32/* are a non-free dirent for Windows
63 rm -r $(TEMP_DIR)/$(SOURCE_DIR)/src/utilfuns/win32
64 # stdsoap.h is non-free
65 rm $(TEMP_DIR)/$(SOURCE_DIR)/bindings/gsoap/include/stdsoap.h
66
67repack-source: remove-unwanted-files
68 cd $(TEMP_DIR) && mv $(SOURCE_DIR) $(SOURCE_DIR)+dfsg && \
69 tar zcf sword_$(SOURCE_VER)+dfsg.orig.tar.gz \
70 $(notdir $(SOURCE_DIR)+dfsg)
71
72get-orig-source: repack-source
73 mv $(TEMP_DIR)/sword_$(SOURCE_VER)+dfsg.orig.tar.gz $(CURDIR)
74 rm -r $(TEMP_DIR)
7548
=== 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 @@
1version=31version=3
2opts=dversionmangle=s/\+dfsg\d*// \2opts=dversionmangle=s/\+dfsg\d*// \
3 http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz3 http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz \
44debian ./debian/dfsg.sh

Subscribers

People subscribed via source and target branches