Merge remote-tracking branch 'remotes/dgit/dgit/sid'

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..6f91983
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+debian/files
+debian/mr.debhelper.log
+debian/mr.substvars
+debian/mr/
+mr.1
+webcheckout.1

diff --git a/debian/changelog b/debian/changelog
index 65815389990fce79fc6d93fc7f9981df55c1045d..0ba959010217fb6d58c619657d449b53b42e0bf5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+myrepos (1.20130711) UNRELEASED; urgency=low
+
+  * Update of manpage and Suggests field for 'mr grep'.
+    Closes: #720128
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 19 Aug 2013 14:04:06 -0400
+
 myrepos (1.20130710) unstable; urgency=low
 
   * Avoid conflicting with mr so the dummy package can be installed and pull

diff --git a/debian/control b/debian/control
index a9b6f211ad326f3a5a649989d2dd275ccb14506e..c57ff337f219fa14dbd5c617f964cc207891efd6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: myrepos
 Architecture: all
 Section: vcs
 Depends: ${misc:Depends}
-Suggests: subversion, git-core | git (>= 1:1.7), cvs, bzr, mercurial, darcs, fossil, vcsh, liburi-perl, curl
+Suggests: subversion, git-core | git (>= 1:1.7), cvs, bzr, mercurial, darcs, fossil, vcsh, liburi-perl, curl, ack-grep
 Provides: mr
 Replaces: mr
 Recommends: libwww-perl, libhtml-parser-perl, perl

diff --git a/doc/news/version_1.20130710.mdwn b/doc/news/version_1.20130710.mdwn
new file mode 100644 (file)
index 0000000..9363a89
--- /dev/null
+++ b/doc/news/version_1.20130710.mdwn
@@ -0,0 +1,4 @@
+myrepos 1.20130710 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Avoid conflicting with mr so the dummy package can be installed and pull
+     in this one."""]]
\ No newline at end of file

diff --git a/mr b/mr
index 435fabbf77853205e631a35a57f21a40ab9f2755..bdf0c3cc63aeb9302dd7c44934a61b3b77478176 100755 (executable)
--- a/mr
+++ b/mr
@@ -24,6 +24,8 @@ B<mr> [options] diff
 
 B<mr> [options] log
 
+B<mr> [options] grep pattern
+
 B<mr> [options] run command [param ...]
 
 B<mr> [options] bootstrap url [directory]
@@ -113,6 +115,11 @@ Show a diff of uncommitted changes.
 
 Show the commit log.
 
+=item grep pattern
+
+Searches for a pattern in each repository using the grep subcommand. Uses
+ack-grep on VCS that do not have their own.
+
 =item run command [param ...]
 
 Runs the specified command in each repository.