]>
Commit | Line | Data |
---|---|---|
baea9b7a AM |
1 | diff -urN commoncpp2-1.6.3.org/commoncpp2.list.in commoncpp2-1.6.3/commoncpp2.list.in |
2 | --- commoncpp2-1.6.3.org/commoncpp2.list.in 2008-06-23 15:02:12.000000000 +0200 | |
3 | +++ commoncpp2-1.6.3/commoncpp2.list.in 2008-08-23 12:56:15.597826382 +0200 | |
4 | @@ -39,11 +39,11 @@ | |
5 | l 0644 root root ${libdir}/libccgnu2.dylib-@VERSION@.@LT_SUBVER@.dylib libccgnu2-@VERSION@.dylib | |
6 | l 0644 root root ${libdir}/libccext2.dylib-@VERSION@.@LT_SUBVER@.dylib libccext2-@VERSION@.dylib | |
7 | %system freebsd | |
8 | -f 0644 root root ${libdir} ./src/.libs/libccgnu2-@LT_RELEASE@.so.* | |
9 | -f 0644 root root ${libdir} ./src/.libs/libccext2-@LT_RELEASE@.so.* | |
10 | +f 0644 root root ${libdir} ./src/.libs/libccgnu2-@TW_LT_RELEASE@.so.* | |
11 | +f 0644 root root ${libdir} ./src/.libs/libccext2-@TW_LT_RELEASE@.so.* | |
12 | %system linux solaris | |
13 | -f 0644 root root ${libdir} ./src/.libs/libccgnu2-@LT_RELEASE@.so.*.*.* | |
14 | -f 0644 root root ${libdir} ./src/.libs/libccext2-@LT_RELEASE@.so.*.*.* | |
15 | +f 0644 root root ${libdir} ./src/.libs/libccgnu2-@TW_LT_RELEASE@.so.*.*.* | |
16 | +f 0644 root root ${libdir} ./src/.libs/libccext2-@TW_LT_RELEASE@.so.*.*.* | |
17 | %system linux freebsd | |
18 | %postinstall /sbin/ldconfig | |
19 | %postremove /sbin/ldconfig | |
20 | diff -urN commoncpp2-1.6.3.org/configure.ac commoncpp2-1.6.3/configure.ac | |
21 | --- commoncpp2-1.6.3.org/configure.ac 2008-08-20 19:53:45.000000000 +0200 | |
22 | +++ commoncpp2-1.6.3/configure.ac 2008-08-23 12:56:15.624076944 +0200 | |
23 | @@ -11,8 +11,8 @@ | |
24 | AC_INIT(src/thread.cpp) | |
25 | ||
2291896b | 26 | VERSION="1.7.1" |
a0a9437c | 27 | -LT_RELEASE="1.7" |
2291896b | 28 | -LT_VERSION="0:1" |
a0a9437c | 29 | +TW_LT_RELEASE="1.7" |
2291896b | 30 | +TW_LT_VERSION="0:1" |
baea9b7a AM |
31 | |
32 | dnl this is a C++ library after all.. | |
33 | AC_LANG(C++) | |
34 | @@ -195,7 +195,7 @@ | |
35 | ||
36 | OST_PROG_COMMON | |
37 | OST_PROG_LIBVER | |
38 | -OST_PROG_LIBRARY(CCXX,[$LT_VERSION]) | |
39 | +OST_PROG_LIBRARY(CCXX,[$TW_LT_VERSION]) | |
40 | OST_AUTOMAKE_MODE | |
41 | OST_MAINTAINER_MODE | |
42 | OST_WINVER | |
43 | @@ -302,7 +302,7 @@ | |
44 | fi | |
45 | fi | |
46 | KDOC_DIR="\$(top_srcdir)/doc" | |
47 | -AC_SUBST(LT_RELEASE) | |
48 | +AC_SUBST(TW_LT_RELEASE) | |
49 | AC_SUBST(KDOC_DIR) | |
50 | AC_SUBST(CCXX_DIR) | |
51 | AC_SUBST(incprefix) | |
a0a9437c AM |
52 | @@ -400,8 +400,8 @@ |
53 | ||
54 | AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"]) | |
55 | ||
56 | -LIB_VERSION=`echo $LT_RELEASE | sed -e 's/[\.]/_/'` | |
57 | -LIB_MAJOR=`echo $LT_VERSION | sed -e 's/[:].*$//'` | |
58 | +LIB_VERSION=`echo $TW_LT_RELEASE | sed -e 's/[\.]/_/'` | |
59 | +LIB_MAJOR=`echo $TW_LT_VERSION | sed -e 's/[:].*$//'` | |
60 | ||
61 | AC_SUBST(LIB_VERSION) | |
62 | AC_SUBST(LIB_MAJOR) | |
63 | @@ -423,7 +423,7 @@ | |
64 | # | |
65 | # Visual Studio | |
66 | # | |
67 | -DLLVERSION=`echo "$LT_RELEASE" | sed -e 's/\.//'g` | |
68 | +DLLVERSION=`echo "$TW_LT_RELEASE" | sed -e 's/\.//'g` | |
69 | # | |
70 | # Visual Studio 2008 | |
71 | # | |
baea9b7a AM |
72 | diff -urN commoncpp2-1.6.3.org/demo/Makefile.in commoncpp2-1.6.3/demo/Makefile.in |
73 | --- commoncpp2-1.6.3.org/demo/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
74 | +++ commoncpp2-1.6.3/demo/Makefile.in 2008-08-23 12:56:17.804493110 +0200 | |
75 | @@ -227,7 +227,7 @@ | |
76 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
77 | LT_MAJOR = @LT_MAJOR@ | |
78 | LT_MINOR = @LT_MINOR@ | |
79 | -LT_RELEASE = @LT_RELEASE@ | |
80 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
81 | LT_SUBVER = @LT_SUBVER@ | |
82 | MAINT = @MAINT@ | |
83 | MAKEINFO = @MAKEINFO@ | |
84 | diff -urN commoncpp2-1.6.3.org/doc/Makefile.in commoncpp2-1.6.3/doc/Makefile.in | |
85 | --- commoncpp2-1.6.3.org/doc/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
86 | +++ commoncpp2-1.6.3/doc/Makefile.in 2008-08-23 12:56:17.847826306 +0200 | |
87 | @@ -143,7 +143,7 @@ | |
88 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
89 | LT_MAJOR = @LT_MAJOR@ | |
90 | LT_MINOR = @LT_MINOR@ | |
91 | -LT_RELEASE = @LT_RELEASE@ | |
92 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
93 | LT_SUBVER = @LT_SUBVER@ | |
94 | MAINT = @MAINT@ | |
95 | MAKEINFO = @MAKEINFO@ | |
96 | diff -urN commoncpp2-1.6.3.org/inc/Makefile.in commoncpp2-1.6.3/inc/Makefile.in | |
97 | --- commoncpp2-1.6.3.org/inc/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
98 | +++ commoncpp2-1.6.3/inc/Makefile.in 2008-08-23 12:56:17.850743908 +0200 | |
99 | @@ -134,7 +134,7 @@ | |
100 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
101 | LT_MAJOR = @LT_MAJOR@ | |
102 | LT_MINOR = @LT_MINOR@ | |
103 | -LT_RELEASE = @LT_RELEASE@ | |
104 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
105 | LT_SUBVER = @LT_SUBVER@ | |
106 | MAINT = @MAINT@ | |
107 | MAKEINFO = @MAKEINFO@ | |
108 | diff -urN commoncpp2-1.6.3.org/m4/Makefile.in commoncpp2-1.6.3/m4/Makefile.in | |
109 | --- commoncpp2-1.6.3.org/m4/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
110 | +++ commoncpp2-1.6.3/m4/Makefile.in 2008-08-23 12:56:17.850743908 +0200 | |
111 | @@ -121,7 +121,7 @@ | |
112 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
113 | LT_MAJOR = @LT_MAJOR@ | |
114 | LT_MINOR = @LT_MINOR@ | |
115 | -LT_RELEASE = @LT_RELEASE@ | |
116 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
117 | LT_SUBVER = @LT_SUBVER@ | |
118 | MAINT = @MAINT@ | |
119 | MAKEINFO = @MAKEINFO@ | |
120 | diff -urN commoncpp2-1.6.3.org/m4/ost_prog.m4 commoncpp2-1.6.3/m4/ost_prog.m4 | |
121 | --- commoncpp2-1.6.3.org/m4/ost_prog.m4 2008-06-23 15:02:07.000000000 +0200 | |
122 | +++ commoncpp2-1.6.3/m4/ost_prog.m4 2008-08-23 12:56:17.857826188 +0200 | |
123 | @@ -45,10 +45,10 @@ | |
124 | ]) | |
125 | ||
126 | AC_DEFUN([OST_PROG_LIBVER],[ | |
127 | - LT_MAJOR="`echo $LT_VERSION | sed s/:.*$//`" | |
128 | - LT_MINOR="`echo $LT_VERSION | sed s/.*://`" | |
129 | + LT_MAJOR="`echo $TW_LT_VERSION | sed s/:.*$//`" | |
130 | + LT_MINOR="`echo $TW_LT_VERSION | sed s/.*://`" | |
131 | LT_SUBVER="$LT_MAJOR.$LT_MINOR" | |
132 | - AC_SUBST(LT_RELEASE) | |
133 | + AC_SUBST(TW_LT_RELEASE) | |
134 | AC_SUBST(LT_SUBVER) | |
135 | AC_SUBST(LT_MAJOR) | |
136 | AC_SUBST(LT_MINOR) | |
137 | diff -urN commoncpp2-1.6.3.org/Makefile.in commoncpp2-1.6.3/Makefile.in | |
138 | --- commoncpp2-1.6.3.org/Makefile.in 2008-08-20 20:02:58.000000000 +0200 | |
139 | +++ commoncpp2-1.6.3/Makefile.in 2008-08-23 12:56:15.627410065 +0200 | |
140 | @@ -151,7 +151,7 @@ | |
141 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
142 | LT_MAJOR = @LT_MAJOR@ | |
143 | LT_MINOR = @LT_MINOR@ | |
144 | -LT_RELEASE = @LT_RELEASE@ | |
145 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
146 | LT_SUBVER = @LT_SUBVER@ | |
147 | MAINT = @MAINT@ | |
148 | MAKEINFO = @MAKEINFO@ | |
149 | diff -urN commoncpp2-1.6.3.org/src/Makefile.am commoncpp2-1.6.3/src/Makefile.am | |
150 | --- commoncpp2-1.6.3.org/src/Makefile.am 2008-08-20 20:02:18.000000000 +0200 | |
151 | +++ commoncpp2-1.6.3/src/Makefile.am 2008-08-23 12:56:17.914076506 +0200 | |
152 | @@ -11,12 +11,12 @@ | |
153 | MAINTAINERCLEANFILES = Makefile.in Makefile | |
154 | EXTRA_DIST=ccgnu2-config.in ccgnu2-config ost_check2.m4 \ | |
155 | getopt.h getopt.c getopt1.c *.pc *.pc.in | |
156 | -LT_VERSION=@LT_CCXX_VERSION@ | |
157 | +TW_LT_VERSION=@LT_CCXX_VERSION@ | |
158 | AM_CXXFLAGS = -I../src -DCCXX_EXPORT_LIBRARY $(THREAD_FLAGS) \ | |
159 | $(COMMON_FLAGS) -I$(CCXX_DIR) $(DEBUG_FLAGS) | |
160 | AM_CFLAGS = $(THREAD_FLAGS) | |
161 | INCLUDES = -I$(top_srcdir)/inc | |
162 | -RELEASE = $(LT_VERSION) -release $(LT_RELEASE) | |
163 | +RELEASE = $(TW_LT_VERSION) -release $(TW_LT_RELEASE) | |
164 | ||
165 | if EXTRAS | |
166 | pkgconfig_DATA = libccgnu2.pc libccext2.pc | |
167 | diff -urN commoncpp2-1.6.3.org/src/Makefile.in commoncpp2-1.6.3/src/Makefile.in | |
168 | --- commoncpp2-1.6.3.org/src/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
169 | +++ commoncpp2-1.6.3/src/Makefile.in 2008-08-23 12:56:17.917826194 +0200 | |
170 | @@ -206,7 +206,7 @@ | |
171 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
172 | LT_MAJOR = @LT_MAJOR@ | |
173 | LT_MINOR = @LT_MINOR@ | |
174 | -LT_RELEASE = @LT_RELEASE@ | |
175 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
176 | LT_SUBVER = @LT_SUBVER@ | |
177 | MAINT = @MAINT@ | |
178 | MAKEINFO = @MAKEINFO@ | |
179 | @@ -302,13 +302,13 @@ | |
180 | EXTRA_DIST = ccgnu2-config.in ccgnu2-config ost_check2.m4 \ | |
181 | getopt.h getopt.c getopt1.c *.pc *.pc.in | |
182 | ||
183 | -LT_VERSION = @LT_CCXX_VERSION@ | |
184 | +TW_LT_VERSION = @LT_CCXX_VERSION@ | |
185 | AM_CXXFLAGS = -I../src -DCCXX_EXPORT_LIBRARY $(THREAD_FLAGS) \ | |
186 | $(COMMON_FLAGS) -I$(CCXX_DIR) $(DEBUG_FLAGS) | |
187 | ||
188 | AM_CFLAGS = $(THREAD_FLAGS) | |
189 | INCLUDES = -I$(top_srcdir)/inc | |
190 | -RELEASE = $(LT_VERSION) -release $(LT_RELEASE) | |
191 | +RELEASE = $(TW_LT_VERSION) -release $(TW_LT_RELEASE) | |
192 | @EXTRAS_FALSE@pkgconfig_DATA = libccgnu2.pc | |
193 | @EXTRAS_TRUE@pkgconfig_DATA = libccgnu2.pc libccext2.pc | |
194 | @EXTRAS_FALSE@lib_LTLIBRARIES = libccgnu2.la | |
195 | diff -urN commoncpp2-1.6.3.org/tests/Makefile.in commoncpp2-1.6.3/tests/Makefile.in | |
196 | --- commoncpp2-1.6.3.org/tests/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
197 | +++ commoncpp2-1.6.3/tests/Makefile.in 2008-08-23 12:56:17.997409883 +0200 | |
198 | @@ -213,7 +213,7 @@ | |
199 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
200 | LT_MAJOR = @LT_MAJOR@ | |
201 | LT_MINOR = @LT_MINOR@ | |
202 | -LT_RELEASE = @LT_RELEASE@ | |
203 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
204 | LT_SUBVER = @LT_SUBVER@ | |
205 | MAINT = @MAINT@ | |
206 | MAKEINFO = @MAKEINFO@ | |
207 | diff -urN commoncpp2-1.6.3.org/w32/Makefile.in commoncpp2-1.6.3/w32/Makefile.in | |
208 | --- commoncpp2-1.6.3.org/w32/Makefile.in 2008-08-20 20:02:57.000000000 +0200 | |
209 | +++ commoncpp2-1.6.3/w32/Makefile.in 2008-08-23 12:56:18.034492835 +0200 | |
210 | @@ -120,7 +120,7 @@ | |
211 | LT_CCXX_VERSION = @LT_CCXX_VERSION@ | |
212 | LT_MAJOR = @LT_MAJOR@ | |
213 | LT_MINOR = @LT_MINOR@ | |
214 | -LT_RELEASE = @LT_RELEASE@ | |
215 | +TW_LT_RELEASE = @TW_LT_RELEASE@ | |
216 | LT_SUBVER = @LT_SUBVER@ | |
217 | MAINT = @MAINT@ | |
218 | MAKEINFO = @MAKEINFO@ |