[Pkg-mono-svn-commits] rev 2075 - in gtksourceview-sharp/trunk/debian: . patches

[Mirco Bauer]

Author: meebey-guest
Date: 2005-10-16 17:44:08 +0000 (Sun, 16 Oct 2005)
New Revision: 2075

Added:
   gtksourceview-sharp/trunk/debian/patches/
   gtksourceview-sharp/trunk/debian/patches/00list
   gtksourceview-sharp/trunk/debian/patches/01_fix_docsdir.dpatch
Modified:
   gtksourceview-sharp/trunk/debian/changelog
   gtksourceview-sharp/trunk/debian/control
   gtksourceview-sharp/trunk/debian/rules
Log:
- 0.5-7 release.



Modified: gtksourceview-sharp/trunk/debian/changelog
===================================================================
--- gtksourceview-sharp/trunk/debian/changelog	2005-10-13 08:22:34 UTC (rev 2074)
+++ gtksourceview-sharp/trunk/debian/changelog	2005-10-16 17:44:08 UTC (rev 2075)
@@ -1,3 +1,19 @@
+gtksourceview-sharp (0.5-7) unstable; urgency=medium
+
+  * Mirco 'meebey' Bauer
+    + debian/control:
+      - Updated to Standards Version 3.6.2.1 (no changes).
+      - Updated cli-common build-dep to >= 0.2.0
+      - Added dpatch to build-deps.
+    + debian/rules:
+      - Removed docsdir path hack, using clean dpatch instead.
+      - Added override for ASSEMBLER variable in make call for compiling
+        against MonoDoc 1.1.9 to solve the FTBFS. (Closes: #334158)
+    + debian/patches/01_fix_docsdir.dpatch:
+      - Created patch for using the right docs path.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 16 Oct 2005 19:29:46 +0200
+
 gtksourceview-sharp (0.5-6) unstable; urgency=low
 
   * upload to unstable

Modified: gtksourceview-sharp/trunk/debian/control
===================================================================
--- gtksourceview-sharp/trunk/debian/control	2005-10-13 08:22:34 UTC (rev 2074)
+++ gtksourceview-sharp/trunk/debian/control	2005-10-16 17:44:08 UTC (rev 2075)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>, Dave Beckett <dajobe at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), cli-common (>= 0.1.3), autoconf, automake1.7, libtool, mono-mcs (>= 0.96) | c-sharp-compiler, mono-gac, monodoc-base (>= 1.0), libmono-dev (>= 0.96), libgtksourceview-dev (>= 1.1.2), libgtk-cil (>= 0.95), libgnome-cil (>= 0.95), libglib-cil (>= 0.95), gtk-sharp-gapi (>= 0.95)
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch, cli-common (>= 0.2.0), autoconf, automake1.7, libtool, mono-mcs (>= 0.96) | c-sharp-compiler, mono-gac, monodoc-base (>= 1.0), libmono-dev (>= 0.96), libgtksourceview-dev (>= 1.1.2), libgtk-cil (>= 0.95), libgnome-cil (>= 0.95), libglib-cil (>= 0.95), gtk-sharp-gapi (>= 0.95)
+Standards-Version: 3.6.2.1
 
 Package: libgtksourceview-cil
 Architecture: all

Added: gtksourceview-sharp/trunk/debian/patches/00list
===================================================================
--- gtksourceview-sharp/trunk/debian/patches/00list	2005-10-13 08:22:34 UTC (rev 2074)
+++ gtksourceview-sharp/trunk/debian/patches/00list	2005-10-16 17:44:08 UTC (rev 2075)
@@ -0,0 +1 @@
+01_fix_docsdir

Added: gtksourceview-sharp/trunk/debian/patches/01_fix_docsdir.dpatch
===================================================================
--- gtksourceview-sharp/trunk/debian/patches/01_fix_docsdir.dpatch	2005-10-13 08:22:34 UTC (rev 2074)
+++ gtksourceview-sharp/trunk/debian/patches/01_fix_docsdir.dpatch	2005-10-16 17:44:08 UTC (rev 2075)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_docsdir.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gtksourceview-sharp-0.5~/doc/Makefile.in gtksourceview-sharp-0.5/doc/Makefile.in
+--- gtksourceview-sharp-0.5~/doc/Makefile.in	2005-10-16 19:06:08.000000000 +0200
++++ gtksourceview-sharp-0.5/doc/Makefile.in	2005-10-16 19:26:26.000000000 +0200
+@@ -181,7 +181,7 @@
+ @ENABLE_MONODOC_FALSE at TARGETS = 
+ @ENABLE_MONODOC_TRUE at TARGETS = gtksourceview-sharp-docs.zip gtksourceview-sharp-docs.tree gtksourceview-sharp-docs.source
+ @ENABLE_MONODOC_FALSE at docsdir = $(datadir)
+- at ENABLE_MONODOC_TRUE@docsdir = `$(MONODOC) --get-sourcesdir`
++ at ENABLE_MONODOC_TRUE@docsdir = `pkg-config monodoc --variable=sourcesdir`
+ @ENABLE_MONODOC_FALSE at docs_DATA = 
+ @ENABLE_MONODOC_TRUE at docs_DATA = $(TARGETS)
+ ASSEMBLER = $(MONODOC) --assemble


Property changes on: gtksourceview-sharp/trunk/debian/patches/01_fix_docsdir.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: gtksourceview-sharp/trunk/debian/rules
===================================================================
--- gtksourceview-sharp/trunk/debian/rules	2005-10-13 08:22:34 UTC (rev 2074)
+++ gtksourceview-sharp/trunk/debian/rules	2005-10-16 17:44:08 UTC (rev 2075)
@@ -4,25 +4,24 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
+include /usr/share/dpatch/dpatch.make
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
-	# hacks hacks hacks
-	perl -pe 's,`monodoc --get-sourcesdir`,$(CURDIR)/debian/tmp/usr/lib/monodoc/sources,;' \
-	  -i $(CURDIR)/doc/Makefile.in
 	# bugs bugs bugs
 	perl -pe 's,apidir = \$$\(DESTDIR\)\@gtksharp_prefix\@/share/gapi,apidir = \@gtksharp_prefix\@/share/gapi,;' \
 	  -i $(CURDIR)/gtksourceview/makefile.in
-	./configure --prefix=/usr
+	./configure --prefix=/usr MONODOC=/bin/true
 	touch configure-stamp
 
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE)
+	$(MAKE) ASSEMBLER=/usr/bin/mdassembler
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp