Apply patch from Robert Millan to fix #211566; update support for

Debian FreeBSD.

diff --git a/ChangeLog b/ChangeLog
index 0cafa18a623a4dec60a0d3137911ca63baf391ea..61a3e5642c236c502596e5c79add9702975777ba 100644 (file)
--- 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 01e0392946ebdf2f681d8e9bc3e9b4027a5da089..9c6f91894eb735a322c6bff4d3e14dfdc95c203a 100644 (file)
--- 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 7c1e7e7857155c11fd6f54f70792c2992350e194..087e9a04bab16dc2ae251dfa047246f64173ec20 100644 (file)
--- 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 39451d1251da363c7fb1ec3d94d96de25d538dc3..fe3b7bec53902c20006d549a383cdf8284134ab2 100644 (file)
--- 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 32a0fba95382c363270fe7eaac4fe0f42aa4bfc3..cacad212be2fce878fd992f436087483b703d5b0 100644 (file)
--- 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 638d3b80c9fd7eb0c0c665c81e1c4b448d7852dc..10dfdb537866fc75e09b3d6b21aa5a833e82996e 100755 (executable)
--- 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');