Codebase list globus-callout / 2c3a061
GT6 update Mattias Ellert 9 years ago
6 changed file(s) with 10 addition(s) and 178 deletion(s). Raw diff Collapse all Expand all
+8
-0
debian/changelog less more
0 globus-callout (3.13-1) unstable; urgency=medium
1
2 * GT6 update
3 * Drop patches globus-callout-flavor.patch and globus-callout-doxygen.patch
4 (fixed upstream)
5
6 -- Mattias Ellert <mattias.ellert@fysast.uu.se> Sun, 26 Oct 2014 13:29:17 +0100
7
08 globus-callout (3.12-1) unstable; urgency=medium
19
210 * Update to Globus Toolkit 6.0
+1
-1
debian/copyright less more
00 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
11 Upstream-Name: globus_callout
22 Upstream-Contact: http://www.globus.org/
3 Source: http://www.globus.org/ftppub/gt6/packages/globus_callout-3.12.tar.gz
3 Source: http://www.globus.org/ftppub/gt6/packages/globus_callout-3.13.tar.gz
44
55 Files: *
66 Copyright:
+0
-133
debian/patches/globus-callout-doxygen.patch less more
0 diff --git a/library/Doxyfile.in b/library/Doxyfile.in
1 index 4af399c..33d00ee 100644
2 --- a/library/Doxyfile.in
3 +++ b/library/Doxyfile.in
4 @@ -13,4 +13,4 @@ GENERATE_DEPRECATEDLIST= NO
5 QUIET = YES
6 INPUT = @srcdir@
7 EXCLUDE_PATTERNS = version.h
8 -PREDEFINED = DOXYGEN GLOBUS_DONT_DOCUMENT_INTERNAL
9 +PREDEFINED = GLOBUS_DONT_DOCUMENT_INTERNAL DOXYGEN
10 diff --git a/library/Makefile.am b/library/Makefile.am
11 index 2f03306..448fb6a 100644
12 --- a/library/Makefile.am
13 +++ b/library/Makefile.am
14 @@ -37,7 +37,7 @@ all-local: $(DOC_STAMPS)
15 install-data-local: $(DOC_STAMPS)
16 if test -d doc/man/man3; then \
17 install -d -m 755 $(DESTDIR)$(mandir)/man3; \
18 - $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
19 + $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
20 fi
21 if test -d doc/html; then \
22 for dir in `(cd doc; find html -type d)`; do \
23 diff --git a/library/globus_callout.c b/library/globus_callout.c
24 index dc3e852..28a99d5 100644
25 --- a/library/globus_callout.c
26 +++ b/library/globus_callout.c
27 @@ -14,11 +14,13 @@
28 * limitations under the License.
29 */
30
31 +#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
32 /**
33 * @file globus_callout.c
34 - * Globus Callout Infrastructure
35 + * @brief Globus Callout Infrastructure
36 * @author Sam Meder
37 */
38 +#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
39
40 #include "globus_common.h"
41 #include "globus_callout_constants.h"
42 @@ -1057,4 +1059,4 @@ globus_l_callout_library_table_element_free(
43 return;
44 }
45
46 -#endif
47 +#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
48 diff --git a/library/globus_callout.h b/library/globus_callout.h
49 index d863d6e..23a883b 100644
50 --- a/library/globus_callout.h
51 +++ b/library/globus_callout.h
52 @@ -19,7 +19,7 @@
53
54 /**
55 * @file globus_callout.h
56 - * Globus Callout Infrastructure
57 + * @brief Globus Callout Infrastructure
58 * @author Sam Meder
59 */
60
61 diff --git a/library/globus_callout_constants.h b/library/globus_callout_constants.h
62 index bd0b293..f30a246 100644
63 --- a/library/globus_callout_constants.h
64 +++ b/library/globus_callout_constants.h
65 @@ -19,7 +19,7 @@
66
67 /**
68 * @file globus_callout_constants.h
69 - * Globus Callout Infrastructure
70 + * @brief Globus Callout Infrastructure
71 * @author Sam Meder
72 */
73
74 diff --git a/library/globus_callout_error.c b/library/globus_callout_error.c
75 index a8370bb..b44b5d8 100644
76 --- a/library/globus_callout_error.c
77 +++ b/library/globus_callout_error.c
78 @@ -14,17 +14,17 @@
79 * limitations under the License.
80 */
81
82 +#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
83 +
84 /**
85 * @file globus_callout_error.c
86 - * Globus Callout Infrastructure
87 + * @brief Globus Callout Infrastructure
88 * @author Sam Meder
89 */
90
91 #include "globus_callout_constants.h"
92 #include "globus_i_callout.h"
93
94 -#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
95 -
96 char *
97 globus_l_callout_error_strings[GLOBUS_CALLOUT_ERROR_LAST] =
98 {
99 diff --git a/library/globus_i_callout.h b/library/globus_i_callout.h
100 index 0aba545..9e7ca25 100644
101 --- a/library/globus_i_callout.h
102 +++ b/library/globus_i_callout.h
103 @@ -17,9 +17,11 @@
104 #ifndef _GLOBUS_I_CALLOUT_H_
105 #define _GLOBUS_I_CALLOUT_H_
106
107 +#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
108 +
109 /**
110 * @file globus_i_callout.h
111 - * Globus Callout Infrastructure
112 + * @brief Globus Callout Infrastructure
113 * @author Sam Meder
114 */
115
116 @@ -204,7 +206,7 @@ globus_i_callout_error_chain_result(
117
118
119 /**
120 - * Globus Callout Implementation
121 + * @brief Globus Callout Implementation
122 * @ingroup globus_callout
123 * @internal
124 *
125 @@ -228,4 +230,6 @@ typedef struct globus_i_callout_data_s
126 globus_bool_t mandatory;
127 } globus_i_callout_data_t;
128
129 -#endif
130 +#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
131 +
132 +#endif /* _GLOBUS_I_CALLOUT_H_ */
+0
-37
debian/patches/globus-callout-flavor.patch less more
0 diff --git a/configure.ac b/configure.ac
1 index 9ace582..15dbc7e 100644
2 --- a/configure.ac
3 +++ b/configure.ac
4 @@ -4,7 +4,7 @@ AC_INIT([globus_callout], [3.12], [https://globus.atlassian.net/])
5 AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}])
6 AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}])
7 AC_SUBST([AGE_VERSION], [3])
8 -AC_SUBST([PACKAGE_DEPS], ["globus-common >= 14"])
9 +AC_SUBST([PACKAGE_DEPS], ["globus-common >= 15"])
10
11 AC_CONFIG_AUX_DIR([build-aux])
12 AM_INIT_AUTOMAKE([1.11 foreign parallel-tests tar-pax])
13 diff --git a/version.h.in b/version.h.in
14 index 8b590f3..12d1e50 100644
15 --- a/version.h.in
16 +++ b/version.h.in
17 @@ -23,18 +23,4 @@ globus_version_t local_version =
18 @DIRT_BRANCH_ID@
19 };
20
21 -#define bittostr(x) str(x)
22 -#define str(x) #x
23 -
24 -#include <limits.h>
25 -#include <stdint.h>
26 -
27 -#if LONG_MAX == INT32_MAX
28 -#define FLAVOR_BITS 32
29 -#elif LONG_MAX == INT64_MAX
30 -#define FLAVOR_BITS 64
31 -#else
32 -#error "Unknown flavor bits"
33 -#endif
34 -
35 -static const char flavor[] = "cc" bittostr(FLAVOR_BITS);
36 +static const char flavor[] = GLOBUS_FLAVOR_NAME;
+0
-4
debian/patches/series less more
0 # Use flavor name macro
1 globus-callout-flavor.patch
2 # Doxygen fixes
3 globus-callout-doxygen.patch
+1
-3
debian/rules less more
5454 dh_testdir
5555
5656 $(MAKE)
57 $(MAKE) check
5758
5859 touch $@
5960
8182
8283 # Remove installed license file
8384 rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE
84
85 # Check
86 make check
8785
8886 binary: binary-arch binary-indep
8987