[Pkg-cli-libs-commits] [SCM] mono-fuse branch, master, updated. debian/0.4.2-1-4-g16db592

[Marco Nenciarini]

The following commit has been merged in the master branch:
commit a1c2dfb1466aa89dc1daa0106370f99ee6649f37
Author: Marco Nenciarini <mnencia at debian.org>
Date:   Wed Jan 6 22:27:36 2010 +0100

    Make source DSFG clean
    
    Strip create-native-map.exe (binary only executable) from upstream source.
    Build depends on mono-tools-devel which provides create-native-map
    Patch build system to use create-native-map provided by system

diff --git a/debian/changelog b/debian/changelog
index ec09811..338e30d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mono-fuse (0.4.2+dfsg-1) unstable; urgency=low
+
+  * Strip create-native-map.exe (binary only executable) from upstream source.
+  * Build depends on mono-tools-devel which provides create-native-map
+
+ -- Marco Nenciarini <mnencia at debian.org>  Wed, 06 Jan 2010 18:22:38 +0100
+
 mono-fuse (0.4.2-1) unstable; urgency=low
 
   * Initial release (Closes: #563052)
diff --git a/debian/control b/debian/control
index ee617ea..7660139 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  autoconf,
  cli-common-dev (>= 0.7),
  mono-devel (>= 2.4.2.3),
+ mono-tools-devel,
  monodoc-base,
  libfuse-dev
 Standards-Version: 3.8.3
diff --git a/debian/patches/0004-Use-system-s-create-native-map.patch b/debian/patches/0004-Use-system-s-create-native-map.patch
new file mode 100644
index 0000000..58117fa
--- /dev/null
+++ b/debian/patches/0004-Use-system-s-create-native-map.patch
@@ -0,0 +1,37 @@
+From: Marco Nenciarini <mnencia at debian.org>
+Date: Thu, 7 Jan 2010 09:41:41 +0100
+Subject: [PATCH] Use system's create-native-map
+
+---
+ configure.in              |    3 +++
+ src/Mono.Fuse/Makefile.am |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index da126f6..3279b0f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -131,6 +131,9 @@ fi
+ AC_SUBST(MDASSEMBLER)
+ AC_SUBST(MONODOCER)
+ 
++AC_PATH_PROG(CREATE_NATIVE_MAP, create-native-map, no)
++AC_SUBST(CREATE_NATIVE_MAP)
++
+ AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
+ 
+ AC_OUTPUT([
+diff --git a/src/Mono.Fuse/Makefile.am b/src/Mono.Fuse/Makefile.am
+index 94258f4..5f8bb39 100644
+--- a/src/Mono.Fuse/Makefile.am
++++ b/src/Mono.Fuse/Makefile.am
+@@ -20,7 +20,7 @@ $(DLL) : $(build_sources)
+ 	$(CSC) $(CSC_FLAGS) -d:TRACE -debug+ -out:$@ -target:library $(REFS) $(build_sources)
+ 
+ $(map_files) : $(DLL)
+-	mono $(srcdir)/create-native-map.exe  \
++	$(CREATE_NATIVE_MAP)  \
+ 		--impl-macro:FUSE_USE_VERSION=25    \
+ 		--impl-header:"<fuse.h>"            \
+ 		--library=MonoFuseHelper            \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 80a2ea6..5120d23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-fix-build.patch
 0002-native-libs-should-be-private.patch
 0003-fix-reported-version.patch
+0004-Use-system-s-create-native-map.patch
diff --git a/debian/rules b/debian/rules
index 6d49e1b..8387ba5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ SOURCE_DIR = $(DEBIAN_DIR)/..
 
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
-VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
+SOURCE_VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1)
+VERSION = $(shell echo $(SOURCE_VERSION) | sed 's/+dfsg.*//')
 
 include /usr/share/cli-common/cli.make
 
@@ -53,10 +54,12 @@ get-orig-source:
 		--repack
 	mkdir -p $@/repack
 	tar zx -C $@/repack -f $@/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz 
-	mv $@/repack/* $@/$(DEB_SOURCE_NAME)-$(VERSION) || ( mkdir $@/$(DEB_SOURCE_NAME)-$(VERSION) && mv $@/repack/* $@/$(DEB_SOURCE_NAME)-$(VERSION) )
-	rm -fr $@/$(DEB_SOURCE_NAME)-$(VERSION)/.git $@/$(DEB_SOURCE_NAME)-$(VERSION)/autom4te.cache
-	tar c -C $@ $(DEB_SOURCE_NAME)-$(VERSION) -f $(DEB_SOURCE_NAME)_$(VERSION).orig.tar
-	gzip -9fn $(DEB_SOURCE_NAME)_$(VERSION).orig.tar
+	mv $@/repack/* $@/$(DEB_SOURCE_NAME)-$(SOURCE_VERSION) || ( mkdir $@/$(DEB_SOURCE_NAME)-$(SOURCE_VERSION) && mv $@/repack/* $@/$(DEB_SOURCE_NAME)-$(SOURCE_VERSION) )
+	rm -fr $@/$(DEB_SOURCE_NAME)-$(SOURCE_VERSION)/.git \
+               $@/$(DEB_SOURCE_NAME)-$(SOURCE_VERSION)/autom4te.cache \
+	       $@/$(DEB_SOURCE_NAME)-$(SOURCE_VERSION)/src/Mono.Fuse/create-native-map.exe
+	tar c -C $@ $(DEB_SOURCE_NAME)-$(SOURCE_VERSION) -f $(DEB_SOURCE_NAME)_$(SOURCE_VERSION).orig.tar
+	gzip -9fn $(DEB_SOURCE_NAME)_$(SOURCE_VERSION).orig.tar
 	rm -r $@
 
 .PHONY: get-orig-source
diff --git a/debian/watch b/debian/watch
index 6b97885..23904c2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://www.jprl.com/Projects/mono-fuse/ mono-fuse-([\d\.]+)\.tar\.gz

-- 
mono-fuse