r12972 - in packages/trunk: megaglest/debian megaglest-data/debian

[Paul Wise]

Author: pabs
Date: 2011-12-14 11:00:17 +0000 (Wed, 14 Dec 2011)
New Revision: 12972

Modified:
   packages/trunk/megaglest-data/debian/changelog
   packages/trunk/megaglest/debian/changelog
Log:
merge changelog entries

Modified: packages/trunk/megaglest/debian/changelog
===================================================================
--- packages/trunk/megaglest/debian/changelog	2011-12-14 10:36:06 UTC (rev 12971)
+++ packages/trunk/megaglest/debian/changelog	2011-12-14 11:00:17 UTC (rev 12972)
@@ -1,25 +1,17 @@
-megaglest (3.6.0.1-1) UNRELEASED; urgency=low
+megaglest (3.5.2.3-1) UNRELEASED; urgency=low
 
-  [ Mark Vejvoda ]
-  * updated for 3.6.0 release
-
   [ Alexander Reichle-Schmehl ]
   * Remove myself from uploaders due to time constraints
 
- -- Alexander Reichle-Schmehl <tolimar at debian.org>  Tue, 13 Dec 2011 15:54:50 +0100
-
-megaglest (3.5.2.3-1) UNRELEASED; urgency=low
-
-  [ Alexander Reichle-Schmehl ]
-  * NOT RELEASED YET
-
   [ Ansgar Burchardt ]
   * Remove myself from Uploaders.
 
   [ Mark Vejvoda ]
+  * updated for 3.6.0 release
   * renamed from glest to megaglest and changed build system to cmake
- -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Wed, 25 May 2011 23:31:21 -0700
 
+ -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Tue, 13 Dec 2011 15:54:50 +0100
+
 glest (3.2.2-2) unstable; urgency=low
 
   [ Paul Wise ]

Modified: packages/trunk/megaglest-data/debian/changelog
===================================================================
--- packages/trunk/megaglest-data/debian/changelog	2011-12-14 10:36:06 UTC (rev 12971)
+++ packages/trunk/megaglest-data/debian/changelog	2011-12-14 11:00:17 UTC (rev 12972)
@@ -1,15 +1,5 @@
 megaglest-data (3.6.0.1-1) UNRELEASED; urgency=low
 
-  [ Mark Vejvoda ]
-  * updated for 3.6.0 release
-
-  [ Alexander Reichle-Schmehl ]
-  * Remove myself from uploaders due to time constraints
-
- -- Alexander Reichle-Schmehl <tolimar at debian.org>  Tue, 13 Dec 2011 15:56:02 +0100
-
-megaglest-data (3.5.2.3-1) UNRELEASED; urgency=low
-
   [ Siegfried-Angel Gevatter Pujals ]
   * debian/langs/catala.lng:
      - Update the Catalan translation. Thanks to Narcis Garcia.
@@ -18,9 +8,11 @@
   * Remove myself from Uploaders.
 
   [ Mark Vejvoda ]
+  * updated for 3.6.0 release
   * renamed from glest to megaglest and changed build system to cmake
- -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Wed, 25 May 2011 23:31:21 -0700
 
+ -- Mark Vejvoda <mark_vejvoda at hotmail.com>  Tue, 13 Dec 2011 15:56:02 +0100
+
 glest-data (3.2.1-2) unstable; urgency=low
 
   [ Eddy Petrișor ]