diff -Nru cuneiform-1.1.0+dfsg/debian/changelog cuneiform-1.1.0+dfsg/debian/changelog --- cuneiform-1.1.0+dfsg/debian/changelog 2012-04-24 18:16:22.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/changelog 2014-08-18 11:48:09.000000000 +0000 @@ -1,3 +1,25 @@ +cuneiform (1.1.0+dfsg-5) unstable; urgency=low + + * QA upload. + * Orphan the package. Set Maintainer to Debian QA Group. + * Update debian/watch to use the HTTPS protocol. + * Bump standards version to 3.9.5 (no changes needed). + * Don't use dh_testdir; instead, use makefile rules to ensure that + debian/rules can be only run in the correct directory. + * Force .debian.tar compression to bz2, to match .orig.tar compression. + * Improve the get-orig-source target: + + Use the POSIX 1003.1-1988 (ustar) format for tarballs. + + Create temporary directory in /tmp. + + Use “dpkg-parsechangelog -SVersion” to acquire the package version. + * Improve DEP-8 tests: + + Remove “Features: no-build-needed”; it's the default now. + + Add tests that run adequate(1) against the packages. + * Use dh-buildinfo: + + Update debian/rules. + + Add the package to Build-Depends. + + -- Jakub Wilk Mon, 18 Aug 2014 13:48:04 +0200 + cuneiform (1.1.0+dfsg-4) unstable; urgency=low * Improve the test suite: diff -Nru cuneiform-1.1.0+dfsg/debian/control cuneiform-1.1.0+dfsg/debian/control --- cuneiform-1.1.0+dfsg/debian/control 2012-04-23 22:12:22.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/control 2014-08-18 11:43:57.000000000 +0000 @@ -1,10 +1,12 @@ Source: cuneiform Section: non-free/graphics Priority: optional -Maintainer: Jakub Wilk -Build-Depends: debhelper (>= 8.1.3), dpkg-dev (>= 1.16), cmake (>= 2.8.2), - libgraphicsmagick++1-dev, pkg-config -Standards-Version: 3.9.3 +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 8.1.3), dh-buildinfo, + dpkg-dev (>= 1.16), + cmake (>= 2.8.2), + libgraphicsmagick++1-dev, pkg-config +Standards-Version: 3.9.5 Homepage: http://launchpad.net/cuneiform-linux/ XS-Autobuild: yes diff -Nru cuneiform-1.1.0+dfsg/debian/get-orig-source.sh cuneiform-1.1.0+dfsg/debian/get-orig-source.sh --- cuneiform-1.1.0+dfsg/debian/get-orig-source.sh 2011-11-14 16:09:14.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/get-orig-source.sh 2014-04-06 18:26:54.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh set -e -export TAR_OPTIONS="--owner root --group root --mode a+rX" +export TAR_OPTIONS="--owner root --group root --mode a+rX --format ustar" pwd=$(pwd) version="$1" if [ -z "$version" ] @@ -9,7 +9,7 @@ exit 1 fi cd "$(dirname "$0")/../" -tmpdir=$(mktemp -d get-orig-source.XXXXXX) +tmpdir=$(mktemp -d -t cuneiform.get-orig-source.XXXXXX) uscan --noconf --force-download --rename --download-version="$version" --destdir="$tmpdir" cd "$tmpdir" tar -xjf cuneiform_*.orig.tar.bz2 diff -Nru cuneiform-1.1.0+dfsg/debian/rules cuneiform-1.1.0+dfsg/debian/rules --- cuneiform-1.1.0+dfsg/debian/rules 2012-04-23 21:54:34.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/rules 2014-08-18 11:43:57.000000000 +0000 @@ -1,8 +1,5 @@ #!/usr/bin/make -f -here = $(dir $(firstword $(MAKEFILE_LIST)))/.. -upstream_version = $(shell cd $(here) && dpkg-parsechangelog | sed -n -r -e '/^Version: ([0-9.]+)([+]dfsg).*/ { s//\1/; p; q; }') - DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) @@ -41,18 +38,15 @@ build-arch: obj/build-stamp obj/test-stamp -obj/CMakeCache.txt: - dh_testdir +obj/CMakeCache.txt: CMakeLists.txt mkdir -p obj cd obj && cmake .. $(cmake_options) obj/build-stamp: obj/CMakeCache.txt - dh_testdir $(MAKE) $(parallel) -C obj touch $(@) -obj/test-stamp: - dh_testdir +obj/test-stamp: obj/build-stamp ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" "" CF_DATADIR=$(CURDIR)/datafiles/ debian/tests/ground-truth obj/cuneiform endif @@ -67,7 +61,6 @@ binary: binary-arch binary-indep binary-arch: build-arch - dh_testdir dh_testroot dh_prep -a $(MAKE) -C obj install DESTDIR=$(CURDIR)/debian/tmp/ @@ -77,6 +70,7 @@ dh_install -a dh_installdocs -a dh_installchangelogs -a + dh_buildinfo -a dh_installman -a dh_compress -a dh_fixperms -a @@ -89,12 +83,12 @@ dh_builddeb -a -- -Zxz binary-indep: build-indep - dh_testdir dh_testroot dh_prep -i -X tmp dh_install -i dh_installdocs -i dh_installchangelogs -i + dh_buildinfo -a dh_compress -i dh_fixperms -i dh_installdeb -i @@ -107,13 +101,15 @@ .PHONY: clean clean: - dh_testdir dh_clean rm -rf obj # get-orig-source target # ====================== +here = $(dir $(firstword $(MAKEFILE_LIST)))/.. +upstream_version = $(shell cd $(here) && dpkg-parsechangelog -SVersion | sed -r -e 's/([0-9.]+).*/\1/') + .PHONY: get-orig-source get-orig-source: sh $(here)/debian/get-orig-source.sh $(upstream_version) diff -Nru cuneiform-1.1.0+dfsg/debian/source/options cuneiform-1.1.0+dfsg/debian/source/options --- cuneiform-1.1.0+dfsg/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/source/options 2014-01-25 23:08:25.000000000 +0000 @@ -0,0 +1 @@ +compression = bzip2 diff -Nru cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform --- cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform 1970-01-01 00:00:00.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform 2014-04-07 13:03:18.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +exec adequate cuneiform >&2 diff -Nru cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform-common cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform-common --- cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform-common 1970-01-01 00:00:00.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/tests/adequate-cuneiform-common 2014-04-07 13:03:50.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +exec adequate cuneiform-common >&2 diff -Nru cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform0 cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform0 --- cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform0 1970-01-01 00:00:00.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform0 2014-04-07 13:04:03.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +exec adequate libcuneiform0 >&2 diff -Nru cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform-dev cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform-dev --- cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform-dev 1970-01-01 00:00:00.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/tests/adequate-libcuneiform-dev 2014-04-07 13:03:56.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +exec adequate libcuneiform-dev >&2 diff -Nru cuneiform-1.1.0+dfsg/debian/tests/control cuneiform-1.1.0+dfsg/debian/tests/control --- cuneiform-1.1.0+dfsg/debian/tests/control 2012-04-23 21:17:44.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/tests/control 2014-04-07 13:04:54.000000000 +0000 @@ -1,3 +1,14 @@ Tests: ground-truth -Features: no-build-needed Depends: cuneiform + +Tests: adequate-cuneiform +Depends: cuneiform, adequate + +Tests: adequate-cuneiform-common +Depends: cuneiform-common, adequate + +Tests: adequate-libcuneiform-dev +Depends: libcuneiform-dev, adequate + +Tests: adequate-libcuneiform0 +Depends: libcuneiform0, adequate diff -Nru cuneiform-1.1.0+dfsg/debian/watch cuneiform-1.1.0+dfsg/debian/watch --- cuneiform-1.1.0+dfsg/debian/watch 2011-07-07 17:22:36.000000000 +0000 +++ cuneiform-1.1.0+dfsg/debian/watch 2014-03-17 23:07:45.000000000 +0000 @@ -1,5 +1,5 @@ version=3 opts=dversionmangle=s/\+dfsg// \ -http://launchpad.net/cuneiform-linux \ -http://launchpad.net/cuneiform-linux/[0-9.]+/.*/[+]download/cuneiform-linux-([0-9.]+)[.]tar[.]bz2 +https://launchpad.net/cuneiform-linux \ +https://launchpad.net/cuneiform-linux/[0-9.]+/.*/[+]download/cuneiform-linux-([0-9.]+)[.]tar[.]bz2