Merge lp:~xnox/dbus-cpp/symbols into lp:~thomas-voss/dbus-cpp/force_gcc_4.7_and_symbols

Proposed by Dimitri John Ledkov
Status: Needs review
Proposed branch: lp:~xnox/dbus-cpp/symbols
Merge into: lp:~thomas-voss/dbus-cpp/force_gcc_4.7_and_symbols
Diff against target: 67 lines (+14/-3)
9 files modified
debian/libdbus-cpp1.1.symbols (+0/-3)
debian/libdbus-cpp1.1.symbols.32bit (+1/-0)
debian/libdbus-cpp1.1.symbols.64bit (+1/-0)
debian/libdbus-cpp1.1.symbols.amd64 (+2/-0)
debian/libdbus-cpp1.1.symbols.arm64 (+2/-0)
debian/libdbus-cpp1.1.symbols.armhf (+2/-0)
debian/libdbus-cpp1.1.symbols.i386 (+2/-0)
debian/libdbus-cpp1.1.symbols.powerpc (+2/-0)
debian/libdbus-cpp1.1.symbols.ppc64el (+2/-0)
To merge this branch: bzr merge lp:~xnox/dbus-cpp/symbols
Reviewer Review Type Date Requested Status
Thomas Voß Pending
Review via email: mp+206880@code.launchpad.net

Commit message

Use symlinks for symbols.

Description of the change

Use symlinks for symbols.

To post a comment you must log in.
lp:~xnox/dbus-cpp/symbols updated
55. By Dimitri John Ledkov

merge tvoss

56. By Dimitri John Ledkov

make it 3.0 native

57. By Dimitri John Ledkov

use files

Unmerged revisions

57. By Dimitri John Ledkov

use files

56. By Dimitri John Ledkov

make it 3.0 native

55. By Dimitri John Ledkov

merge tvoss

54. By Dimitri John Ledkov

Coorect compiler name, use symlinks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/libdbus-cpp1.1.symbols'
2--- debian/libdbus-cpp1.1.symbols 2014-02-18 07:40:21 +0000
3+++ debian/libdbus-cpp1.1.symbols 1970-01-01 00:00:00 +0000
4@@ -1,3 +0,0 @@
5-libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
6-(arch=!amd64 !arm64)#include "libdbus-cpp1.1.symbols.32bit"
7-(arch=amd64 arm64)#include "libdbus-cpp1.1.symbols.64bit"
8
9=== modified file 'debian/libdbus-cpp1.1.symbols.32bit'
10--- debian/libdbus-cpp1.1.symbols.32bit 2014-02-18 07:36:51 +0000
11+++ debian/libdbus-cpp1.1.symbols.32bit 2014-02-18 11:38:44 +0000
12@@ -1,3 +1,4 @@
13+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
14 (c++)"guard variable for core::dbus::DBus::GetConnectionUnixUser::name()::s@Base" 1.0.0+14.04.20140123
15 (c++)"guard variable for core::dbus::DBus::GetConnectionUnixProcessID::name()::s@Base" 1.0.0+14.04.20140123
16 (c++)"guard variable for core::dbus::DBus::Hello::name()::s@Base" 1.0.0+14.04.20140123
17
18=== modified file 'debian/libdbus-cpp1.1.symbols.64bit'
19--- debian/libdbus-cpp1.1.symbols.64bit 2014-02-18 06:43:55 +0000
20+++ debian/libdbus-cpp1.1.symbols.64bit 2014-02-18 11:38:44 +0000
21@@ -1,3 +1,4 @@
22+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
23 (c++)"guard variable for core::dbus::DBus::GetConnectionUnixUser::name()::s@Base" 1.0.0+14.04.20140123
24 (c++)"guard variable for core::dbus::DBus::GetConnectionUnixProcessID::name()::s@Base" 1.0.0+14.04.20140123
25 (c++)"guard variable for core::dbus::DBus::Hello::name()::s@Base" 1.0.0+14.04.20140123
26
27=== added file 'debian/libdbus-cpp1.1.symbols.amd64'
28--- debian/libdbus-cpp1.1.symbols.amd64 1970-01-01 00:00:00 +0000
29+++ debian/libdbus-cpp1.1.symbols.amd64 2014-02-18 11:38:44 +0000
30@@ -0,0 +1,2 @@
31+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
32+#include 'libdbus-cpp1.1.symbols.64bit'
33
34=== added file 'debian/libdbus-cpp1.1.symbols.arm64'
35--- debian/libdbus-cpp1.1.symbols.arm64 1970-01-01 00:00:00 +0000
36+++ debian/libdbus-cpp1.1.symbols.arm64 2014-02-18 11:38:44 +0000
37@@ -0,0 +1,2 @@
38+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
39+#include 'libdbus-cpp1.1.symbols.64bit'
40
41=== added file 'debian/libdbus-cpp1.1.symbols.armhf'
42--- debian/libdbus-cpp1.1.symbols.armhf 1970-01-01 00:00:00 +0000
43+++ debian/libdbus-cpp1.1.symbols.armhf 2014-02-18 11:38:44 +0000
44@@ -0,0 +1,2 @@
45+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
46+#include 'libdbus-cpp1.1.symbols.32bit'
47
48=== added file 'debian/libdbus-cpp1.1.symbols.i386'
49--- debian/libdbus-cpp1.1.symbols.i386 1970-01-01 00:00:00 +0000
50+++ debian/libdbus-cpp1.1.symbols.i386 2014-02-18 11:38:44 +0000
51@@ -0,0 +1,2 @@
52+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
53+#include 'libdbus-cpp1.1.symbols.32bit'
54
55=== added file 'debian/libdbus-cpp1.1.symbols.powerpc'
56--- debian/libdbus-cpp1.1.symbols.powerpc 1970-01-01 00:00:00 +0000
57+++ debian/libdbus-cpp1.1.symbols.powerpc 2014-02-18 11:38:44 +0000
58@@ -0,0 +1,2 @@
59+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
60+#include 'libdbus-cpp1.1.symbols.32bit'
61
62=== added file 'debian/libdbus-cpp1.1.symbols.ppc64el'
63--- debian/libdbus-cpp1.1.symbols.ppc64el 1970-01-01 00:00:00 +0000
64+++ debian/libdbus-cpp1.1.symbols.ppc64el 2014-02-18 11:38:44 +0000
65@@ -0,0 +1,2 @@
66+libdbus-cpp.so.1 libdbus-cpp1.1 #MINVER#
67+#include 'libdbus-cpp1.1.symbols.64bit'

Subscribers

People subscribed via source and target branches