unity-2d

Merge lp:~didrocks/unity-2d/add-private-dev into lp:unity-2d

  1. add-private-dev
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Florian Boucault
Approved revision: 618
Merged at revision: 618
Proposed branch: lp:~didrocks/unity-2d/add-private-dev
Merge into: lp:unity-2d
Diff against target: 149 lines (+45/-9)
7 files modified
CMakeLists.txt (+1/-0)
debian/changelog (+2/-1)
debian/control (+8/-1)
debian/libunity-2d-private-dev.install (+1/-0)
libunity-2d-private/src/CMakeLists.txt (+21/-6)
libunity-2d-private/src/unity-2d-private.pc.cmake (+12/-0)
panel/applets/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~didrocks/unity-2d/add-private-dev
Reviewer Review Type Date Requested Status
Florian Boucault Pending
Review via email: mp+69609@code.launchpad.net

Description of the change

add the -dev package to the private library

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-07-28 07:27:47 +0000
3+++ CMakeLists.txt 2011-07-28 09:49:51 +0000
4@@ -31,6 +31,7 @@
5 pkg_check_modules(WNCK REQUIRED libwnck-3.0)
6 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
7 pkg_check_modules(NUXCORE REQUIRED nux-core-1.0)
8+pkg_check_modules(PANGO REQUIRED pango)
9
10
11 # GSettings schemas
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2011-07-28 09:02:04 +0000
15+++ debian/changelog 2011-07-28 09:49:51 +0000
16@@ -28,7 +28,8 @@
17 - dep on versionned libnux-1.0-dev
18 - dep on versionned libunity-core-4.0-dev
19 * debian/control, debian/rules, debian/libunity-2d-private-dev:
20- - add new -dev project
21+ - add new -dev project (LP: #814709)
22+ - add an upstream pc file
23
24 -- Florian Boucault <florian.boucault@canonical.com> Thu, 28 Jul 2011 09:30:33 +0200
25
26
27=== modified file 'debian/control'
28--- debian/control 2011-07-28 09:02:04 +0000
29+++ debian/control 2011-07-28 09:49:51 +0000
30@@ -11,6 +11,7 @@
31 libqt4-opengl-dev,
32 libglib2.0-dev,
33 libwnck-3-dev,
34+ libpango1.0-dev,
35 libqtgconf-dev,
36 libdconf-qt-dev,
37 libqtbamf-dev,
38@@ -55,7 +56,13 @@
39 Package: libunity-2d-private-dev
40 Section: libdevel
41 Architecture: any
42-Depends: ${shlibs:Depends}, ${misc:Depends}, libunity-2d-private0 (= ${binary:Version})
43+Depends: ${shlibs:Depends},
44+ ${misc:Depends},
45+ libunity-2d-private0 (= ${binary:Version}),
46+ libgtk-3-dev,
47+ libwnck-3-dev,
48+ libglib2.0-dev,
49+ libpango1.0-dev,
50 Description: Unity 2D shared library - development files
51 This library is used to host common code used by several Unity 2D components
52 It is only used internally, there is no use case for it outside of the unity-2d
53
54=== modified file 'debian/libunity-2d-private-dev.install'
55--- debian/libunity-2d-private-dev.install 2011-07-28 09:02:04 +0000
56+++ debian/libunity-2d-private-dev.install 2011-07-28 09:49:51 +0000
57@@ -1,2 +1,3 @@
58 usr/lib/libunity-2d-private.so
59 usr/include/unity-2d-private
60+usr/lib/pkgconfig
61
62=== modified file 'libunity-2d-private/src/CMakeLists.txt'
63--- libunity-2d-private/src/CMakeLists.txt 2011-07-27 14:07:00 +0000
64+++ libunity-2d-private/src/CMakeLists.txt 2011-07-28 09:49:51 +0000
65@@ -1,5 +1,7 @@
66+set (LIB_NAME "unity-2d-private")
67+
68 # Sources
69-set(libunity-2d-private_SRCS
70+set(lib${LIB_NAME}_SRCS
71 debug.cpp
72 gconnector.cpp
73 gnomesessionclient.cpp
74@@ -36,13 +38,13 @@
75 ${WNCK_INCLUDE_DIRS}
76 )
77
78-add_library(unity-2d-private SHARED ${libunity-2d-private_SRCS})
79-set_target_properties(unity-2d-private PROPERTIES
80+add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS})
81+set_target_properties(${LIB_NAME} PROPERTIES
82 VERSION ${libunity-2d-private_VERSION}
83 SOVERSION ${libunity-2d-private_SOVERSION}
84 )
85
86-target_link_libraries(unity-2d-private
87+target_link_libraries(${LIB_NAME}
88 ${QT_QTGUI_LIBRARIES}
89 ${QT_QTCORE_LIBRARIES}
90 ${QT_QTDBUS_LIBRARIES}
91@@ -56,14 +58,27 @@
92 )
93
94 # Install
95-install(TARGETS unity-2d-private
96+install(TARGETS ${LIB_NAME}
97 LIBRARY DESTINATION lib${LIB_SUFFIX}
98 ARCHIVE DESTINATION lib
99 RUNTIME DESTINATION bin
100 )
101
102+#
103+# PkgConfig file
104+#
105+set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
106+set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
107+set (LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
108+set (INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
109+
110 install(DIRECTORY .
111- DESTINATION include/unity-2d-private
112+ DESTINATION include/${LIB_NAME}
113 FILES_MATCHING PATTERN "*.h"
114 PATTERN "*_p.h" EXCLUDE
115 )
116+
117+configure_file (${LIB_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc)
118+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION
119+ ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
120+
121
122=== added file 'libunity-2d-private/src/unity-2d-private.pc.cmake'
123--- libunity-2d-private/src/unity-2d-private.pc.cmake 1970-01-01 00:00:00 +0000
124+++ libunity-2d-private/src/unity-2d-private.pc.cmake 2011-07-28 09:49:51 +0000
125@@ -0,0 +1,12 @@
126+prefix=@PREFIXDIR@
127+exec_prefix=@EXEC_PREFIX@
128+libdir=@LIBDIR@
129+includedir=@INCLUDEDIR@
130+
131+Name: unity-2d-private
132+Library
133+Description: Unity 2d private library
134+Version: @VERSION@
135+Libs: -L@LIBDIR@ -lunity-2d-private
136+Cflags: -I@INCLUDEDIR@/unity-2d-private
137+Requires: glib-2.0, gtk+-3.0, libwnck-3.0, pango
138
139=== modified file 'panel/applets/CMakeLists.txt'
140--- panel/applets/CMakeLists.txt 2011-07-28 07:27:47 +0000
141+++ panel/applets/CMakeLists.txt 2011-07-28 09:49:51 +0000
142@@ -5,7 +5,6 @@
143
144 pkg_check_modules(QTBAMF REQUIRED libqtbamf)
145 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
146-pkg_check_modules(PANGO REQUIRED pango)
147
148 # Sources
149 set(uqapplets_SRCS

Subscribers

People subscribed via source and target branches