Ubuntu
netbook-launcher-efl package

Merge lp:~cjwatson/ubuntu/oneiric/netbook-launcher-efl/efl-1.0.0 into lp:ubuntu/oneiric/netbook-launcher-efl

  1. Oneiric (11.10)
  2. efl-1.0.0
  3. Merge into oneiric
Proposed by Colin Watson
Status: Merged
Merged at revision: 15
Proposed branch: lp:~cjwatson/ubuntu/oneiric/netbook-launcher-efl/efl-1.0.0
Merge into: lp:ubuntu/oneiric/netbook-launcher-efl
Diff against target: 146 lines (+19/-13)
5 files modified
README (+1/-1)
configure (+9/-9)
configure.ac (+1/-1)
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/ubuntu/oneiric/netbook-launcher-efl/efl-1.0.0
Reviewer Review Type Date Requested Status
Michael Terry Pending
Review via email: mp+71661@code.launchpad.net

Description of the change

netbook-launcher-efl depends on versions of the EFL libraries that are no longer built from their source package, and fails to build against current versions. This branch updates it to build against current versions.

While this builds cleanly, I have not been able to test that it actually works.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Michael acked this on IRC.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2009-12-22 19:26:32 +0000
3+++ README 2011-08-16 10:43:17 +0000
4@@ -25,7 +25,7 @@
5 http://download.enlightenment.org/snapshots/LATEST/ and
6 http://download.enlightenment.org/releases/.
7
8- * eina-0 (basic data types)
9+ * eina (basic data types)
10 * ecore (main loop and system integration)
11 * evas (canvas)
12 * ecore-evas (canvas-system integration)
13
14=== modified file 'configure'
15--- configure 2011-05-18 11:18:53 +0000
16+++ configure 2011-08-16 10:43:17 +0000
17@@ -13503,7 +13503,7 @@
18 pkg_cv_NETBOOK_LAUNCHER_CFLAGS="$NETBOOK_LAUNCHER_CFLAGS"
19 elif test -n "$PKG_CONFIG"; then
20 if test -n "$PKG_CONFIG" && \
21- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina-0 >= \$EFL_VER
22+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= \$EFL_VER
23 ecore >= \$EFL_VER
24 evas >= \$EFL_VER
25 ecore-evas >= \$EFL_VER
26@@ -13522,7 +13522,7 @@
27 libnotify >= \$NOTIFY_VER
28 libcanberra
29 unique-1.0\""; } >&5
30- ($PKG_CONFIG --exists --print-errors "eina-0 >= $EFL_VER
31+ ($PKG_CONFIG --exists --print-errors "eina >= $EFL_VER
32 ecore >= $EFL_VER
33 evas >= $EFL_VER
34 ecore-evas >= $EFL_VER
35@@ -13544,7 +13544,7 @@
36 ac_status=$?
37 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
38 test $ac_status = 0; }; then
39- pkg_cv_NETBOOK_LAUNCHER_CFLAGS=`$PKG_CONFIG --cflags "eina-0 >= $EFL_VER
40+ pkg_cv_NETBOOK_LAUNCHER_CFLAGS=`$PKG_CONFIG --cflags "eina >= $EFL_VER
41 ecore >= $EFL_VER
42 evas >= $EFL_VER
43 ecore-evas >= $EFL_VER
44@@ -13573,7 +13573,7 @@
45 pkg_cv_NETBOOK_LAUNCHER_LIBS="$NETBOOK_LAUNCHER_LIBS"
46 elif test -n "$PKG_CONFIG"; then
47 if test -n "$PKG_CONFIG" && \
48- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina-0 >= \$EFL_VER
49+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= \$EFL_VER
50 ecore >= \$EFL_VER
51 evas >= \$EFL_VER
52 ecore-evas >= \$EFL_VER
53@@ -13592,7 +13592,7 @@
54 libnotify >= \$NOTIFY_VER
55 libcanberra
56 unique-1.0\""; } >&5
57- ($PKG_CONFIG --exists --print-errors "eina-0 >= $EFL_VER
58+ ($PKG_CONFIG --exists --print-errors "eina >= $EFL_VER
59 ecore >= $EFL_VER
60 evas >= $EFL_VER
61 ecore-evas >= $EFL_VER
62@@ -13614,7 +13614,7 @@
63 ac_status=$?
64 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
65 test $ac_status = 0; }; then
66- pkg_cv_NETBOOK_LAUNCHER_LIBS=`$PKG_CONFIG --libs "eina-0 >= $EFL_VER
67+ pkg_cv_NETBOOK_LAUNCHER_LIBS=`$PKG_CONFIG --libs "eina >= $EFL_VER
68 ecore >= $EFL_VER
69 evas >= $EFL_VER
70 ecore-evas >= $EFL_VER
71@@ -13652,7 +13652,7 @@
72 _pkg_short_errors_supported=no
73 fi
74 if test $_pkg_short_errors_supported = yes; then
75- NETBOOK_LAUNCHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina-0 >= $EFL_VER
76+ NETBOOK_LAUNCHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= $EFL_VER
77 ecore >= $EFL_VER
78 evas >= $EFL_VER
79 ecore-evas >= $EFL_VER
80@@ -13672,7 +13672,7 @@
81 libcanberra
82 unique-1.0" 2>&1`
83 else
84- NETBOOK_LAUNCHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina-0 >= $EFL_VER
85+ NETBOOK_LAUNCHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= $EFL_VER
86 ecore >= $EFL_VER
87 evas >= $EFL_VER
88 ecore-evas >= $EFL_VER
89@@ -13695,7 +13695,7 @@
90 # Put the nasty error message in config.log where it belongs
91 echo "$NETBOOK_LAUNCHER_PKG_ERRORS" >&5
92
93- as_fn_error $? "Package requirements (eina-0 >= $EFL_VER
94+ as_fn_error $? "Package requirements (eina >= $EFL_VER
95 ecore >= $EFL_VER
96 evas >= $EFL_VER
97 ecore-evas >= $EFL_VER
98
99=== modified file 'configure.ac'
100--- configure.ac 2011-05-18 11:18:53 +0000
101+++ configure.ac 2011-08-16 10:43:17 +0000
102@@ -58,7 +58,7 @@
103
104 PKG_CHECK_MODULES(
105 [NETBOOK_LAUNCHER],
106- [eina-0 >= $EFL_VER
107+ [eina >= $EFL_VER
108 ecore >= $EFL_VER
109 evas >= $EFL_VER
110 ecore-evas >= $EFL_VER
111
112=== modified file 'debian/changelog'
113--- debian/changelog 2011-05-18 11:18:53 +0000
114+++ debian/changelog 2011-08-16 10:43:17 +0000
115@@ -1,3 +1,9 @@
116+netbook-launcher-efl (0.3.3-0ubuntu2) UNRELEASED; urgency=low
117+
118+ * Port to EFL 1.0.0 libraries.
119+
120+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 16 Aug 2011 00:37:36 +0100
121+
122 netbook-launcher-efl (0.3.3-0ubuntu1) oneiric; urgency=low
123
124 * New upstream release
125
126=== modified file 'debian/control'
127--- debian/control 2011-05-18 11:18:53 +0000
128+++ debian/control 2011-08-16 10:43:17 +0000
129@@ -3,7 +3,7 @@
130 Priority: optional
131 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
132 Build-Depends: debhelper (>= 7.0.50), pkg-config, libtool, intltool,
133- libeina-dev (>= 0.9.9.49898),
134+ libeina-dev (>= 1.0.0),
135 libecore-dev (>= 0.9.9.49898),
136 libevas-dev (>= 0.9.9.49898),
137 libeet-dev (>= 1.3.2),
138@@ -23,7 +23,7 @@
139
140 Package: netbook-launcher-efl
141 Architecture: any
142-Depends: ${misc:Depends}, ${shlibs:Depends}, libevas-svn-06-engines-x
143+Depends: ${misc:Depends}, ${shlibs:Depends}, libevas1-engines-x
144 Recommends: gnome-menus, webfav
145 Suggests: gnome-web-photo
146 Description: A lite version of netbook launcher written in EFL

Subscribers

People subscribed via source and target branches

to all changes: