[Python-apps-commits] r8574 - in packages/mercurial/trunk/debian (4 files)

[vicho at users.alioth.debian.org]

    Date: Tuesday, May 1, 2012 @ 22:26:39
  Author: vicho
Revision: 8574

* New upstream release 2.2
* Delete patches for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
  and from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
  which are now included upstream

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
  packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2012-05-01 20:09:58 UTC (rev 8573)
+++ packages/mercurial/trunk/debian/changelog	2012-05-01 22:26:39 UTC (rev 8574)
@@ -1,3 +1,12 @@
+mercurial (2.2-1) UNRELEASED; urgency=low
+
+  * New upstream release 2.2
+  * Delete patches for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
+    and from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
+    which are now included upstream
+
+ -- Javi Merino <vicho at debian.org>  Tue, 01 May 2012 22:25:52 +0100
+
 mercurial (2.1.2-2) unstable; urgency=low
 
   * Add sparc to the list of architectures with slow buildds

Deleted: packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch	2012-05-01 20:09:58 UTC (rev 8573)
+++ packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch	2012-05-01 22:26:39 UTC (rev 8574)
@@ -1,19 +0,0 @@
-Author: Javi Merino <vicho at debian.org>
-Description: Don't run test-gpg if not in a working directory
- test-gpg has to be run in a mercurial working directory as it uses
- that to verify that it hasn't modified the trustdb.gpg file.  Skip
- the test if it is running in an exploded tarball.
-Forwarded: http://www.selenic.com/pipermail/mercurial-devel/2012-April/038941.html
---- a/tests/test-gpg.t
-+++ b/tests/test-gpg.t
-@@ -1,6 +1,10 @@
- Test the GPG extension
- 
-   $ "$TESTDIR/hghave" gpg || exit 80
-+  $ if ! hg identify -q > /dev/null; then
-+  >     echo "skipped: not a Mercurial working dir" >&2
-+  >     exit 80
-+  > fi
-   $ cat <<EOF >> $HGRCPATH
-   > [extensions]
-   > gpg=

Deleted: packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch	2012-05-01 20:09:58 UTC (rev 8573)
+++ packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch	2012-05-01 22:26:39 UTC (rev 8574)
@@ -1,14 +0,0 @@
-Author: Matt Mackall <mpm at selenic.com>
-Description: tests: re-silence test-bad-pull log messages
-Origin: upstream, http://selenic.com/hg/rev/91eec29dd7de
-
-diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
---- a/tests/test-bad-pull.t
-+++ b/tests/test-bad-pull.t
-@@ -25,6 +25,3 @@
-   abort: HTTP Error 404: * (glob)
-   [255]
-   $ wait $P
--  $ cat log
--  localhost - - [*] code 404, message File not found (glob)
--  localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2012-05-01 20:09:58 UTC (rev 8573)
+++ packages/mercurial/trunk/debian/patches/series	2012-05-01 22:26:39 UTC (rev 8574)
@@ -7,5 +7,3 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
-for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
-from_upstream__tests_re_silence_test_bad_pull_log_messages.patch