diff -Nru monotone-1.0/debian/changelog monotone-1.0/debian/changelog --- monotone-1.0/debian/changelog 2013-07-17 08:16:33.000000000 +0000 +++ monotone-1.0/debian/changelog 2014-02-27 18:00:21.000000000 +0000 @@ -1,3 +1,29 @@ +monotone (1.0-12) unstable; urgency=low + + * Add texlive-fonts-recommended as a B-D-I. Closes: #735933. + * Bump Standards-Version to 3.9.5; no changes required. + + -- Markus Wanner Thu, 27 Feb 2014 19:00:19 +0100 + +monotone (1.0-11) unstable; urgency=low + + * Really invoke autoreconf prior to configure, now. + + -- Markus Wanner Sat, 10 Aug 2013 08:24:53 +0200 + +monotone (1.0-10) unstable; urgency=low + + * Add patches/11-no-gettext-on-lua.diff, remove a lua file from gettext + invocation. + * Add a full description and 'status' capabilities to the monotone-server + init script. + * Honor nocheck in DEB_BUILD_OPTIONS. + * Invoke autoreconf prior to configure. Allows us to patch Makefile.am + directly and helps with the out-of-date config.guess file. + * Add source/options extend-diff-ignore. + + -- Markus Wanner Thu, 08 Aug 2013 23:38:55 +0200 + monotone (1.0-9) unstable; urgency=low * Add patches/08-texinfo-fix.diff. Sanitizes .texi files. Closes: #712340. diff -Nru monotone-1.0/debian/control monotone-1.0/debian/control --- monotone-1.0/debian/control 2013-05-24 13:34:42.000000000 +0000 +++ monotone-1.0/debian/control 2014-02-27 13:34:36.000000000 +0000 @@ -9,13 +9,14 @@ Homepage: http://monotone.ca/ Vcs-Browser: https://code.monotone.ca/p/debian-mtn/source/tree/h:org.debian.monotone/ Vcs-Mtn: mtn://monotone.ca/debian-mtn?org.debian.monotone -Build-Depends: debhelper (>= 9), autotools-dev, po-debconf, bind9-host, +Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, + po-debconf, bind9-host, libboost-dev, libbotan1.10-dev, libidn11-dev, liblua5.1-0-dev, libpcre3-dev, libsqlite3-dev, libz-dev, texinfo, expect, bash-completion, bash (>= 4.0), source-highlight, mime-construct Build-Depends-Indep: poppler-utils | xpdf-utils, ps2eps, - texlive-generic-recommended, texlive-latex-base -Standards-Version: 3.9.4 + texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended +Standards-Version: 3.9.5 Package: monotone Architecture: any diff -Nru monotone-1.0/debian/monotone-server.monotone.init monotone-1.0/debian/monotone-server.monotone.init --- monotone-1.0/debian/monotone-server.monotone.init 2013-03-04 20:01:43.000000000 +0000 +++ monotone-1.0/debian/monotone-server.monotone.init 2013-08-09 21:32:01.000000000 +0000 @@ -11,6 +11,8 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Monotone server. +# Description: Provides synchronization services of a monotone +# repository via netsync. ### END INIT INFO set -e @@ -104,6 +106,9 @@ d_stop d_start ;; + status) + status_of_proc $DAEMON mtn && exit 0 || exit $? + ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 exit 1 diff -Nru monotone-1.0/debian/patches/11-no-gettext-on-lua.diff monotone-1.0/debian/patches/11-no-gettext-on-lua.diff --- monotone-1.0/debian/patches/11-no-gettext-on-lua.diff 1970-01-01 00:00:00.000000000 +0000 +++ monotone-1.0/debian/patches/11-no-gettext-on-lua.diff 2013-08-09 21:32:01.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Drop std_hooks.lua from xgettext invocation + Looks like xgettext doesn't like lua (anymore). Removing it from the list + of files to process fixes a FTBFS. +Author: Markus Wanner +Last-Update: 2013-08-08 +--- a/Makefile.am ++++ b/Makefile.am +@@ -500,7 +500,7 @@ + # for the template file + POTFILES = $(filter-out package_%, $(MOST_SOURCES)) \ + $(UNIX_PLATFORM_SOURCES) $(WIN32_PLATFORM_SOURCES) \ +- src/monotone.cc src/std_hooks.lua ++ src/monotone.cc + + po/$(PACKAGE).pot: $(POTFILES) + [ -d po ] || mkdir -p po diff -Nru monotone-1.0/debian/patches/series monotone-1.0/debian/patches/series --- monotone-1.0/debian/patches/series 2013-07-17 07:54:35.000000000 +0000 +++ monotone-1.0/debian/patches/series 2013-08-09 21:32:01.000000000 +0000 @@ -9,4 +9,5 @@ 08-texinfo-fix.diff 09-ignore-aggressive-gnu-patch.diff 10-mtn-ignore-syntax-error-test.diff +11-no-gettext-on-lua.diff 90-stacktrace-on-crash.diff diff -Nru monotone-1.0/debian/rules monotone-1.0/debian/rules --- monotone-1.0/debian/rules 2013-03-04 20:01:43.000000000 +0000 +++ monotone-1.0/debian/rules 2013-08-10 06:25:19.000000000 +0000 @@ -53,7 +53,7 @@ # enter an infinite loop. When the cause has been determined and # resolved, this option should be re-enabled. %: - dh $@ --with=bash_completion + dh $@ --with=bash_completion,autoreconf override_dh_auto_configure: debian/nofakeroot dh_auto_configure @@ -78,8 +78,12 @@ export MTN_STACKTRACE_ON_CRASH = 1 override_dh_auto_test: +# While dh_auto_test checks for 'nocheck', running it through +# nofakeroot seems to confuse it. So we do the check, here. +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) debian/nofakeroot dh_auto_test -pmonotone -- INFO_DEPS='' || \ sh extra/building/dump-test-logs.sh +endif override_dh_auto_install: dh_auto_install -Nmonotone-doc -- INFO_DEPS='' diff -Nru monotone-1.0/debian/source/options monotone-1.0/debian/source/options --- monotone-1.0/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ monotone-1.0/debian/source/options 2013-08-09 19:37:10.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "(^|/)(aclocal\.m4|configure|depcomp|doc/Makefile\.in|doc/mdate-sh|doc/monotone\.info.*|doc/stamp-vti|doc/version\.texi|doc/texinfo\.tex|config\.log|config\.sub|config\.guess|Makefile\.in|INSTALL|install-sh|missing)$"