[Pkg-mono-svn-commits] rev 3841 - monodoc/trunk/debian

[David Paleino]

Author: hanska-guest
Date: 2008-11-26 21:13:49 +0000 (Wed, 26 Nov 2008)
New Revision: 3841

Modified:
   monodoc/trunk/debian/changelog
Log:
Merging changes


Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2008-11-26 13:14:59 UTC (rev 3840)
+++ monodoc/trunk/debian/changelog	2008-11-26 21:13:49 UTC (rev 3841)
@@ -1,20 +1,5 @@
-monodoc (2.0-2) UNRELEASED; urgency=low
+monodoc (2.0-1) UNRELEASED; urgency=low
 
-  * debian/rules:
-    + updated dh_installxsp, we install only 2.0
-  * debian/control:
-    + monodoc-http dependencies fixed (we just need XspServer2, not
-      also XspServer)
-    + Dependency fields wrapped
-    + Build-Depends-Indep on libmono-sharpzip2.84-cil, instead of
-      libmono-sharpzip0.84-cil
-  * debian/monodoc-base.docs:
-    + updated, debian/MAINTAINERS has been dropped
-
- -- David Paleino <d.paleino at gmail.com>  Wed, 26 Nov 2008 11:14:14 +0100
-
-monodoc (2.0-1) experimental; urgency=low
-
   [ Jo Shields ]
   * New upstream release
     + debian/control:
@@ -35,7 +20,10 @@
 
   [ David Paleino ]
   * debian/monodoc-base.dirs added
-  * debian/rules updated
+  * debian/monodoc-base.docs:
+    + updated, debian/MAINTAINERS has been dropped
+  * debian/rules:
+    + updated dh_installxsp, we install only 2.0
   * Patch system switched to quilt
   * debian/patches:
     + 00-fix_build_system.patch added
@@ -54,6 +42,11 @@
     + DM-Upload-Allowed set
     + typo fixed in description
     + Build-Depends-Indep updated
+    + monodoc-http dependencies fixed (we just need XspServer2, not
+      also XspServer)
+    + Dependency fields wrapped
+    + Build-Depends-Indep on libmono-sharpzip2.84-cil, instead of
+      libmono-sharpzip0.84-cil
   * Group Policy:
     + implement get-orig-source target in debian/rules
 
@@ -61,7 +54,7 @@
   * debian/MAINTAINERS:
     + Dropped, obsolete we use Uploaders for that.
 
- -- David Paleino <d.paleino at gmail.com>  Tue, 25 Nov 2008 22:14:31 +0100
+ -- David Paleino <d.paleino at gmail.com>  Wed, 26 Nov 2008 22:12:56 +0100
 
 monodoc (1.9-2) unstable; urgency=low