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

[hyperair-guest at users.alioth.debian.org]

Author: hyperair-guest
Date: Fri Feb 27 07:26:53 2009
New Revision: 4030

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4030
Log:
* Fixed FTBFS where mcs instead of $(MCS) was used to build XmlInjector.exe
* Changed monodocdir from $(DESTDIR)$(DOCDIR) to $(DOCDIR) since $(DESTDIR) is
  appended to $(monodocdir) later anyway.

Modified:
    packages/taglib-sharp/trunk/   (props changed)
    packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch

Propchange: packages/taglib-sharp/trunk/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Fri Feb 27 07:26:53 2009
@@ -1,6 +1,1 @@
-debian/changelog	3131 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Ftaglib-sharp%2Ftrunk:debian%2Fchangelog
-debian/control	3131 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Ftaglib-sharp%2Ftrunk:debian%2Fcontrol
-debian/libtaglib2.0-cil.install	3188 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Ftaglib-sharp%2Ftrunk:debian%2Flibtaglib2.0-cil.install
 debian/patches/01_build-system.dpatch	3138 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Ftaglib-sharp%2Ftrunk:debian%2Fpatches%2F01_build-system.dpatch
-debian/rules	3131 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Ftaglib-sharp%2Ftrunk:debian%2Frules
-debian/watch	3603 at caf891c2-51b6-4cb3-8206-960372f2aebe:packages%2Ftaglib-sharp%2Ftrunk:debian%2Fwatch

Propchange: packages/taglib-sharp/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk2 (original)
+++ bzr:revision-id:v3-trunk2 Fri Feb 27 07:26:53 2009
@@ -1,1 +1,2 @@
 36 hyperair at gmail.com-20090226223805-z1tjzi49n21wugau
+37 hyperair at gmail.com-20090227072438-z4ovbmfhhs23a0ar

Propchange: packages/taglib-sharp/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Fri Feb 27 07:26:53 2009
@@ -1,4 +1,4 @@
-timestamp: 2009-02-27 06:38:05.368000031 +0800
+timestamp: 2009-02-27 15:24:38.654000044 +0800
 committer: Chow Loong Jin <hyperair at gmail.com>
 properties: 
 	branch-nick: debian-trunk

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=4030&op=diff
==============================================================================
--- packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch (original)
+++ packages/taglib-sharp/trunk/debian/patches/01_build-system.dpatch Fri Feb 27 07:26:53 2009
@@ -2,8 +2,20 @@
 
 @DPATCH@
 diff -urNad taglib-sharp-2.0.3.2~/docs/Makefile.am taglib-sharp-2.0.3.2/docs/Makefile.am
---- taglib-sharp-2.0.3.2~/docs/Makefile.am	2009-02-26 17:07:08.000000000 +0800
-+++ taglib-sharp-2.0.3.2/docs/Makefile.am	2009-02-26 17:41:15.000000000 +0800
+--- taglib-sharp-2.0.3.2~/docs/Makefile.am	2009-02-17 05:21:04.000000000 +0800
++++ taglib-sharp-2.0.3.2/docs/Makefile.am	2009-02-27 14:58:46.000000000 +0800
+@@ -8,9 +8,9 @@
+ all: XmlInjector.exe
+ 
+ XmlInjector.exe: XmlInjector.cs
+-	mcs -out:$@ -r:System.Xml $<
++	$(MCS) -out:$@ -r:System.Xml $<
+ 
+-monodocdir = $(DESTDIR)$(DOCDIR)
++monodocdir = $(DOCDIR)
+ monodoc_DATA = \
+ 	taglib-sharp-docs.zip \
+ 	taglib-sharp-docs.tree \
 @@ -23,7 +23,6 @@
  		rm -rf en; \
  	fi
@@ -26,8 +38,26 @@
  	if [ -d en ]; then \
  		rm -rf en; \
 diff -urNad taglib-sharp-2.0.3.2~/docs/Makefile.in taglib-sharp-2.0.3.2/docs/Makefile.in
---- taglib-sharp-2.0.3.2~/docs/Makefile.in	2009-02-26 17:07:08.000000000 +0800
-+++ taglib-sharp-2.0.3.2/docs/Makefile.in	2009-02-26 17:41:15.000000000 +0800
+--- taglib-sharp-2.0.3.2~/docs/Makefile.in	2009-02-17 05:21:15.000000000 +0800
++++ taglib-sharp-2.0.3.2/docs/Makefile.in	2009-02-27 14:59:15.000000000 +0800
+@@ -147,7 +147,7 @@
+ DOC_ASSEMBLER = @MDASSEMBLER@ --out taglib-sharp-docs --ecma
+ ASSEMBLY = $(top_builddir)/src/$(ASSEMBLY_NAME).dll
+ SLASHDOC = $(ASSEMBLY).xml
+- at BUILD_DOCS_TRUE@monodocdir = $(DESTDIR)$(DOCDIR)
++ at BUILD_DOCS_TRUE@monodocdir = $(DOCDIR)
+ @BUILD_DOCS_TRUE at monodoc_DATA = \
+ @BUILD_DOCS_TRUE@	taglib-sharp-docs.zip \
+ @BUILD_DOCS_TRUE@	taglib-sharp-docs.tree \
+@@ -365,7 +365,7 @@
+ @BUILD_DOCS_TRUE at all: XmlInjector.exe
+ 
+ @BUILD_DOCS_TRUE at XmlInjector.exe: XmlInjector.cs
+- at BUILD_DOCS_TRUE@	mcs -out:$@ -r:System.Xml $<
++ at BUILD_DOCS_TRUE@	$(MCS) -out:$@ -r:System.Xml $<
+ 
+ @BUILD_DOCS_TRUE at en/index.xml: $(ASSEMBLY) $(SLASHDOC) XmlInjector.exe Package.en.xml
+ # monodocer will create duplicate tags if run multiple times. Delete the whole
 @@ -374,7 +374,6 @@
  @BUILD_DOCS_TRUE@		rm -rf en; \
  @BUILD_DOCS_TRUE@	fi