Merge lp:~oif-team/geis/packaging-1.0.12 into lp:~oif-team/geis/packaging

Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 85
Proposed branch: lp:~oif-team/geis/packaging-1.0.12
Merge into: lp:~oif-team/geis/packaging
Diff against target: 158 lines (+38/-12)
5 files modified
ChangeLog (+12/-0)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+6/-0)
geis/geis.h (+8/-0)
To merge this branch: bzr merge lp:~oif-team/geis/packaging-1.0.12
Reviewer Review Type Date Requested Status
Henrik Rydberg (community) Approve
Review via email: mp+37843@code.launchpad.net

Commit message

Provides C++ support.

Description of the change

Provides C++ support.

To post a comment you must log in.
Revision history for this message
Henrik Rydberg (rydberg) wrote :

Looking good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2010-09-14 11:39:59 +0000
3+++ ChangeLog 2010-10-07 12:34:40 +0000
4@@ -1,3 +1,15 @@
5+2010-09-28 Stephen M. Webb <stephen.webb@canonical.com>
6+
7+ Version bump to 1.0.12.
8+
9+ * configure.ac (AC_INIT): bumped package version to 1.0.12
10+
11+2010-09-28 Stephen M. Webb <stephen.webb@canonical.com>
12+
13+ Made lib compatible with C++.
14+
15+ * geis/geis.h: forced C linkage
16+
17 2010-09-14 Stephen M. Webb <stephen.webb@canonical.com>
18
19 Version bump tp 1.0.11
20
21=== modified file 'configure'
22--- configure 2010-09-16 15:54:44 +0000
23+++ configure 2010-10-07 12:34:40 +0000
24@@ -1,6 +1,6 @@
25 #! /bin/sh
26 # Guess values for system-dependent variables and create Makefiles.
27-# Generated by GNU Autoconf 2.67 for utouch-geis 1.0.11.
28+# Generated by GNU Autoconf 2.67 for utouch-geis 1.0.12.
29 #
30 # Report bugs to <stephen.webb@canonical.com>.
31 #
32@@ -701,8 +701,8 @@
33 # Identity of this package.
34 PACKAGE_NAME='utouch-geis'
35 PACKAGE_TARNAME='utouch-geis'
36-PACKAGE_VERSION='1.0.11'
37-PACKAGE_STRING='utouch-geis 1.0.11'
38+PACKAGE_VERSION='1.0.12'
39+PACKAGE_STRING='utouch-geis 1.0.12'
40 PACKAGE_BUGREPORT='stephen.webb@canonical.com'
41 PACKAGE_URL='https://launchpad.net/utouch-geis'
42
43@@ -1447,7 +1447,7 @@
44 # Omit some internal or obsolete options to make the list less imposing.
45 # This message is too long to be a string in the A/UX 3.1 sh.
46 cat <<_ACEOF
47-\`configure' configures utouch-geis 1.0.11 to adapt to many kinds of systems.
48+\`configure' configures utouch-geis 1.0.12 to adapt to many kinds of systems.
49
50 Usage: $0 [OPTION]... [VAR=VALUE]...
51
52@@ -1517,7 +1517,7 @@
53
54 if test -n "$ac_init_help"; then
55 case $ac_init_help in
56- short | recursive ) echo "Configuration of utouch-geis 1.0.11:";;
57+ short | recursive ) echo "Configuration of utouch-geis 1.0.12:";;
58 esac
59 cat <<\_ACEOF
60
61@@ -1632,7 +1632,7 @@
62 test -n "$ac_init_help" && exit $ac_status
63 if $ac_init_version; then
64 cat <<\_ACEOF
65-utouch-geis configure 1.0.11
66+utouch-geis configure 1.0.12
67 generated by GNU Autoconf 2.67
68
69 Copyright (C) 2010 Free Software Foundation, Inc.
70@@ -1910,7 +1910,7 @@
71 This file contains any messages produced by compilers while
72 running configure, to aid debugging if configure makes a mistake.
73
74-It was created by utouch-geis $as_me 1.0.11, which was
75+It was created by utouch-geis $as_me 1.0.12, which was
76 generated by GNU Autoconf 2.67. Invocation command line was
77
78 $ $0 $@
79@@ -2728,7 +2728,7 @@
80
81 # Define the identity of the package.
82 PACKAGE='utouch-geis'
83- VERSION='1.0.11'
84+ VERSION='1.0.12'
85
86
87 cat >>confdefs.h <<_ACEOF
88@@ -11704,7 +11704,7 @@
89 # report actual input values of CONFIG_FILES etc. instead of their
90 # values after options handling.
91 ac_log="
92-This file was extended by utouch-geis $as_me 1.0.11, which was
93+This file was extended by utouch-geis $as_me 1.0.12, which was
94 generated by GNU Autoconf 2.67. Invocation command line was
95
96 CONFIG_FILES = $CONFIG_FILES
97@@ -11771,7 +11771,7 @@
98 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
99 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
100 ac_cs_version="\\
101-utouch-geis config.status 1.0.11
102+utouch-geis config.status 1.0.12
103 configured by $0, generated by GNU Autoconf 2.67,
104 with options \\"\$ac_cs_config\\"
105
106
107=== modified file 'configure.ac'
108--- configure.ac 2010-09-16 15:54:44 +0000
109+++ configure.ac 2010-10-07 12:34:40 +0000
110@@ -1,8 +1,8 @@
111 # -*- Autoconf -*-
112 # Process this file with autoconf to produce a configure script.
113-
114+#
115 AC_PREREQ(2.65)
116-AC_INIT([utouch-geis],[1.0.11],
117+AC_INIT([utouch-geis],[1.0.12],
118 [stephen.webb@canonical.com],,
119 [https://launchpad.net/utouch-geis])
120 AC_CONFIG_HEADERS([geis_config.h])
121
122=== modified file 'debian/changelog'
123--- debian/changelog 2010-09-16 16:10:34 +0000
124+++ debian/changelog 2010-10-07 12:34:40 +0000
125@@ -1,3 +1,9 @@
126+utouch-geis (1.0.12-0ubuntu1) UNRELEASED; urgency=low
127+
128+ * New upstream release.
129+
130+ -- Stephen M. Webb <stephen.webb@canonical.com> Thu, 30 Sep 2010 14:22:29 -0400
131+
132 utouch-geis (1.0.11-0ubuntu1) maverick; urgency=low
133
134 [ Ara Pulido ]
135
136=== modified file 'geis/geis.h'
137--- geis/geis.h 2010-09-16 15:58:43 +0000
138+++ geis/geis.h 2010-10-07 12:34:40 +0000
139@@ -20,6 +20,10 @@
140 #ifndef GEIS_GEIS_H_
141 #define GEIS_GEIS_H_
142
143+#ifdef __cplusplus
144+extern "C" {
145+#endif
146+
147 #define GEIS_VERSION_1_0 1
148
149 #include <geis/geisimpl.h>
150@@ -385,4 +389,8 @@
151
152 /* @} */
153
154+#ifdef __cplusplus
155+} // extern "C"
156+#endif
157+
158 #endif /* GEIS_GEIS_H_ */

Subscribers

People subscribed via source and target branches

to all changes: