From dcba6dbc63f59b6aafcfb848df0400666540b272 Mon Sep 17 00:00:00 2001
From: aph <aph@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 5 Apr 2001 14:01:49 +0000
Subject: [PATCH]   * expunge references to the Debian Packaging Manual, which
 is now in the     Policy   * deny request to shut down non-maintainer bug
 maintenance bug closure     practices (closes: Bug#88623)   * add some advice
 about U.S. citizens uploading to non-US     (closes: Bug#89694)

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@1161 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 common.ent                |  2 ++
 debian/changelog          | 11 +++++++++++
 developers-reference.sgml | 28 +++++++++++++++++++++++++---
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/common.ent b/common.ent
index c04e027..88c47e0 100644
--- a/common.ent
+++ b/common.ent
@@ -70,6 +70,8 @@
 <!entity url-gpl "http://www.gnu.org/copyleft/gpl.html">
 <!entity url-pgp-faq "http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">
 <!entity url-rfc2440 "http://www.gnupg.org/rfc2440.html">
+<!entity url-u.s.-export "http://www.bxa.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html">
+<!entity url-notification-of-export "http://www.bxa.doc.gov/Encryption/">
 
 <!-- Debian email addresses -->
 <!entity email-listmaster "<email>listmaster@&lists-host;</email>">
diff --git a/debian/changelog b/debian/changelog
index 6187b45..85d6f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+developers-reference (2.8.5) unstable; urgency=low
+
+  * expunge references to the Debian Packaging Manual, which is now in the
+    Policy
+  * deny request to shut down non-maintainer bug maintenance bug closure
+    practices (closes: Bug#88623)
+  * add some advice about U.S. citizens uploading to non-US
+    (closes: Bug#89694)
+
+ --
+
 developers-reference (2.8.4) unstable; urgency=low
 
   * debian/control: remove reference to obsolete packaging-manual package
diff --git a/developers-reference.sgml b/developers-reference.sgml
index 7261437..1a491c6 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -5,7 +5,7 @@
   <!-- common, language independant entities -->
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.51 $">
+  <!entity cvs-rev "$Revision: 1.52 $">
 
   <!-- if you are translating this document, please notate the RCS
        revision of the developers reference here -->
@@ -1085,7 +1085,7 @@ After uploading your package, you can check how the archive maintenance
 software will process it by running <prgn>dinstall</prgn> on your changes
 file: <example>dinstall -n foo.changes</example>
 
-	<sect1 id="upload-non-us">Uploading to <tt>non-us</tt> (pandora)
+	<sect1 id="upload-non-us">Uploading to <tt>non-US</tt> (pandora)
 	  <p>
 As discussed above, export controlled software should not be uploaded
 to <tt>ftp-master</tt>.  Instead, use <prgn>scp</prgn> or non-anonymous
@@ -1100,7 +1100,29 @@ the program for details.
 You can check your upload the same way it's done on <tt>ftp-master</tt>,
 with:
 <example>dinstall -n foo.changes</example>
-      
+	  <p>
+Note that U.S. residents or citizens are subject to restrictions on
+export of cryptographic software. As of this writing, U.S. citizens are
+allowed to export some cryptographic software, subject to notification
+rules by the U.S. Department of Commerce.
+	  <p>
+Debian policy does not prevent upload to non-US by U.S. residents or
+citizens, but care should be taken in doing so. It is recommended that
+developers take all necessary steps to ensure that they are not
+breaking current US law by doing an upload to non-US, <em>including
+consulting a lawyer</em>.
+	  <p>
+For packages in non-US main or contrib, developers should at least
+follow the <url id="&url-u.s.-export;" name="procedure outlined by the
+US Government">.  Maintainers of non-US/non-free packages should
+further consult these <url id="url-notification-of-export" name="rules
+on notification of export"> of non-free software.
+	  <p>
+This section is for information only and does not constitute legal
+advice. Again, it is strongly recommended that U.S. citizens and
+residents consult a lawyer before doing uploads to non-US.
+
+
 	<sect1>Uploads via <tt>chiark</tt>
 	  <p>
 If you have a slow network connection to <tt>ftp-master</tt>, there are
-- 
2.30.2