From: Scott James Remnant <keybuk@debian.org>
Date: Mon, 8 Mar 2004 18:29:30 +0000 (+0000)
Subject: Apply patch from Robert Millan to fix #211566; update support for
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be599376b904267b5fd79e0269aa7e2807047b17;p=dpkg

Apply patch from Robert Millan to fix #211566; update support for
Debian FreeBSD.
---

diff --git a/ChangeLog b/ChangeLog
index 0cafa18a..61a3e564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  8 18:28:07 GMT 2004 Robert Millan <rmh@debian.org>
+
+  * archtable, configure.in, scripts/dpkg-architecture.pl: Update
+  support for Debian FreeBSD.
+
 Mon Mar  8 18:20:38 GMT 2004 Javier Fernandez-Sanguino Pena <jfs@computer.org>
 
   * scripts/dpkg-buildpackage.sh: Add blank line to .dsc before
diff --git a/THANKS b/THANKS
index 01e03929..9c6f9189 100644
--- a/THANKS
+++ b/THANKS
@@ -53,6 +53,7 @@ Philippe Batailler <pbatailler@teaser.fr>
 Piotr Roszatycki <dexter@fnet.pl>
 Raphael Hertzog <rhertzog@hrnet.fr>
 Richard Kettlewell <rjk@sfere.greenend.org.uk>
+Robert Millan <rmh@debian.org>
 Roderick Schertler <roderick@argon.org>
 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
 Scott Barker <scott@mostlylinux.ab.ca>
diff --git a/archtable b/archtable
index 7c1e7e78..087e9a04 100644
--- a/archtable
+++ b/archtable
@@ -49,6 +49,7 @@ hppa1.1-linux-gnu	hppa		hppa
 hppa2.0-linux-gnu	hppa		hppa
 hppa64-linux-gnu	hppa		hppa
 i386-freebsd		freebsd-i386	freebsd-i386
+i386-kfreebsd-gnu	freebsd-i386	freebsd-i386
 i386-netbsdelf-gnu	netbsd-i386	netbsd-i386
 s390-linux-gnu		s390		s390
 s390-ibm-linux-gnu	s390		s390
diff --git a/configure.in b/configure.in
index 39451d12..fe3b7bec 100644
--- a/configure.in
+++ b/configure.in
@@ -107,6 +107,8 @@ case $target_os in
           os_type="openbsd";;
         *netbsd* )
           os_type="netbsd";;
+        *kfreebsd*-gnu* )
+          os_type="kfreebsd-gnu";;
         *freebsd* )
           os_type="freebsd";;
         gnu )
diff --git a/debian/changelog b/debian/changelog
index 32a0fba9..cacad212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dpkg (1.10.19) unstable; urgency=low
     space.  Closes: #213038, #217286, #213543, #213846.
   * Remove duplicated entries from ChangeLog.  Closes: #157437.
   * Fix dpkg-buildpackage when used with PGP.  Closes: #232916.
+  * Update support for Debian FreeBSD.  Closes: #211566.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 638d3b80..10dfdb53 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -66,7 +66,7 @@ require 'controllib.pl';
 	    's390x',		's390x-linux',
 	    'ia64',		'ia64-linux',
 	    'openbsd-i386',	'i386-openbsd',
-	    'freebsd-i386',	'i386-freebsd',
+	    'freebsd-i386',	'i386-kfreebsd-gnu',
 	    'netbsd-i386',	'i386-netbsdelf-gnu',
 	    'darwin-powerpc',	'powerpc-darwin',
 	    'darwin-i386',	'i386-darwin');