From 5ca34db6a20763f344a39f653dd9115bc9f69611 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Wed, 12 Sep 2001 15:54:28 +0000
Subject: [PATCH] Cope with different layout of non-US when generating list for
 FORCENONUSONCD1

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 627b3c31..343e06f7 100755
--- a/Makefile
+++ b/Makefile
@@ -306,7 +306,7 @@ $(BDIR)/list: $(BDIR)/rawlist
 $(BDIR)/rawlist:
 ifdef FORCENONUSONCD1
 	$(Q)$(apt) cache dumpavail | \
-		grep-dctrl -FSection -n -sPackage -e '^non-US' - | \
+		grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us/main)' - | \
 		sort | uniq > $(BDIR)/Debian_$(CODENAME)_nonUS
 endif
 	$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \