1 diff -urN ccrtp-1.6.2.org/ccrtp.list.in ccrtp-1.6.2/ccrtp.list.in
2 --- ccrtp-1.6.2.org/ccrtp.list.in 2008-06-23 15:02:28.000000000 +0200
3 +++ ccrtp-1.6.2/ccrtp.list.in 2008-08-23 12:59:37.617389899 +0200
5 l 0644 root root ${libdir}/libccrtp1.dylib libccrtp1-@VERSION@.dylib
6 l 0644 root root ${libdir}/libccrtp1.dylib-@VERSION@.@LT_SUBVER@.dylib libccrtp1-@VERSION@.dylib
8 -f 0644 root root ${libdir} ./src/.libs/libccrtp1-@LT_RELEASE@.so.*
9 +f 0644 root root ${libdir} ./src/.libs/libccrtp1-@TW_LT_RELEASE@.so.*
11 -f 0644 root root ${libdir} ./src/.libs/libccrtp1-@LT_RELEASE@.so.*.*.*
12 +f 0644 root root ${libdir} ./src/.libs/libccrtp1-@TW_LT_RELEASE@.so.*.*.*
14 %postinstall /sbin/ldconfig
15 %postremove /sbin/ldconfig
16 diff -urN ccrtp-1.6.2.org/configure.ac ccrtp-1.6.2/configure.ac
17 --- ccrtp-1.6.2.org/configure.ac 2008-08-20 20:45:59.000000000 +0200
18 +++ ccrtp-1.6.2/configure.ac 2008-08-23 12:59:37.621348106 +0200
27 AC_CONFIG_AUX_DIR(autoconf)
34 -OST_PROG_LIBRARY(CCXX,[$LT_VERSION])
35 +OST_PROG_LIBRARY(CCXX,[$TW_LT_VERSION])
38 PKG_CHECK_MODULES(COMMON, libccgnu2 >= $REQUIRES)
42 KDOC_DIR="\$(top_srcdir)/doc"
44 +AC_SUBST(TW_LT_RELEASE)
47 AC_PATH_PROG(DOXYGEN, doxygen, no)
50 AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
52 -LIB_VERSION=`echo $LT_RELEASE | sed -e 's/[\.]/_/'`
53 -LIB_MAJOR=`echo $LT_VERSION | sed -e 's/[:].*$//'`
54 +LIB_VERSION=`echo $TW_LT_RELEASE | sed -e 's/[\.]/_/'`
55 +LIB_MAJOR=`echo $TW_LT_VERSION | sed -e 's/[:].*$//'`
59 diff -urN ccrtp-1.6.2.org/demo/Makefile.am ccrtp-1.6.2/demo/Makefile.am
60 --- ccrtp-1.6.2.org/demo/Makefile.am 2008-06-23 15:02:24.000000000 +0200
61 +++ ccrtp-1.6.2/demo/Makefile.am 2008-08-23 12:59:39.984056056 +0200
63 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
65 AUTOMAKE_OPTIONS = no-dependencies dist-shar
66 -LT_VERSION=@LT_CCXX_VERSION@
67 +TW_LT_VERSION=@LT_CCXX_VERSION@
69 -#$(LT_VERSION) -release $(LT_RELEASE)
70 +#$(TW_LT_VERSION) -release $(TW_LT_RELEASE)
71 AM_CXXFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src
72 ccxxincludedir=$(includedir)/cc++
74 diff -urN ccrtp-1.6.2.org/demo/Makefile.in ccrtp-1.6.2/demo/Makefile.in
75 --- ccrtp-1.6.2.org/demo/Makefile.in 2008-08-20 20:46:51.000000000 +0200
76 +++ ccrtp-1.6.2/demo/Makefile.in 2008-08-23 12:59:39.984056056 +0200
78 LT_CCXX_VERSION = @LT_CCXX_VERSION@
81 -LT_RELEASE = @LT_RELEASE@
82 +TW_LT_RELEASE = @TW_LT_RELEASE@
83 LT_SUBVER = @LT_SUBVER@
87 top_builddir = @top_builddir@
88 top_srcdir = @top_srcdir@
89 AUTOMAKE_OPTIONS = no-dependencies dist-shar
90 -LT_VERSION = @LT_CCXX_VERSION@
91 +TW_LT_VERSION = @LT_CCXX_VERSION@
93 -#$(LT_VERSION) -release $(LT_RELEASE)
94 +#$(TW_LT_VERSION) -release $(TW_LT_RELEASE)
95 AM_CXXFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src
96 ccxxincludedir = $(includedir)/cc++
97 @SRTP_GCRYPT_TRUE@srtp_src = ccsrtptest
98 diff -urN ccrtp-1.6.2.org/doc/Makefile.in ccrtp-1.6.2/doc/Makefile.in
99 --- ccrtp-1.6.2.org/doc/Makefile.in 2008-08-20 20:46:51.000000000 +0200
100 +++ ccrtp-1.6.2/doc/Makefile.in 2008-08-23 12:59:40.014681091 +0200
102 LT_CCXX_VERSION = @LT_CCXX_VERSION@
103 LT_MAJOR = @LT_MAJOR@
104 LT_MINOR = @LT_MINOR@
105 -LT_RELEASE = @LT_RELEASE@
106 +TW_LT_RELEASE = @TW_LT_RELEASE@
107 LT_SUBVER = @LT_SUBVER@
109 MAKEINFO = @MAKEINFO@
110 diff -urN ccrtp-1.6.2.org/m4/Makefile.in ccrtp-1.6.2/m4/Makefile.in
111 --- ccrtp-1.6.2.org/m4/Makefile.in 2008-08-20 20:46:51.000000000 +0200
112 +++ ccrtp-1.6.2/m4/Makefile.in 2008-08-23 12:59:40.018014492 +0200
114 LT_CCXX_VERSION = @LT_CCXX_VERSION@
115 LT_MAJOR = @LT_MAJOR@
116 LT_MINOR = @LT_MINOR@
117 -LT_RELEASE = @LT_RELEASE@
118 +TW_LT_RELEASE = @TW_LT_RELEASE@
119 LT_SUBVER = @LT_SUBVER@
121 MAKEINFO = @MAKEINFO@
122 diff -urN ccrtp-1.6.2.org/m4/ost_prog.m4 ccrtp-1.6.2/m4/ost_prog.m4
123 --- ccrtp-1.6.2.org/m4/ost_prog.m4 2008-06-23 15:02:23.000000000 +0200
124 +++ ccrtp-1.6.2/m4/ost_prog.m4 2008-08-23 12:59:40.018014492 +0200
128 AC_DEFUN([OST_PROG_LIBVER],[
129 - LT_MAJOR="`echo $LT_VERSION | sed s/:.*$//`"
130 - LT_MINOR="`echo $LT_VERSION | sed s/.*://`"
131 + LT_MAJOR="`echo $TW_LT_VERSION | sed s/:.*$//`"
132 + LT_MINOR="`echo $TW_LT_VERSION | sed s/.*://`"
133 LT_SUBVER="$LT_MAJOR.$LT_MINOR"
134 - AC_SUBST(LT_RELEASE)
135 + AC_SUBST(TW_LT_RELEASE)
139 diff -urN ccrtp-1.6.2.org/Makefile.in ccrtp-1.6.2/Makefile.in
140 --- ccrtp-1.6.2.org/Makefile.in 2008-08-20 20:46:51.000000000 +0200
141 +++ ccrtp-1.6.2/Makefile.in 2008-08-23 12:59:37.624057039 +0200
143 LT_CCXX_VERSION = @LT_CCXX_VERSION@
144 LT_MAJOR = @LT_MAJOR@
145 LT_MINOR = @LT_MINOR@
146 -LT_RELEASE = @LT_RELEASE@
147 +TW_LT_RELEASE = @TW_LT_RELEASE@
148 LT_SUBVER = @LT_SUBVER@
150 MAKEINFO = @MAKEINFO@
151 diff -urN ccrtp-1.6.2.org/phone/Makefile.am ccrtp-1.6.2/phone/Makefile.am
152 --- ccrtp-1.6.2.org/phone/Makefile.am 2008-06-23 15:02:28.000000000 +0200
153 +++ ccrtp-1.6.2/phone/Makefile.am 2008-08-23 12:59:40.078014385 +0200
155 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
157 AUTOMAKE_OPTIONS = no-dependencies dist-shar
158 -LT_VERSION=@LT_CCXX_VERSION@
159 -#$(LT_VERSION) -release $(LT_RELEASE)
160 +TW_LT_VERSION=@LT_CCXX_VERSION@
161 +#$(TW_LT_VERSION) -release $(TW_LT_RELEASE)
162 AM_CXXFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src
163 ccxxincludedir=$(includedir)/ccrtp
164 EXTRA_DIST = phone.conf
165 diff -urN ccrtp-1.6.2.org/phone/Makefile.in ccrtp-1.6.2/phone/Makefile.in
166 --- ccrtp-1.6.2.org/phone/Makefile.in 2008-08-20 20:46:51.000000000 +0200
167 +++ ccrtp-1.6.2/phone/Makefile.in 2008-08-23 12:59:40.087398097 +0200
169 LT_CCXX_VERSION = @LT_CCXX_VERSION@
170 LT_MAJOR = @LT_MAJOR@
171 LT_MINOR = @LT_MINOR@
172 -LT_RELEASE = @LT_RELEASE@
173 +TW_LT_RELEASE = @TW_LT_RELEASE@
174 LT_SUBVER = @LT_SUBVER@
176 MAKEINFO = @MAKEINFO@
178 top_builddir = @top_builddir@
179 top_srcdir = @top_srcdir@
180 AUTOMAKE_OPTIONS = no-dependencies dist-shar
181 -LT_VERSION = @LT_CCXX_VERSION@
182 -#$(LT_VERSION) -release $(LT_RELEASE)
183 +TW_LT_VERSION = @LT_CCXX_VERSION@
184 +#$(TW_LT_VERSION) -release $(TW_LT_RELEASE)
185 AM_CXXFLAGS = @WARN_FLAGS@ -I$(top_srcdir)/src
186 ccxxincludedir = $(includedir)/ccrtp
187 EXTRA_DIST = phone.conf
188 diff -urN ccrtp-1.6.2.org/src/Makefile.am ccrtp-1.6.2/src/Makefile.am
189 --- ccrtp-1.6.2.org/src/Makefile.am 2008-06-23 15:02:25.000000000 +0200
190 +++ ccrtp-1.6.2/src/Makefile.am 2008-08-23 12:59:40.157391048 +0200
192 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
194 AUTOMAKE_OPTIONS = no-dependencies dist-shar
195 -LT_VERSION=@LT_CCXX_VERSION@
196 +TW_LT_VERSION=@LT_CCXX_VERSION@
197 AM_CXXFLAGS= @WARN_FLAGS@
198 -# RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
199 -RELEASE = $(LT_VERSION) -release $(LT_RELEASE) @GNULIBS@
200 +# RELEASE = $(TW_LT_VERSION) -release $(TW_LT_RELEASE)
201 +RELEASE = $(TW_LT_VERSION) -release $(TW_LT_RELEASE) @GNULIBS@
204 lib_LTLIBRARIES = libccrtp1.la
205 diff -urN ccrtp-1.6.2.org/src/Makefile.in ccrtp-1.6.2/src/Makefile.in
206 --- ccrtp-1.6.2.org/src/Makefile.in 2008-08-20 20:46:51.000000000 +0200
207 +++ ccrtp-1.6.2/src/Makefile.in 2008-08-23 12:59:40.160725881 +0200
209 LT_CCXX_VERSION = @LT_CCXX_VERSION@
210 LT_MAJOR = @LT_MAJOR@
211 LT_MINOR = @LT_MINOR@
212 -LT_RELEASE = @LT_RELEASE@
213 +TW_LT_RELEASE = @TW_LT_RELEASE@
214 LT_SUBVER = @LT_SUBVER@
216 MAKEINFO = @MAKEINFO@
217 @@ -244,10 +244,10 @@
218 top_builddir = @top_builddir@
219 top_srcdir = @top_srcdir@
220 AUTOMAKE_OPTIONS = no-dependencies dist-shar
221 -LT_VERSION = @LT_CCXX_VERSION@
222 +TW_LT_VERSION = @LT_CCXX_VERSION@
223 AM_CXXFLAGS = @WARN_FLAGS@
224 -# RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
225 -RELEASE = $(LT_VERSION) -release $(LT_RELEASE) @GNULIBS@
226 +# RELEASE = $(TW_LT_VERSION) -release $(TW_LT_RELEASE)
227 +RELEASE = $(TW_LT_VERSION) -release $(TW_LT_RELEASE) @GNULIBS@
228 lib_LTLIBRARIES = libccrtp1.la
229 @SRTP_OPENSSL_TRUE@srtp_src_o = ccrtp/crypto/openssl/hmac.cxx \
230 @SRTP_OPENSSL_TRUE@ ccrtp/crypto/openssl/AesSrtp.cxx \
231 diff -urN ccrtp-1.6.2.org/w32/Makefile.in ccrtp-1.6.2/w32/Makefile.in
232 --- ccrtp-1.6.2.org/w32/Makefile.in 2008-08-20 20:46:51.000000000 +0200
233 +++ ccrtp-1.6.2/w32/Makefile.in 2008-08-23 12:59:40.177389319 +0200
235 LT_CCXX_VERSION = @LT_CCXX_VERSION@
236 LT_MAJOR = @LT_MAJOR@
237 LT_MINOR = @LT_MINOR@
238 -LT_RELEASE = @LT_RELEASE@
239 +TW_LT_RELEASE = @TW_LT_RELEASE@
240 LT_SUBVER = @LT_SUBVER@
242 MAKEINFO = @MAKEINFO@