Sun, 29 May 2011 16:29:06 +0200
Update, correct, improve build configuration and packaging logic.
Update to new version of vendor software, bump copyright date, remove implicit
gcc dependency, add comments for Trolltech bug tracking, correct enforced
dynamic library linkage, and install mysterious process stub binary.
1 Index: src/Makefile.in
2 --- src/Makefile.in.orig 2004-05-27 23:29:46 +0200
3 +++ src/Makefile.in 2005-04-21 21:58:27 +0200
4 @@ -197,7 +197,7 @@
7 aqmoney2_LDADD = \
8 - @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la
9 + modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@
11 aqmoney2_SOURCES = \
12 aqmauth.cpp \
13 @@ -206,7 +206,7 @@
16 qtest_LDADD = \
17 - @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la
18 + modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@
21 qtest_SOURCES = qtest.cpp
22 Index: src/libaqmoney/converter/oldconf.c
23 --- src/libaqmoney/converter/oldconf.c.orig 2004-01-25 19:51:29 +0100
24 +++ src/libaqmoney/converter/oldconf.c 2005-04-21 21:34:14 +0200
25 @@ -642,7 +642,7 @@
26 assert(root);
27 assert(path);
28 DBG_VERBOUS(0, "GetValue for \"%s\"",path);
29 - var=ConfigOld__GetPath(root,path,
30 + var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(root,path,
31 CONFIGOLDMODE_PATHMUSTEXIST |
32 CONFIGOLDMODE_NAMEMUSTEXIST |
33 CONFIGOLDMODE_VARIABLE);
34 @@ -945,7 +945,7 @@
35 }
36 *p=0;
37 DBG_VERBOUS(0, "Selecting group \"%s\"",name);
38 - grp=ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE);
39 + grp=(CONFIGOLDGROUP *)ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE);
40 if (!grp) {
41 DBG_DEBUG(0, "Group \"%s\" is not available",name);
42 return 0;
43 @@ -1017,7 +1017,7 @@
45 DBG_VERBOUS(0, "Creating variable \"%s\"",np);
46 if (mode & CONFIGOLDMODE_ALLOW_PATH_IN_VARS)
47 - var=ConfigOld__GetPath(group,
48 + var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(group,
49 np,
50 mode|CONFIGOLDMODE_VARIABLE);
51 else {
52 Index: configure
53 --- configure.orig 2004-05-27 23:29:51 +0200
54 +++ configure 2005-04-22 11:16:30 +0200
55 @@ -21333,7 +21333,7 @@
57 if test -n "$found_file" ; then
58 ktoblzcheck_libraries="-L$d"
59 - ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//'`"
60 + ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//;s/\\.la//'`"
61 break
62 fi
63 done