[Pkg-cli-apps-commits] [bareftp] 02/04: Add support for 4.5 libraries to M4, and use (Closes: #808633)
Jo Shields
directhex at moszumanska.debian.org
Mon Dec 21 22:59:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to annotated tag debian/0.3.9-3
in repository bareftp.
commit 46fc76127e0551150e486cabedf96fd0e80a043d
Author: Jo Shields <directhex at apebox.org>
Date: Mon Dec 21 22:30:36 2015 +0000
Add support for 4.5 libraries to M4, and use (Closes: #808633)
---
debian/control | 1 +
.../add_and_use_4.5_support_to_shamrock.patch | 133 +++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 5 +-
4 files changed, 139 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 7baaf1b..27d09c4 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 7.0.50),
libgconf2.0-cil-dev (>= 2.12),
libgnome-keyring1.0-cil-dev,
intltool (>= 0.35),
+ dh-autoreconf,
libglib2.0-dev (>= 2.9.0)
Standards-Version: 3.9.1
Homepage: http://www.bareftp.org/
diff --git a/debian/patches/add_and_use_4.5_support_to_shamrock.patch b/debian/patches/add_and_use_4.5_support_to_shamrock.patch
new file mode 100644
index 0000000..cfadb39
--- /dev/null
+++ b/debian/patches/add_and_use_4.5_support_to_shamrock.patch
@@ -0,0 +1,133 @@
+Index: bareftp/configure.ac
+===================================================================
+--- bareftp.orig/configure.ac
++++ bareftp/configure.ac
+@@ -58,11 +58,11 @@ SHAMROCK_EXPAND_DATADIR
+ dnl Check Mono
+ dnl SHAMROCK_CHECK_MONO_MODULE(1.1.10)
+
+-SHAMROCK_FIND_MONO_2_0_COMPILER
++SHAMROCK_FIND_MONO_4_5_COMPILER
+ SHAMROCK_FIND_MONO_RUNTIME
+
+ dnl Check for assemblies
+-SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
++SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES([
+ System.Web
+ Mono.Posix
+ ])
+Index: bareftp/m4/shamrock/mono.m4
+===================================================================
+--- bareftp.orig/m4/shamrock/mono.m4
++++ bareftp/m4/shamrock/mono.m4
+@@ -8,41 +8,102 @@ AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILE
+ SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
+ ])
+
++AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
++[
++ SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
++])
++
++AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER],
++[
++ SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
++])
++
+ AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
+ [
+ SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
+ ])
+
++AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE],
++[
++ PKG_CHECK_MODULES(MONO_MODULE, $1 >= $2)
++])
++
+ AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE],
+ [
+- PKG_CHECK_MODULES(MONO_MODULE, mono >= $1)
++ _SHAMROCK_CHECK_MONO_MODULE(mono, $1)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE],
++[
++ _SHAMROCK_CHECK_MONO_MODULE(mono-2, $1)
++])
++
++AC_DEFUN([_SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
++[
++ PKG_CHECK_MODULES(MONO_MODULE, $2 >= $1,
++ HAVE_MONO_MODULE=yes, HAVE_MONO_MODULE=no)
++ AC_SUBST(HAVE_MONO_MODULE)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO_MODULE_NOBAIL],
++[
++ _SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono, $1)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO2_MODULE_NOBAIL],
++[
++ _SHAMROCK_CHECK_MONO_MODULE_NOBAIL(mono-2, $1)
+ ])
+
+ AC_DEFUN([_SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
+ [
+- for asm in $(echo "$*" | cut -d, -f2- | sed 's/\,/ /g')
++ for asm in $(echo "$*" | cut -d, -f3- | sed 's/\,/ /g')
+ do
+- AC_MSG_CHECKING([for Mono $1 GAC for $asm.dll])
++ AC_MSG_CHECKING([for Mono $2 GAC for $asm.dll])
+ if test \
+- -e "$($PKG_CONFIG --variable=libdir mono)/mono/$1/$asm.dll" -o \
+- -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/$1/$asm.dll"; \
++ -e "$($PKG_CONFIG --variable=libdir $1)/mono/$2/$asm.dll" -o \
++ -e "$($PKG_CONFIG --variable=prefix $1)/lib/mono/$2/$asm.dll"; \
+ then \
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+- AC_MSG_ERROR([missing reqired Mono $1 assembly: $asm.dll])
++ AC_MSG_ERROR([missing required Mono $2 assembly: $asm.dll])
+ fi
+ done
+ ])
+
+ AC_DEFUN([SHAMROCK_CHECK_MONO_1_0_GAC_ASSEMBLIES],
+ [
+- _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(1.0, $*)
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 1.0, $*)
+ ])
+
+ AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES],
+ [
+- _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(2.0, $*)
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 2.0, $*)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO2_2_0_GAC_ASSEMBLIES],
++[
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 2.0, $*)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES],
++[
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*)
+ ])
+
++AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES],
++[
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO_4_5_GAC_ASSEMBLIES],
++[
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.5, $*)
++])
++
++AC_DEFUN([SHAMROCK_CHECK_MONO2_4_5_GAC_ASSEMBLIES],
++[
++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.5, $*)
++])
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..11aeb2e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add_and_use_4.5_support_to_shamrock.patch
diff --git a/debian/rules b/debian/rules
index 0119748..ca50971 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ override_dh_auto_configure:
override_dh_auto_test:
# disabled
+override_dh_autoreconf:
+ dh_autoreconf autoreconf -- -f -I m4/bareftp -I m4/shamrock -i .
+
override_dh_auto_install:
dh_auto_install
rm -f $(CURDIR)/debian/bareftp/usr/lib/bareftp/libsftppty.a
@@ -32,6 +35,6 @@ get-orig-source:
--repack
%:
- dh $@ --with cli
+ dh $@ --with cli,autoreconf
.PHONY: get-orig-source
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/bareftp.git
More information about the Pkg-cli-apps-commits
mailing list