[SCM] libiodbc2 packaging branch, master, updated. debian/3.52.8-1-14-g4f77f09
Maximiliano Curia
maxy at moszumanska.debian.org
Wed May 14 12:27:21 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libiodbc2.git;a=commitdiff;h=be8bf62
The following commit has been merged in the master branch:
commit be8bf62af5fc0718b2ab8da969d557c814435877
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri May 9 13:11:28 2014 +0200
Refresh patches, delete applied ones
---
debian/changelog | 4 +
debian/patches/03_bug508480.diff | 8 +-
debian/patches/06_add_system_dir.diff | 14 +-
debian/patches/admin-compile | 147 ---------------------
.../patches/full_path_wont_match_local_rule.diff | 20 ---
debian/patches/series | 2 -
6 files changed, 15 insertions(+), 180 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 843d8f9..2456a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ libiodbc2 (3.52.9-1) UNRELEASED; urgency=medium
* Prepare package for unstable. (Closes: #715086, #724405)
* Add abi-compliance-checker info.
* New upstream release.
+ * Delete patch: admin-compile, upstream added the missing file.
+ * Delete patch: full_path_wont_match_local_rule.diff, applied
+ upstream.
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Fri, 09 May 2014 13:02:40 +0200
diff --git a/debian/patches/03_bug508480.diff b/debian/patches/03_bug508480.diff
index d1e8018..3600f19 100644
--- a/debian/patches/03_bug508480.diff
+++ b/debian/patches/03_bug508480.diff
@@ -1,10 +1,10 @@
-Index: libiodbc2-3.52.7/iodbcinst/inifile.c
+Index: libiodbc2/iodbcinst/inifile.c
===================================================================
---- libiodbc2-3.52.7.orig/iodbcinst/inifile.c 2010-06-26 21:29:43.000000000 +0200
-+++ libiodbc2-3.52.7/iodbcinst/inifile.c 2010-06-26 21:30:07.000000000 +0200
+--- libiodbc2.orig/iodbcinst/inifile.c 2014-05-09 13:07:52.748025370 +0200
++++ libiodbc2/iodbcinst/inifile.c 2014-05-09 13:07:52.744025529 +0200
@@ -1023,7 +1023,8 @@
- if (!_iodbcdm_cfg_find (pCfg, lpszSection, NULL))
+ if (!_iodbcdm_cfg_find (pCfg, (char*)lpszSection, NULL))
{
- while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg))
+ while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg)
diff --git a/debian/patches/06_add_system_dir.diff b/debian/patches/06_add_system_dir.diff
index 39322f9..a9298e6 100644
--- a/debian/patches/06_add_system_dir.diff
+++ b/debian/patches/06_add_system_dir.diff
@@ -1,15 +1,14 @@
Add a system dir to be able to load drivers from a system dir without having a full
path to the drivers, as it is done nowadays on debian systems
-Index: libiodbc2-3.52.7/iodbc/connect.c
+Index: libiodbc2/iodbc/connect.c
===================================================================
---- libiodbc2-3.52.7.orig/iodbc/connect.c 2013-05-17 21:03:10.000000000 +0200
-+++ libiodbc2-3.52.7/iodbc/connect.c 2013-05-17 21:10:35.000000000 +0200
-@@ -1085,6 +1085,14 @@
- }
+--- libiodbc2.orig/iodbc/connect.c 2014-05-09 13:08:22.282851046 +0200
++++ libiodbc2/iodbc/connect.c 2014-05-09 13:08:22.282851046 +0200
+@@ -1088,6 +1088,14 @@
genv = (GENV_t *) pdbc->genv;
-+
+
+#ifdef SYSTEM_DIR
+ char path_with_multiarch[1024];
+ if (!(path[0] == '/' || path[0] == '.')) {
@@ -17,6 +16,7 @@ Index: libiodbc2-3.52.7/iodbc/connect.c
+ path = path_with_multiarch;
+ }
+#endif
-
++
/* This will either load the driver dll or increase its reference count */
hdll = _iodbcdm_dllopen ((char *) path);
+
diff --git a/debian/patches/admin-compile b/debian/patches/admin-compile
deleted file mode 100644
index 42809b3..0000000
--- a/debian/patches/admin-compile
+++ /dev/null
@@ -1,147 +0,0 @@
-Index: libiodbc2-3.52.7/admin/compile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libiodbc2-3.52.7/admin/compile 2010-06-26 22:18:47.000000000 +0200
-@@ -0,0 +1,142 @@
-+#! /bin/sh
-+# Wrapper for compilers which do not understand `-c -o'.
-+
-+scriptversion=2005-02-03.08
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Written by Tom Tromey <tromey at cygnus.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+case $1 in
-+ '')
-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
-+ -h | --h*)
-+ cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand `-c -o'.
-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file `INSTALL'.
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v | --v*)
-+ echo "compile $scriptversion"
-+ exit $?
-+ ;;
-+esac
-+
-+ofile=
-+cfile=
-+eat=
-+
-+for arg
-+do
-+ if test -n "$eat"; then
-+ eat=
-+ else
-+ case $1 in
-+ -o)
-+ # configure might choose to run compile as `compile cc -o foo foo.c'.
-+ # So we strip `-o arg' only if arg is an object.
-+ eat=1
-+ case $2 in
-+ *.o | *.obj)
-+ ofile=$2
-+ ;;
-+ *)
-+ set x "$@" -o "$2"
-+ shift
-+ ;;
-+ esac
-+ ;;
-+ *.c)
-+ cfile=$1
-+ set x "$@" "$1"
-+ shift
-+ ;;
-+ *)
-+ set x "$@" "$1"
-+ shift
-+ ;;
-+ esac
-+ fi
-+ shift
-+done
-+
-+if test -z "$ofile" || test -z "$cfile"; then
-+ # If no `-o' option was seen then we might have been invoked from a
-+ # pattern rule where we don't need one. That is ok -- this is a
-+ # normal compilation that the losing compiler can handle. If no
-+ # `.c' file was seen then we are probably linking. That is also
-+ # ok.
-+ exec "$@"
-+fi
-+
-+# Name of file we expect compiler to create.
-+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-+
-+# Create the lock directory.
-+# Note: use `[/.-]' here to ensure that we don't use the same name
-+# that we are using for the .o file. Also, base the name on the expected
-+# object file name, since that is what matters with a parallel build.
-+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-+while true; do
-+ if mkdir "$lockdir" >/dev/null 2>&1; then
-+ break
-+ fi
-+ sleep 1
-+done
-+# FIXME: race condition here if user kills between mkdir and trap.
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
-+
-+# Run the compile.
-+"$@"
-+ret=$?
-+
-+if test -f "$cofile"; then
-+ mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+ mv "${cofile}bj" "$ofile"
-+fi
-+
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
diff --git a/debian/patches/full_path_wont_match_local_rule.diff b/debian/patches/full_path_wont_match_local_rule.diff
deleted file mode 100644
index 5924052..0000000
--- a/debian/patches/full_path_wont_match_local_rule.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 1aaf73ad6051b012d42b41a3fc5fae85c13fdba0
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Fri Jun 7 19:33:21 2013 +0200
-
- Full path wont match local rule.
-
-diff --git a/iodbcadm/Makefile.am b/iodbcadm/Makefile.am
-index eafc7c7..4a919b8 100644
---- a/iodbcadm/Makefile.am
-+++ b/iodbcadm/Makefile.am
-@@ -117,8 +117,8 @@ libiodbcadm_la_SOURCES = \
-
- iodbcadm_gtk_SOURCES =
- iodbcadm_gtk_LDADD = \
-+ libiodbcadm.la \
- ../iodbcadm/gtk/main.lo \
-- ../iodbcadm/libiodbcadm.la \
- ../iodbcinst/libiodbcinst.la \
- ../iodbc/libiodbc.la \
- @GTK_LIBS@
diff --git a/debian/patches/series b/debian/patches/series
index 83469cf..02ad637 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-admin-compile
02_gtk.diff
03_bug508480.diff
04_bug501100.diff
05_unicode_includes.diff
06_add_system_dir.diff
-full_path_wont_match_local_rule.diff
--
libiodbc2 packaging
More information about the pkg-kde-commits
mailing list