[Monotone-commits-diffs] org.debian.monotone: 67aee3a72a8383b2a84c83e9426c1645cf278628

[code]

revision:            67aee3a72a8383b2a84c83e9426c1645cf278628
tag:                 monotone-1.0-10
date:                2013-08-09T21:58:33
author:              address@hidden
branch:              org.debian.monotone
changelog:
* Bump version to 1.0-10
* 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.

manifest:
format_version "1"

new_manifest [9e8c373238625cb0667d47d8c8a935b21f2ec7f2]

old_revision [a43b0aa4dc25a6160691347cbfa8bee43650c6c0]

patch "changelog"
 from [79663cd43a7869b6b8330218844da847e1c9f63f]
   to [7243e172fb6ef01f1a785328fd7229cae2c82388]

patch "control"
 from [712e499d06710c654aa6285466ee529eb4e5e9da]
   to [f26c4c5131c44313d560199ef0e9e252e198c67c]

patch "monotone-server.monotone.init"
 from [7877078cede63a76a087b7ee337877fa59ff2458]
   to [8e5efab45c140c48b86a986d0e37c31fc967904c]

patch "patches/series"
 from [edec63dd900143d06ac59165dd82868e9ba29676]
   to [71d3d5f48e333c98a3357f2f12112330aecb300b]

patch "rules"
 from [92ceecd51dd472fd8a83af0c8e9ea25b95dd7ce9]
   to [d5d22cce39d071f966904f6d527bc9797d3b64a1]
============================================================
--- changelog	79663cd43a7869b6b8330218844da847e1c9f63f
+++ changelog	7243e172fb6ef01f1a785328fd7229cae2c82388
@@ -1,3 +1,16 @@
+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 <address@hidden>  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.
============================================================
--- control	712e499d06710c654aa6285466ee529eb4e5e9da
+++ control	f26c4c5131c44313d560199ef0e9e252e198c67c
@@ -9,7 +9,8 @@ Vcs-Mtn: mtn://monotone.ca/debian-mtn?or
 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
============================================================
--- monotone-server.monotone.init	7877078cede63a76a087b7ee337877fa59ff2458
+++ monotone-server.monotone.init	8e5efab45c140c48b86a986d0e37c31fc967904c
@@ -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 @@ case "$1" in
 	d_stop
 	d_start
 	;;
+    status)
+	status_of_proc $DAEMON mtn && exit 0 || exit $?
+	;;
     *)
 	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
 	exit 1
============================================================
--- patches/series	edec63dd900143d06ac59165dd82868e9ba29676
+++ patches/series	71d3d5f48e333c98a3357f2f12112330aecb300b
@@ -9,4 +9,5 @@ 10-mtn-ignore-syntax-error-test.diff
 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
============================================================
--- rules	92ceecd51dd472fd8a83af0c8e9ea25b95dd7ce9
+++ rules	d5d22cce39d071f966904f6d527bc9797d3b64a1
@@ -78,8 +78,12 @@ override_dh_auto_test:
 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=''