[Pkg-mono-svn-commits] rev 3188 - taglib-sharp/trunk/debian/patches

[Sebastian Dröge]

Author: slomo
Date: 2007-06-12 07:30:44 +0000 (Tue, 12 Jun 2007)
New Revision: 3188

Modified:
   taglib-sharp/trunk/debian/patches/01_build-system.dpatch
Log:
* update patch


Modified: taglib-sharp/trunk/debian/patches/01_build-system.dpatch
===================================================================
--- taglib-sharp/trunk/debian/patches/01_build-system.dpatch	2007-06-12 07:08:49 UTC (rev 3187)
+++ taglib-sharp/trunk/debian/patches/01_build-system.dpatch	2007-06-12 07:30:44 UTC (rev 3188)
@@ -41,72 +41,73 @@
  .NOEXPORT:
 
 
---- taglib-sharp/docs/Makefile.am.old	2007-05-14 17:41:31.000000000 +0200
-+++ taglib-sharp/docs/Makefile.am	2007-05-14 17:42:09.000000000 +0200
+--- taglib-sharp/docs/Makefile.am.old	2007-06-12 09:22:29.000000000 +0200
++++ taglib-sharp/docs/Makefile.am	2007-06-12 09:24:16.000000000 +0200
 @@ -7,12 +7,9 @@
  ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm)))
  
  if BUILD_DOCS
 -all: MonodocNodeConfig.exe
-+all: 
++all:
  
 -MonodocNodeConfig.exe: MonodocNodeConfig.cs
 -	mcs -out:$@ -r:System.Xml $<
 -
--docdir = $(DESTDIR)$(DOCDIR)
-+docdir = $(DESTDIR)`pkg-config --variable=sourcesdir monodoc`
- doc_DATA = \
+-monodocdir = $(DESTDIR)$(DOCDIR)
++monodocdir = $(DESTDIR)`pkg-config --variable=sourcesdir monodoc`
+ monodoc_DATA = \
  	taglib-sharp-docs.zip \
  	taglib-sharp-docs.tree \
-@@ -31,11 +28,6 @@
+@@ -34,11 +31,6 @@
  taglib-sharp-docs.zip taglib-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
  	$(DOC_ASSEMBLER) $(srcdir)/en
  
 -install-data-hook:
--	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --insert "TagLib Libraries" classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
+-	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --insert "TagLib#" classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
 -
 -uninstall-hook:
 -	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --remove classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
  endif
  
  EXTRA_DIST = \
---- taglib-sharp/docs/Makefile.in.old	2007-05-14 17:41:34.000000000 +0200
-+++ taglib-sharp/docs/Makefile.in	2007-05-14 17:42:54.000000000 +0200
+--- taglib-sharp/docs/Makefile.in.old	2007-06-12 09:22:34.000000000 +0200
++++ taglib-sharp/docs/Makefile.in	2007-06-12 09:27:55.000000000 +0200
 @@ -53,7 +53,7 @@
      *) f=$$p;; \
    esac;
  am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(docdir)"
+-am__installdirs = "$(DESTDIR)$(monodocdir)"
 +am__installdirs = "$(DESTDIR)`pkg-config --variable=sourcesdir monodoc`"
- docDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(doc_DATA)
+ monodocDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(monodoc_DATA)
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -125,8 +125,8 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
-- at BUILD_DOCS_TRUE@docdir = $(DESTDIR)$(DOCDIR)
--docdir = @docdir@
-+ at BUILD_DOCS_TRUE@docdir = $(DESTDIR)`pkg-config --variable=sourcesdir monodoc`
-+docdir = `pkg-config --variable=sourcesdir monodoc`
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -366,7 +366,7 @@
- 	uninstall-hook uninstall-info-am
+@@ -158,7 +158,7 @@
+ 	$(top_builddir)/src/taglib-sharp.dll
  
+ ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm)))
+- at BUILD_DOCS_TRUE@monodocdir = $(DESTDIR)$(DOCDIR)
++ at BUILD_DOCS_TRUE@monodocdir = $(DESTDIR)`pkg-config --variable=sourcesdir monodoc`
+ @BUILD_DOCS_TRUE at monodoc_DATA = \
+ @BUILD_DOCS_TRUE@	taglib-sharp-docs.zip \
+ @BUILD_DOCS_TRUE@	taglib-sharp-docs.tree \
+@@ -362,10 +362,7 @@
+ 	uninstall-info-am uninstall-monodocDATA
  
+ 
 - at BUILD_DOCS_TRUE@all: MonodocNodeConfig.exe
-+ at BUILD_DOCS_TRUE@all: 
+-
+- at BUILD_DOCS_TRUE@MonodocNodeConfig.exe: MonodocNodeConfig.cs
+- at BUILD_DOCS_TRUE@	mcs -out:$@ -r:System.Xml $<
++ at BUILD_DOCS_TRUE@all:
  
- @BUILD_DOCS_TRUE at MonodocNodeConfig.exe: MonodocNodeConfig.cs
- @BUILD_DOCS_TRUE@	mcs -out:$@ -r:System.Xml $<
-@@ -384,11 +384,6 @@
+ @BUILD_DOCS_TRUE at update-docs: $(ASSEMBLIES)
+ @BUILD_DOCS_TRUE@	$(DOC_UPDATER) $(ASSEMBLIES_BUILD) -path:en
+@@ -383,11 +380,6 @@
  @BUILD_DOCS_TRUE at taglib-sharp-docs.zip taglib-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
  @BUILD_DOCS_TRUE@	$(DOC_ASSEMBLER) $(srcdir)/en
  
 - at BUILD_DOCS_TRUE@install-data-hook:
-- at BUILD_DOCS_TRUE@	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --insert "TagLib Libraries" classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
+- at BUILD_DOCS_TRUE@	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --insert "TagLib#" classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
 -
 - at BUILD_DOCS_TRUE@uninstall-hook:
 - at BUILD_DOCS_TRUE@	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --remove classlib-taglib-sharp $(DOCDIR)/../monodoc.xml