[Pkg-cli-libs-commits] r3693 - in /packages/taglib-sharp/trunk/debian: changelog patches/01_build-system.dpatch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Apr 10 06:28:07 2008
New Revision: 3693

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3693
Log:
debian/patches/01_build-system.dpatch:
+ Don't run XmlInjector at all to fix FTBFS with newer monodoc
versions (Closes: #475218).

Modified:
    packages/taglib-sharp/trunk/debian/changelog
    packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch

Modified: packages/taglib-sharp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taglib-sharp/trunk/debian/changelog?rev=3693&op=diff
==============================================================================
--- packages/taglib-sharp/trunk/debian/changelog (original)
+++ packages/taglib-sharp/trunk/debian/changelog Thu Apr 10 06:28:07 2008
@@ -1,9 +1,12 @@
-taglib-sharp (2.0.3.0-2) UNRELEASED; urgency=low
+taglib-sharp (2.0.3.0-2) unstable; urgency=low
 
   * debian/watch:
     + Add watch file, thanks to Emilio Pozuelo Monfort.
+  * debian/patches/01_build-system.dpatch:
+    + Don't run XmlInjector at all to fix FTBFS with newer monodoc
+      versions (Closes: #475218).
 
- -- Sebastian Dröge <slomo at debian.org>  Thu, 21 Feb 2008 16:53:28 +0100
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 10 Apr 2008 08:27:06 +0200
 
 taglib-sharp (2.0.3.0-1) unstable; urgency=low
 

Modified: packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch?rev=3693&op=diff
==============================================================================
--- packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch (original)
+++ packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch Thu Apr 10 06:28:07 2008
@@ -68,8 +68,16 @@
  distwin:
  	mkdir -p $(srcdir)/../$(WINDIR)/Libraries
  	cp $(srcdir)/*.dll $(srcdir)/*.config $(srcdir)/../$(WINDIR)/Libraries
---- taglib-sharp/docs/Makefile.am.old	2008-01-12 04:24:35.000000000 +0100
-+++ taglib-sharp/docs/Makefile.am	2008-01-12 04:25:51.000000000 +0100
+--- taglib-sharp/docs/taglib-sharp-docs.source.old	2008-01-12 04:28:30.000000000 +0100
++++ taglib-sharp/docs/taglib-sharp-docs.source	2008-01-12 04:29:03.000000000 +0100
+@@ -1,4 +1,4 @@
+ <?xml version="1.0"?>
+ <monodoc>
+-  <source provider="ecma" basefile="taglib-sharp-docs" path="classlib-taglib-sharp" />
++  <source provider="ecma" basefile="taglib-sharp-docs" path="various" title="TagLib" />
+ </monodoc>
+--- taglib-sharp/docs/Makefile.am.old	2008-04-10 08:25:27.000000000 +0200
++++ taglib-sharp/docs/Makefile.am	2008-04-10 08:25:55.000000000 +0200
 @@ -8,9 +8,9 @@
  all: XmlInjector.exe
  
@@ -82,7 +90,15 @@
  monodoc_DATA = \
  	taglib-sharp-docs.zip \
  	taglib-sharp-docs.tree \
-@@ -35,12 +35,6 @@
+@@ -23,7 +23,6 @@
+ 		rm -rf $(srcdir)/en; \
+ 	fi
+ 	monodocer /assembly:$(ASSEMBLY) /importslashdoc:$(SLASHDOC) /path:en
+-	$(MONO) $(srcdir)/XmlInjector.exe $(srcdir)/Package.en.xml InsertMissingValues
+ 
+ update-html: $(srcdir)/en
+ 	if [ -d taglib-sharp-web-docs ]; then \
+@@ -35,12 +34,6 @@
  taglib-sharp-docs.zip taglib-sharp-docs.tree: $(srcdir)/en/index.xml
  	$(DOC_ASSEMBLER) $(srcdir)/en
  
@@ -95,8 +111,8 @@
  clean-local:
  	if [ -d $(srcdir)/en ]; then \
  		rm -rf $(srcdir)/en; \
---- taglib-sharp/docs/Makefile.in.old	2008-01-12 04:24:38.000000000 +0100
-+++ taglib-sharp/docs/Makefile.in	2008-01-12 04:26:54.000000000 +0100
+--- taglib-sharp/docs/Makefile.in.old	2008-04-10 08:25:30.000000000 +0200
++++ taglib-sharp/docs/Makefile.in	2008-04-10 08:26:06.000000000 +0200
 @@ -159,7 +159,7 @@
  DOC_ASSEMBLER = @MDASSEMBLER@ --out taglib-sharp-docs --ecma
  ASSEMBLY = $(top_builddir)/src/$(ASSEMBLY_NAME).dll
@@ -115,7 +131,15 @@
  
  @BUILD_DOCS_TRUE@$(srcdir)/en/index.xml: $(ASSEMBLY) $(SLASHDOC) $(srcdir)/XmlInjector.exe $(srcdir)/Package.en.xml
  # monodocer will create duplicate tags if run multiple times. Delete the whole
-@@ -398,12 +398,6 @@
+@@ -386,7 +386,6 @@
+ @BUILD_DOCS_TRUE@		rm -rf $(srcdir)/en; \
+ @BUILD_DOCS_TRUE@	fi
+ @BUILD_DOCS_TRUE@	monodocer /assembly:$(ASSEMBLY) /importslashdoc:$(SLASHDOC) /path:en
+- at BUILD_DOCS_TRUE@	$(MONO) $(srcdir)/XmlInjector.exe $(srcdir)/Package.en.xml InsertMissingValues
+ 
+ @BUILD_DOCS_TRUE at update-html: $(srcdir)/en
+ @BUILD_DOCS_TRUE@	if [ -d taglib-sharp-web-docs ]; then \
+@@ -398,12 +397,6 @@
  @BUILD_DOCS_TRUE at taglib-sharp-docs.zip taglib-sharp-docs.tree: $(srcdir)/en/index.xml
  @BUILD_DOCS_TRUE@	$(DOC_ASSEMBLER) $(srcdir)/en
  
@@ -128,11 +152,3 @@
  @BUILD_DOCS_TRUE at clean-local:
  @BUILD_DOCS_TRUE@	if [ -d $(srcdir)/en ]; then \
  @BUILD_DOCS_TRUE@		rm -rf $(srcdir)/en; \
---- taglib-sharp/docs/taglib-sharp-docs.source.old	2008-01-12 04:28:30.000000000 +0100
-+++ taglib-sharp/docs/taglib-sharp-docs.source	2008-01-12 04:29:03.000000000 +0100
-@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
- <monodoc>
--  <source provider="ecma" basefile="taglib-sharp-docs" path="classlib-taglib-sharp" />
-+  <source provider="ecma" basefile="taglib-sharp-docs" path="various" title="TagLib" />
- </monodoc>