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

Sebastian Dröge slomo at alioth.debian.org
Mon May 14 15:41:57 UTC 2007 

Author: slomo
Date: 2007-05-14 15:41:57 +0000 (Mon, 14 May 2007)
New Revision: 3137

Added:
   taglib-sharp/trunk/debian/libtaglib1.9-cil.install
   taglib-sharp/trunk/debian/monodoc-taglib-manual.install
   taglib-sharp/trunk/debian/monodoc-taglib-manual.postinst
   taglib-sharp/trunk/debian/patches/00list
   taglib-sharp/trunk/debian/patches/01_build-system.dpatch
Removed:
   taglib-sharp/trunk/debian/install
   taglib-sharp/trunk/debian/installcligac
Modified:
   taglib-sharp/trunk/debian/control
   taglib-sharp/trunk/debian/rules
Log:
* even more cleanup


Modified: taglib-sharp/trunk/debian/control
===================================================================
--- taglib-sharp/trunk/debian/control	2007-05-14 15:19:02 UTC (rev 3136)
+++ taglib-sharp/trunk/debian/control	2007-05-14 15:41:57 UTC (rev 3137)
@@ -4,7 +4,7 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Sebastian Dröge <slomo at debian.org> 
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.9) | c-sharp-2.0-compiler, nunit
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.9) | c-sharp-2.0-compiler, libmono-dev (>= 1.1), mono-gac, libmono2.0-cil, libgnome2.0-cil, pkg-config
 Standards-Version: 3.7.2
 
 Package: libtaglib1.9-cil
@@ -13,3 +13,18 @@
 Description: CLI library for accessing audio and video files metadata
  TagLib# is a CLI library used to read and manipulate metadata
  in different audio and video file formats.
+
+Package: monodoc-taglib-manual
+Section: doc
+Architecture: all
+Depends: monodoc-manual, ${misc:Depends}
+Description: compiled XML documentation for taglib-sharp
+ The MonoDoc Project is the documentation framework of the Mono project which
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
+ .
+ TagLib# is a CLI library used to read and manipulate metadata
+ in different audio and video file formats.
+ .
+ This packages contains the compiled XML documentation for taglib-sharp.
+

Deleted: taglib-sharp/trunk/debian/install
===================================================================
--- taglib-sharp/trunk/debian/install	2007-05-14 15:19:02 UTC (rev 3136)
+++ taglib-sharp/trunk/debian/install	2007-05-14 15:41:57 UTC (rev 3137)
@@ -1 +0,0 @@
-usr

Deleted: taglib-sharp/trunk/debian/installcligac
===================================================================
--- taglib-sharp/trunk/debian/installcligac	2007-05-14 15:19:02 UTC (rev 3136)
+++ taglib-sharp/trunk/debian/installcligac	2007-05-14 15:41:57 UTC (rev 3137)
@@ -1 +0,0 @@
-/usr/lib/cli/taglib-sharp-1.9/taglib-sharp.dll

Added: taglib-sharp/trunk/debian/libtaglib1.9-cil.install
===================================================================
--- taglib-sharp/trunk/debian/libtaglib1.9-cil.install	                        (rev 0)
+++ taglib-sharp/trunk/debian/libtaglib1.9-cil.install	2007-05-14 15:41:57 UTC (rev 3137)
@@ -0,0 +1,3 @@
+usr/lib/cli
+usr/lib/pkgconfig
+usr/share

Added: taglib-sharp/trunk/debian/monodoc-taglib-manual.install
===================================================================
--- taglib-sharp/trunk/debian/monodoc-taglib-manual.install	                        (rev 0)
+++ taglib-sharp/trunk/debian/monodoc-taglib-manual.install	2007-05-14 15:41:57 UTC (rev 3137)
@@ -0,0 +1 @@
+usr/lib/monodoc/sources

Added: taglib-sharp/trunk/debian/monodoc-taglib-manual.postinst
===================================================================
--- taglib-sharp/trunk/debian/monodoc-taglib-manual.postinst	                        (rev 0)
+++ taglib-sharp/trunk/debian/monodoc-taglib-manual.postinst	2007-05-14 15:41:57 UTC (rev 3137)
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if [ -x /usr/lib/monodoc/browser.exe ]; then
+        echo "generating monodoc search index..."
+        monodoc --make-index > /dev/null
+fi
+
+#DEBHELPER#
+

Added: taglib-sharp/trunk/debian/patches/00list
===================================================================
--- taglib-sharp/trunk/debian/patches/00list	                        (rev 0)
+++ taglib-sharp/trunk/debian/patches/00list	2007-05-14 15:41:57 UTC (rev 3137)
@@ -0,0 +1 @@
+01_build-system.dpatch

Added: taglib-sharp/trunk/debian/patches/01_build-system.dpatch
===================================================================
--- taglib-sharp/trunk/debian/patches/01_build-system.dpatch	                        (rev 0)
+++ taglib-sharp/trunk/debian/patches/01_build-system.dpatch	2007-05-14 15:41:57 UTC (rev 3137)
@@ -0,0 +1,93 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- taglib-sharp/docs/Makefile.am.old	2007-05-14 17:28:57.000000000 +0200
++++ taglib-sharp/docs/Makefile.am	2007-05-14 17:30:04.000000000 +0200
+@@ -7,10 +7,7 @@
+ ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm)))
+ 
+ if BUILD_DOCS
+-all: MonodocNodeConfig.exe
+-
+-MonodocNodeConfig.exe: MonodocNodeConfig.cs
+-	mcs -out:$@ -r:System.Xml $<
++all: 
+ 
+ docdir = $(DESTDIR)$(DOCDIR)
+ doc_DATA = \
+@@ -31,11 +28,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
+-
+-uninstall-hook:
+-	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --remove classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
+ endif
+ 
+ EXTRA_DIST = \
+--- taglib-sharp/src/Makefile.am.old	2007-05-14 17:29:05.000000000 +0200
++++ taglib-sharp/src/Makefile.am	2007-05-14 17:29:13.000000000 +0200
+@@ -138,14 +138,3 @@
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb taglib-sharp.snk 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-install-data-local:
+-	@if test -n '$(TARGET)'; then						\
+-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)";	\
+-	  $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;	\
+-	fi
+-
+-uninstall-local:
+-	@if test -n '$(TARGET)'; then						\
+-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)";	\
+-	  $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;	\
+-	fi
+--- taglib-sharp/docs/Makefile.in.old	2007-05-14 17:29:00.000000000 +0200
++++ taglib-sharp/docs/Makefile.in	2007-05-14 17:30:36.000000000 +0200
+@@ -366,10 +366,7 @@
+ 	uninstall-hook uninstall-info-am
+ 
+ 
+- at BUILD_DOCS_TRUE@all: MonodocNodeConfig.exe
+-
+- 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 update-docs: $(ASSEMBLIES)
+ @BUILD_DOCS_TRUE@	$(DOC_UPDATER) $(ASSEMBLIES_BUILD) -path:en
+@@ -384,11 +381,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@uninstall-hook:
+- at BUILD_DOCS_TRUE@	$(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --remove classlib-taglib-sharp $(DOCDIR)/../monodoc.xml
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- taglib-sharp/src/Makefile.in.old	2007-05-14 17:29:03.000000000 +0200
++++ taglib-sharp/src/Makefile.in	2007-05-14 17:29:20.000000000 +0200
+@@ -441,17 +441,6 @@
+ 
+ all: $(ASSEMBLY)
+ 
+-install-data-local:
+-	@if test -n '$(TARGET)'; then						\
+-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)";	\
+-	  $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;	\
+-	fi
+-
+-uninstall-local:
+-	@if test -n '$(TARGET)'; then						\
+-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)";	\
+-	  $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;	\
+-	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: taglib-sharp/trunk/debian/rules
===================================================================
--- taglib-sharp/trunk/debian/rules	2007-05-14 15:19:02 UTC (rev 3136)
+++ taglib-sharp/trunk/debian/rules	2007-05-14 15:41:57 UTC (rev 3137)
@@ -13,14 +13,6 @@
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 ABIVERSION = 1.9
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -44,6 +36,7 @@
 	rm -f build-stamp configure-stamp
 
 	-$(MAKE) clean
+	-rm -r $(MONO_SHARED_DIR)
 
 	dh_clean 
 
@@ -53,17 +46,18 @@
 	dh_clean -k 
 
 	dh_installdirs
+
+	$(MAKE) DESTDIR=$(CURDIR)/debian install
 	
 	mkdirhier debian/tmp/usr/lib/cli/taglib-sharp-$(ABIVERSION) debian/tmp/usr/lib/pkgconfig
 	cp src/taglib-sharp.dll debian/tmp/usr/lib/cli/taglib-sharp-$(ABIVERSION)/
 	cp src/taglib-sharp.dll.mdb debian/tmp/usr/lib/cli/taglib-sharp-$(ABIVERSION)/
-	cp taglib-sharp.pc debian/tmp/usr/lib/pkgconfig
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	find debian/tmp -type f -name "*.mdb" -delete
 endif
 
-binary-arch: build install
+binary-arch:
 
 binary-indep: build install
 	dh_testdir

More information about the Pkg-mono-svn-commits mailing list