remove conflict artifact

[developers-reference.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1145243be829a79b2095e609b51c54654214c8fc..ea0551fb42fd169631e823985ca49ae1dc4fe8c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,22 @@
+developers-reference (3.3.4) WORKING VERSION; urgency=low
+
+  * Josip Rodin:
+    - fixed language in the PTS section, prompted by a patch from
+      Romain FRANCOISE, thank you; closes: #197741
+    - updated the mailing lists section (again)
+    - documented Alioth, somewhat
+  * Frédéric Bothamy
+    - French translation updated to version 3.3.3 (more or less)
+    - proofread by Patrice Karatchentzeff
+  * Matt Zimmerman
+    - Don't upload security updates directly to stable
+    - Always include an external reference in security changelog entries
+    - Be careful not to re-use a version number in security uploads
+  
+ -- Adam Di Carlo <aph@debian.org>  Mon, 16 Jun 2003 04:22:22 -0400
+
 developers-reference (3.3.3) unstable; urgency=low
 
-  * NOT YET RELEASED
   * Frédéric Bothamy
     - corrections by Michel Grentzinger
   * Raphaël Hertzog
@@ -24,8 +40,11 @@ developers-reference (3.3.3) unstable; urgency=low
       distribution"
     - Secs "Uploads to {stable,testing-proposed-updates}" retitled to make
       it clear these are special cases
+    - Sec "Uploading to ftp-master": xref to "Delayed incoming"; 
+      closes: #195997
+    - check compliance with Policy version 3.5.10
 
- -- Adam Di Carlo <aph@debian.org>  Mon, 16 Jun 2003 03:59:01 -0400
+ -- Adam Di Carlo <aph@debian.org>  Mon, 16 Jun 2003 04:08:29 -0400
 
 developers-reference (3.3.2) unstable; urgency=low