[Pkg-cli-libs-commits] [SCM] gdata-sharp branch, master, updated. debian/1.4.0.2-2-2-g3ea7c7b

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 3ea7c7b13f484b6d642ee9dcf6732ec3545b2cf2
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Mon Oct 19 15:21:49 2009 +0800

    Standards-Version, quilt, monodoc
    
    * debian/rules:
      + Use mdoc instead of monodocer/mdassembler
      + Use quilt dh7 integration
    * debian/control:
      + Bump Standards-Version to 3.8.3:
        - Section => cli-mono
      + Build-dep on quilt >= 0.46-7~
      + Bump monodoc-base version to 2.4+dfsg for mdoc

diff --git a/debian/changelog b/debian/changelog
index ceff04d..30d4c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
 gdata-sharp (1.4.0.2-3) UNRELEASED; urgency=low
 
-  * debian/rules, control:
+  * debian/rules:
     + Use mono-csc instead of csc
+    + Use mdoc instead of monodocer/mdassembler
+    + Use quilt dh7 integration
+  * debian/control:
     + Bump mono-devel to 2.4.2 for mono-csc
+    + Bump Standards-Version to 3.8.3:
+      - Section => cli-mono
+    + Build-dep on quilt >= 0.46-7~
+    + Bump monodoc-base version to 2.4+dfsg for mdoc
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 19 Oct 2009 13:35:46 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 19 Oct 2009 14:06:45 +0800
 
 gdata-sharp (1.4.0.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bb5ae36..1bc3bbf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
 Source: gdata-sharp
-Section: libs
+Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Chow Loong Jin <hyperair at gmail.com>
 Build-Depends: debhelper (>= 7.0.50),
-               quilt,
+               quilt (>= 0.46-7~),
                cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.2),
                libmono2.0-cil (>= 2.0.1)
 Build-Depends-Indep: libnunit2.4-cil,
                      libmono-winforms2.0-cil,
                      libmono-i18n2.0-cil,
-                     monodoc-base
-Standards-Version: 3.8.1
+                     monodoc-base (>= 2.4+dfsg)
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/gdata-sharp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/gdata-sharp.git
 Homepage: http://code.google.com/p/google-gdata/
diff --git a/debian/rules b/debian/rules
index e73ef1d..8bb41e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,19 +13,22 @@ override_dh_makeclilibs:
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE_NOTES.HTML
 
-override_dh_auto_build: $(QUILT_STAMPFN)
+override_dh_auto_build:
 	# we have to pass PREFIX has as there is no configure script which
 	# covers that :(
 	dh_auto_build -- PREFIX=/usr CSC=/usr/bin/mono-csc
-	( ls $(CURDIR)/Google.GData.*.dll | \
-		sed -e 's/^/-assembly:/'; echo -path:$(CURDIR)/monodocer ) | \
-		xargs monodocer
-	mdassembler \
-		--ecma $(CURDIR)/monodocer \
+	mkdir -p monodoc
+	mdoc update \
+		-fno-assembly-versions \
+		-L$(CURDIR)/bin \
+		--out=monodoc
+	mdoc assemble \
+		--format ecma \
 		--out $(CURDIR)/GData
 
-override_dh_clean: unpatch
-	dh_clean
+overr ide_dh_auto_clean:
+	dh_auto_clean
+	rm -rf monodoc GData.tree GData.zip
 
 override_dh_auto_install:
 	# gar, see above
@@ -40,6 +43,5 @@ override_dh_auto_install:
 override_dh_auto_test:
 
 %:
-	dh $@
+	dh --with=quilt $@
 
-.PHONY: override_dh_makeclilibs override_dh_installchangelogs override_dh_auto_build override_dh_auto_install override_dh_auto_test

-- 
gdata-sharp