remove conflict artifact

[developers-reference.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f23913fe3c8cc19f683dc51e68c97c73f9a6a80c..ea0551fb42fd169631e823985ca49ae1dc4fe8c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+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
 
   * Frédéric Bothamy
@@ -25,8 +42,9 @@ developers-reference (3.3.3) unstable; urgency=low
       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 04:06:24 -0400
+ -- Adam Di Carlo <aph@debian.org>  Mon, 16 Jun 2003 04:08:29 -0400
 
 developers-reference (3.3.2) unstable; urgency=low