diff -pruN 201203250530-2.1/debian/changelog 201203250530-2.1ubuntu1/debian/changelog --- 201203250530-2.1/debian/changelog 2015-08-26 12:49:55.000000000 +0000 +++ 201203250530-2.1ubuntu1/debian/changelog 2016-03-27 21:12:20.000000000 +0000 @@ -1,3 +1,12 @@ +dsc-statistics (201203250530-2.1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Disable "too many changes in docs since release" test for + Ubuntu, at least until it stops failing on powerpc/ppc64el. + + -- Artur Rona Sun, 27 Mar 2016 23:06:21 +0200 + dsc-statistics (201203250530-2.1) unstable; urgency=medium * Non-maintainer upload. @@ -14,6 +23,19 @@ dsc-statistics (201203250530-2.1) unstab -- gregor herrmann Wed, 26 Aug 2015 14:49:51 +0200 +dsc-statistics (201203250530-2ubuntu2) vivid; urgency=medium + + * Disable "too many changes in docs since release" test for Ubuntu, at + least until it stops failing on powerpc/ppc64el. + + -- Colin Watson Wed, 12 Nov 2014 15:46:32 +0000 + +dsc-statistics (201203250530-2ubuntu1) trusty; urgency=medium + + * Use autotools-dev to update config.{sub,guess} for new arches. + + -- Logan Rosen Fri, 10 Jan 2014 22:36:00 -0500 + dsc-statistics (201203250530-2) unstable; urgency=low * don't remove account on purge diff -pruN 201203250530-2.1/debian/control 201203250530-2.1ubuntu1/debian/control --- 201203250530-2.1/debian/control 2015-08-26 12:46:08.000000000 +0000 +++ 201203250530-2.1ubuntu1/debian/control 2015-09-05 18:09:43.000000000 +0000 @@ -2,7 +2,8 @@ Source: dsc-statistics Section: utils Priority: optional Build-Depends: debhelper (>= 8.1.0~), libpcap0.8-dev, libproc-pid-file-perl, libgeoip-dev, autotools-dev, transfig, netpbm, texlive-latex-recommended, texlive-generic-recommended, ghostscript, wdiff, poppler-utils, sharutils -Maintainer: Debian dsc Maintainer Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian dsc Maintainer Team Uploaders: Marc Haber , Sebastian Laubscher Homepage: http://dns.measurement-factory.com/tools/dsc/index.html VCS-Git: https://alioth.debian.org/anonscm/git/dsc/dsc.git diff -pruN 201203250530-2.1/debian/rules 201203250530-2.1ubuntu1/debian/rules --- 201203250530-2.1/debian/rules 2015-08-26 12:46:08.000000000 +0000 +++ 201203250530-2.1ubuntu1/debian/rules 2015-09-05 18:09:43.000000000 +0000 @@ -36,10 +36,6 @@ binary-arch: --center="Debian GNU/Linux" debian/dsc.pod > debian/dsc.8 pdftotext docsrc/dsc-manual.pdf docsrc/dsc-manual.txt pdftotext doc/dsc-manual.pdf doc/dsc-manual.txt - if [ "$$(wdiff --no-common docsrc/dsc-manual.txt doc/dsc-manual.txt | wc -l)" -gt 8 ]; then \ - echo "too many changes in docs since release, .orig.tar.gz repackaging needed"; \ - exit 1; \ - fi cp docsrc/dsc-manual.pdf $(CURDIR)/debian/dsc-statistics-collector/usr/share/doc/dsc-statistics-collector/dsc-manual.pdf dh_install -a dh --remaining $@