[Pkg-cli-libs-commits] [SCM] taglib-sharp branch, master, updated. debian/2.0.3.2+dfsg-3-14-g008ed39

Chow Loong Jin hyperair at gmail.com
Thu Oct 8 18:37:39 UTC 2009


The following commit has been merged in the master branch:
commit 15ef4201f04bc1af644521a699f5ec0a88de3551
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Oct 8 03:01:16 2009 +0800

    Refreshed to patch cleanly
    
    * debian/patches/01_build-system.dpatch:
      + Refreshed to patch cleanly

diff --git a/debian/changelog b/debian/changelog
index 04a2306..429c626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ taglib-sharp (2.0.3.3+dfsg-1) UNRELEASED; urgency=low
     + Update Vcs-* fields to git
     + Bump Standards-Version to 3.8.3
       - Set Section to cli-mono
+  * debian/patches/01_build-system.dpatch:
+    + Refreshed to patch cleanly
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 08 Oct 2009 02:49:51 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 08 Oct 2009 03:00:48 +0800
 
 taglib-sharp (2.0.3.2+dfsg-3) unstable; urgency=low
 
diff --git a/debian/patches/01_build-system.dpatch b/debian/patches/01_build-system.dpatch
old mode 100644
new mode 100755
index 8ed3d4f..e23e6b1
--- a/debian/patches/01_build-system.dpatch
+++ b/debian/patches/01_build-system.dpatch
@@ -1,15 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 
 @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-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
- 
+diff -urNad taglib-sharp~/docs/Makefile.am taglib-sharp/docs/Makefile.am
+--- taglib-sharp~/docs/Makefile.am	2009-10-08 02:57:21.000000000 +0800
++++ taglib-sharp/docs/Makefile.am	2009-10-08 02:58:43.975849049 +0800
+@@ -10,7 +10,7 @@
  XmlInjector.exe: XmlInjector.cs
--	mcs -out:$@ -r:System.Xml $<
-+	$(MCS) -out:$@ -r:System.Xml $<
+ 	$(MCS) -out:$@ -r:System.Xml $<
  
 -monodocdir = $(DESTDIR)$(DOCDIR)
 +monodocdir = $(DOCDIR)
@@ -19,7 +16,7 @@ diff -urNad taglib-sharp-2.0.3.2~/docs/Makefile.am taglib-sharp-2.0.3.2/docs/Mak
 @@ -23,7 +23,6 @@
  		rm -rf en; \
  	fi
- 	$(DOC_UPDATER) -assembly:$(ASSEMBLY) -importslashdoc:$(SLASHDOC) -path:en
+ 	$(DOC_UPDATER) -assembly:$(ASSEMBLY) -importslashdoc:$(SLASHDOC) -path:en > /dev/null
 -	$(MONO) XmlInjector.exe Package.en.xml InsertMissingValues
  
  update-html: en
@@ -37,10 +34,10 @@ diff -urNad taglib-sharp-2.0.3.2~/docs/Makefile.am taglib-sharp-2.0.3.2/docs/Mak
  clean-local:
  	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-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 @@
+diff -urNad taglib-sharp~/docs/Makefile.in taglib-sharp/docs/Makefile.in
+--- taglib-sharp~/docs/Makefile.in	2009-10-08 02:57:21.000000000 +0800
++++ taglib-sharp/docs/Makefile.in	2009-10-08 02:59:40.763857624 +0800
+@@ -165,7 +165,7 @@
  DOC_ASSEMBLER = @MDASSEMBLER@ --out taglib-sharp-docs --ecma
  ASSEMBLY = $(top_builddir)/src/$(ASSEMBLY_NAME).dll
  SLASHDOC = $(ASSEMBLY).xml
@@ -49,24 +46,15 @@ diff -urNad taglib-sharp-2.0.3.2~/docs/Makefile.in taglib-sharp-2.0.3.2/docs/Mak
  @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 @@
+@@ -411,7 +411,6 @@
  @BUILD_DOCS_TRUE@		rm -rf en; \
  @BUILD_DOCS_TRUE@	fi
- @BUILD_DOCS_TRUE@	$(DOC_UPDATER) -assembly:$(ASSEMBLY) -importslashdoc:$(SLASHDOC) -path:en
+ @BUILD_DOCS_TRUE@	$(DOC_UPDATER) -assembly:$(ASSEMBLY) -importslashdoc:$(SLASHDOC) -path:en > /dev/null
 - at BUILD_DOCS_TRUE@	$(MONO) XmlInjector.exe Package.en.xml InsertMissingValues
  
  @BUILD_DOCS_TRUE at update-html: en
  @BUILD_DOCS_TRUE@	if [ -d taglib-sharp-web-docs ]; then \
-@@ -388,12 +387,6 @@
+@@ -425,12 +424,6 @@
  @BUILD_DOCS_TRUE at taglib-sharp-docs.zip: en/index.xml
  @BUILD_DOCS_TRUE@	$(DOC_ASSEMBLER) en
  

-- 
taglib-sharp



More information about the Pkg-cli-libs-commits mailing list