[PATCH 1/4] maint: adjust the URL that will appear in the generated announcement

[Jim Meyering]

FYI, a few small patches:

>From 3a91f85ac52dd14131facf18435295d669b062c5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 10 Nov 2011 11:54:50 +0100
Subject: [PATCH 1/4] maint: adjust the URL that will appear in the generated
 announcement

* cfg.mk (url_dir_list): Use this http://ftp.gnu.org/gnu/$(PACKAGE)
for the first link listed in the generated announcement.
announce-gen now provides the faster mirror link automatically.
Remove now-unnecessary release-related URLs.
---
 cfg.mk |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index f49a57e..744cf23 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -14,19 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for stable releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-stable = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
-url_dir_list = \
-  ftp://$(gnu_rel_host)/gnu/parted
-
 # Used in maint.mk's web-manual rule
 manual_title = Parted User's Manual

+# Use the direct link.  This is guaranteed to work immediately, while
+# it can take a while for the faster mirror links to become usable.
+url_dir_list = http://ftp.gnu.org/gnu/$(PACKAGE)
+
 # Tests not to run as part of "make distcheck".
 # Exclude changelog-check here so that there's less churn in ChangeLog
 # files -- otherwise, you'd need to have the upcoming version number
--
1.7.8.rc0.61.g8a042


>From 794913270ef50380cbf1426412428c5fe38e8a02 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 10 Nov 2011 11:55:23 +0100
Subject: [PATCH 2/4] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index dc57f70..44e24aa 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit dc57f70a80411608fee719971cc758a00a8eab63
+Subproject commit 44e24aa42fb9e808f25767f5ce555d6844efc1c8
--
1.7.8.rc0.61.g8a042


>From 58dd552fa63b38a4060f7e5001eef666def6d365 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 10 Nov 2011 12:11:24 +0100
Subject: [PATCH 3/4] maint: "make distcheck" now runs the root-only tests

* Makefile.am (root-check): New overridable variable and rule.
(distcheck-hook): Depend on it.
---
 Makefile.am |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3a69832..39c1d01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,15 @@ parted.spec: parted.spec.in
        mv address@hidden $@
 MAINTAINERCLEANFILES = parted.spec

-distcheck-hook:
+.PHONY: root-check
+root-check:
+       sudo $(MAKE) check
+
+# Not everyone who runs "make distcheck" will want to or even
+# be able to run the root tests.  If you want to skip them,
+# run make like this: "make distcheck root-check="
+root-check ?= root-check
+distcheck-hook: $(root-check)
        $(MAKE) my-distcheck

 ### ABI Checking scripts ###
--
1.7.8.rc0.61.g8a042


>From 41dc96361e58a73f61e1c8bf707a494aafd99d70 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 10 Nov 2011 12:14:08 +0100
Subject: [PATCH 4/4] tests: fix test for udevadm

* tests/init.cfg (sector_size_): Fix syntax error in test invocation.
---
 tests/init.cfg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/init.cfg b/tests/init.cfg
index ca4dffc..c5fbb5e 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -27,7 +27,7 @@ require_512_byte_sector_size_()

 require_udevadm_settle_()
 {
-  udevadm settle --help \
+  udevadm --help > /dev/null \
     || skip_ 'udevadm command is required for this test'
 }

--
1.7.8.rc0.61.g8a042