Ubuntu
opendrim-lmp-physicalasset package

Merge lp:~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-physicalasset/oneiric-201107081810 into lp:ubuntu/oneiric/opendrim-lmp-physicalasset

  1. Oneiric (11.10)
  2. oneiric-201107081810
  3. Merge into oneiric
Proposed by James Westby
Status: Work in progress
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-physicalasset/oneiric-201107081810
Merge into: lp:ubuntu/oneiric/opendrim-lmp-physicalasset
Diff against target: 383 lines (+343/-0) (has conflicts)
7 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
.pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4 (+318/-0)
.pc/applied-patches (+1/-0)
debian/patches/01-ftbfs-add-opendrim-lib.patch (+20/-0)
debian/patches/series (+1/-0)
Conflict adding file .pc.  Moved existing file to .pc.moved.
Conflict adding file debian/patches.  Moved existing file to debian/patches.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-physicalasset/oneiric-201107081810
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+67369@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/opendrim-lmp-physicalasset reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-physicalasset/oneiric-201107081810. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

Quilt :(

Reply

Unmerged revisions

4. By Stefano Rivera

debian/patches/01-ftbfs-add-opendrim-lib.patch: Added library opendrim to
LIBS variable in check routine of acinclude.m4 to build with ld
--as-needed (LP: #756140)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== renamed directory '.pc' => '.pc.moved'
3=== added file '.pc/.quilt_patches'
4--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
5+++ .pc/.quilt_patches 2011-07-08 19:26:59 +0000
6@@ -0,0 +1,1 @@
7+debian/patches
8
9=== added file '.pc/.quilt_series'
10--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
11+++ .pc/.quilt_series 2011-07-08 19:26:59 +0000
12@@ -0,0 +1,1 @@
13+series
14
15=== added file '.pc/.version'
16--- .pc/.version 1970-01-01 00:00:00 +0000
17+++ .pc/.version 2011-07-08 19:26:59 +0000
18@@ -0,0 +1,1 @@
19+2
20
21=== added directory '.pc/01-ftbfs-add-opendrim-lib.patch'
22=== added file '.pc/01-ftbfs-add-opendrim-lib.patch/.timestamp'
23=== added file '.pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4'
24--- .pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4 1970-01-01 00:00:00 +0000
25+++ .pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4 2011-07-08 19:26:59 +0000
26@@ -0,0 +1,318 @@
27+################################################################################
28+# Linux Management Providers (LMP), Physical Asset provider package
29+# Copyright (C) 2008 Guillaume BOTTEX, ETRI <guillaumebottex@etri.re.kr, guillaumebottex@gmail.com>
30+#
31+# This program is being developed under the "OpenDRIM" project.
32+# The "OpenDRIM" project web page: http://opendrim.sourceforge.net
33+# The "OpenDRIM" project mailing list: opendrim@googlegroups.com
34+#
35+# This program is free software; you can redistribute it and/or
36+# modify it under the terms of the GNU General Public License
37+# as published by the Free Software Foundation; version 2
38+# of the License.
39+#
40+# This program is distributed in the hope that it will be useful,
41+# but WITHOUT ANY WARRANTY; without even the implied warranty of
42+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43+# GNU General Public License for more details.
44+#
45+# You should have received a copy of the GNU General Public License
46+# along with this program; if not, write to the Free Software
47+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
48+#################################################################################
49+
50+#################################################################################
51+# To contributors, please leave your contact information in this section
52+# AND comment your changes in the source code.
53+#
54+# Modified by <Author(s)>, <Affiliation>, <Year>
55+################################################################################
56+
57+AC_DEFUN([SHOW_COPYRIGHT],
58+ [
59+ echo "#################################################################################
60+# Linux Management Providers (LMP), PhysicalAsset provider package
61+# Copyright (C) 2007 Guillaume BOTTEX <guillaumebottex@etri.re.kr>
62+#
63+# This program is being developed under the "OpenDRIM" project.
64+# The "OpenDRIM" project web page: http://opendrim.sourceforge.net
65+# The "OpenDRIM" project mailing list: opendrim@googlegroups.com
66+#
67+# This program is free software; you can redistribute it and/or
68+# modify it under the terms of the GNU General Public License
69+# as published by the Free Software Foundation; version 2
70+# of the License.
71+#
72+# This program is distributed in the hope that it will be useful,
73+# but WITHOUT ANY WARRANTY; without even the implied warranty of
74+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
75+# GNU General Public License for more details.
76+#
77+# You should have received a copy of the GNU General Public License
78+# along with this program; if not, write to the Free Software
79+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
80+#################################################################################
81+"
82+ ]
83+)
84+
85+AC_DEFUN([CHECK_CIMSERVER],
86+ [
87+ AC_MSG_CHECKING(for CIM servers)
88+
89+ if test x"$CIMSERVER" == x
90+ then
91+ AC_MSG_ERROR([[please define the CIMSERVER variable (see ./configure --help)]])
92+ fi
93+
94+ if test "$CIMSERVER" != pegasus && test "$CIMSERVER" != sfcb && test "$CIMSERVER" != openwbem
95+ then
96+ AC_MSG_ERROR([[please define the CIMSERVER variable (see ./configure --help)]])
97+ fi
98+
99+ if test "$CIMSERVER" == pegasus
100+ then
101+ if !( command -v cimmof > /dev/null )
102+ then
103+ AC_MSG_ERROR([[no. the Pegasus mof compiler could not be found (cimmof)]])
104+ fi
105+ fi
106+
107+ if test "$CIMSERVER" == openwbem
108+ then
109+ if !( command -v owmofc > /dev/null)
110+ then
111+ AC_MSG_ERROR([[no. the OpenWBEM mof compiler could not be found (owmofc)]])
112+ fi
113+ fi
114+
115+ if test "$CIMSERVER" == sfcb
116+ then
117+ if !( command -v sfcbd > /dev/null )
118+ then
119+ AC_MSG_ERROR([[no. the SBLIM sfcb deamon could not be found (sfcbd)]])
120+ fi
121+ if !( command -v sfcbstage > /dev/null )
122+ then
123+ AC_MSG_ERROR([[no. the SBLIM mof stager could not be found (sfcbstage)]])
124+ fi
125+ if !( command -v sfcbrepos > /dev/null )
126+ then
127+ AC_MSG_ERROR([[no. the SBLIM repository builder could no be found (sfcbrepos)]])
128+ fi
129+ fi
130+
131+ if test "$CIMSERVER" == pegasus
132+ then
133+ if test x"$prefix" == xNONE
134+ then
135+ if test "$HW" == X86_64 || test "$HW" == IA64
136+ then
137+ PROVIDERDIR_TMP=/usr/lib64/Pegasus/providers
138+ COMMONLIBDIR_TMP=/usr/lib64
139+ OPENDRIMCOMMONLIBDIR_TMP=/usr/lib64
140+ else
141+ PROVIDERDIR_TMP=/usr/lib/Pegasus/providers
142+ COMMONLIBDIR_TMP=/usr/lib
143+ OPENDRIMCOMMONLIBDIR_TMP=/usr/lib
144+ fi
145+ OPENDRIMCOMMONINCLUDE_TMP=/usr/include/OpenDRIM
146+ else
147+ if test "$HW" == X86_64 || test "$HW" == IA64
148+ then
149+ PROVIDERDIR_TMP=$prefix/lib64/Pegasus/providers
150+ COMMONLIBDIR_TMP=$prefix/lib64
151+ OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib64
152+ else
153+ PROVIDERDIR_TMP=$prefix/lib/Pegasus/providers
154+ COMMONLIBDIR_TMP=$prefix/lib
155+ OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib
156+ fi
157+ OPENDRIMCOMMONINCLUDE_TMP=$prefix/include/OpenDRIM
158+ fi
159+
160+ if test x"$PEGASUS_HOME" != x
161+ then
162+ PROVIDERDIR_TMP=$PEGASUS_HOME/lib
163+ COMMONLIBDIR_TMP=$PEGASUS_HOME/lib
164+ OPENDRIMCOMMONLIBDIR_TMP=$PEGASUS_HOME/lib
165+ OPENDRIMCOMMONINCLUDE_TMP=$PEGASUS_HOME/include/OpenDRIM
166+ fi
167+ fi
168+
169+ if test "$CIMSERVER" == sfcb
170+ then
171+ if test x"$prefix" == xNONE
172+ then
173+ PROVIDERDIR_TMP=$ac_default_prefix/lib/cmpi
174+ COMMONLIBDIR_TMP=$ac_default_prefix/lib
175+ OPENDRIMCOMMONLIBDIR_TMP=$ac_default_prefix/lib
176+ OPENDRIMCOMMONINCLUDE_TMP=$ac_default_prefix/include/OpenDRIM
177+ else
178+ PROVIDERDIR_TMP=$prefix/lib/cmpi
179+ COMMONLIBDIR_TMP=$prefix/lib
180+ OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib
181+ OPENDRIMCOMMONINCLUDE_TMP=$prefix/include/OpenDRIM
182+ fi
183+ fi
184+
185+ if test "$CIMSERVER" == openwbem
186+ then
187+ if test x"$prefix" == xNONE
188+ then
189+ if test "$HW" == X86_64 || test "$HW" == IA64
190+ then
191+ PROVIDERDIR_TMP=/usr/lib64/openwbem/cmpiproviders
192+ COMMONLIBDIR_TMP=/usr/lib64
193+ OPENDRIMCOMMONLIBDIR_TMP=/usr/lib64
194+ else
195+ PROVIDERDIR_TMP=/usr/lib/openwbem/cmpiproviders
196+ COMMONLIBDIR_TMP=/usr/lib
197+ OPENDRIMCOMMONLIBDIR_TMP=/usr/lib
198+ fi
199+ OPENDRIMCOMMONINCLUDE_TMP=/usr/include/OpenDRIM
200+ else
201+ PROVIDERDIR_TMP=$prefix/lib/openwbem/cmpiproviders
202+ COMMONLIBDIR_TMP=$prefix/lib
203+ OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib
204+ OPENDRIMCOMMONINCLUDE_TMP=$prefix/include/OpenDRIM
205+ fi
206+ fi
207+
208+ if test x"$PROVIDERDIR" = x
209+ then
210+ PROVIDERDIR=$PROVIDERDIR_TMP
211+ fi
212+
213+ if test x"$COMMONLIBDIR" = x
214+ then
215+ COMMONLIBDIR=$COMMONLIBDIR_TMP
216+ fi
217+
218+ if test x"$OPENDRIMCOMMONLIBDIR" = x
219+ then
220+ OPENDRIMCOMMONLIBDIR=$OPENDRIMCOMMONLIBDIR_TMP
221+ fi
222+
223+ if test x"$OPENDRIMCOMMONINCLUDE" = x
224+ then
225+ OPENDRIMCOMMONINCLUDE=$OPENDRIMCOMMONINCLUDE_TMP
226+ fi
227+
228+ TEMP_CPPFLAGS="$CPPFLAGS -D_REENTRANT"
229+ CFLAGS="-Wall -Wunused -fPIC -O2 $CFLAGS"
230+ CXXFLAGS="-Wall -Wunused -fPIC -fno-rtti -fno-exceptions -O2 $CXXFLAGS"
231+ LDFLAGS="$LDFLAGS -L. -L$PROVIDERDIR -L$COMMONLIBDIR"
232+
233+ AC_MSG_RESULT(yes)
234+ ]
235+)
236+
237+AC_DEFUN([CHECK_CIMNAMESPACE],
238+ [
239+ if test x"$CIMNAMESPACE" == x
240+ then
241+ CIMNAMESPACE=root/cimv2
242+ fi
243+ TEMP_CPPFLAGS="$TEMP_CPPFLAGS -D_NAMESPACE=\\\"$CIMNAMESPACE\\\""
244+ ]
245+)
246+
247+AC_DEFUN([CHECK_INTEROPNAMESPACE],
248+ [
249+ if test x"$INTEROPNAMESPACE" == x
250+ then
251+ if test "$CIMSERVER" == pegasus
252+ then
253+ INTEROPNAMESPACE=Interop
254+ fi
255+ if test "$CIMSERVER" == openwbem
256+ then
257+ INTEROPNAMESPACE=root/Interop
258+ fi
259+ if test "$CIMSERVER" == sfcb
260+ then
261+ INTEROPNAMESPACE=Interop
262+ fi
263+ fi
264+ TEMP_CPPFLAGS="$TEMP_CPPFLAGS -D_INTEROP_NAMESPACE=\\\"$INTEROPNAMESPACE\\\""
265+ ]
266+)
267+
268+AC_DEFUN([CHECK_OPENDRIMCOMMONHEADERS],
269+ [
270+ AC_MSG_CHECKING(for OpenDRIM Common headers)
271+ _HEADERS="Common.h Datastore.h CMPIBroking.h Association.h Indication.h Instance.h Objectpath.h Transtype.h"
272+ for _HEADER in $_HEADERS
273+ do
274+ if !( test -e $OPENDRIMCOMMONINCLUDE/$_HEADER )
275+ then
276+ AC_MSG_ERROR([[no. Could not find OpenDRIM Common headers:] $_HEADER])
277+ fi
278+ done
279+ AC_MSG_RESULT(yes)
280+ ]
281+)
282+
283+AC_DEFUN([CHECK_OPENDRIMCOMMONLIBRARY],
284+ [
285+ AC_MSG_CHECKING(for OpenDRIM Common library)
286+
287+ if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
288+ then
289+ AC_MSG_RESULT(yes)
290+ else
291+ AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
292+ fi
293+ ]
294+)
295+
296+AC_DEFUN([_CHECK_CMPIHEADERS],
297+ [
298+ AC_MSG_CHECKING($1)
299+ AC_TRY_LINK(
300+ [
301+ #include <cmpimacs.h>
302+ #include <cmpidt.h>
303+ #include <cmpift.h>
304+ ],
305+ [
306+ CMPIBroker broker;
307+ CMPIStatus status = {CMPI_RC_OK, NULL};
308+ CMPIString *s = CMNewString(&broker, "TEST", &status);
309+ ],
310+ [
311+ have_CMPI=yes
312+ ],
313+ [
314+ have_CMPI=no
315+ ])
316+
317+])
318+
319+AC_DEFUN([CHECK_CMPIHEADERS],
320+ [
321+ AC_MSG_CHECKING(for CMPI headers)
322+
323+ CPPFLAGS="$TEMP_CPPFLAGS -DCMPI_PLATFORM_LINUX_GENERIC_GNU -I$OPENDRIMCOMMONINCLUDE/cmpi"
324+ _CHECK_CMPIHEADERS($OPENDRIMCOMMONINCLUDE)
325+ if test "$have_CMPI" == "yes"
326+ then
327+ CPPFLAGS="$TEMP_CPPFLAGS"
328+ AC_MSG_RESULT(yes)
329+ else
330+ _CHECK_CMPIHEADERS(standard)
331+ if test "$have_CMPI" == "yes"
332+ then
333+ CPPFLAGS="$TEMP_CPPFLAGS"
334+ AC_MSG_RESULT(yes)
335+ fi
336+ fi
337+
338+ if test "$have_CMPI" == "no"
339+ then
340+ AC_MSG_ERROR([[no. The CMPI headers could not be found (cmpidt.h, cmpimacs.h, cmpift.h)]])
341+ fi
342+
343+ ]
344+)
345
346=== added file '.pc/applied-patches'
347--- .pc/applied-patches 1970-01-01 00:00:00 +0000
348+++ .pc/applied-patches 2011-07-08 19:26:59 +0000
349@@ -0,0 +1,1 @@
350+01-ftbfs-add-opendrim-lib.patch
351
352=== added directory 'debian/patches'
353=== renamed directory 'debian/patches' => 'debian/patches.moved'
354=== added file 'debian/patches/01-ftbfs-add-opendrim-lib.patch'
355--- debian/patches/01-ftbfs-add-opendrim-lib.patch 1970-01-01 00:00:00 +0000
356+++ debian/patches/01-ftbfs-add-opendrim-lib.patch 2011-07-08 19:26:59 +0000
357@@ -0,0 +1,20 @@
358+Description: To fix FTBFS because of changes in defaults for toolchain (binutils)
359+ it is necessary to include library opendrim at linking time. This patch modifies
360+ acinclude.m4 adding such library to the LIBS variable.
361+ .
362+Forwarded: http://sourceforge.net/apps/trac/opendrim/ticket/1
363+Author: Sebastian Carneiro <scarneiro@fibertel.com.ar>
364+Last-Update: 2011-07-07
365+
366+Index: opendrim-lmp-physicalasset/acinclude.m4
367+===================================================================
368+--- opendrim-lmp-physicalasset.orig/acinclude.m4 2011-07-07 21:07:23.657179001 -0300
369++++ opendrim-lmp-physicalasset/acinclude.m4 2011-07-07 21:07:46.317178249 -0300
370+@@ -261,6 +261,7 @@
371+ if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
372+ then
373+ AC_MSG_RESULT(yes)
374++ LIBS="${LIBS} -lopendrim"
375+ else
376+ AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
377+ fi
378
379=== added file 'debian/patches/series'
380--- debian/patches/series 1970-01-01 00:00:00 +0000
381+++ debian/patches/series 2011-07-08 19:26:59 +0000
382@@ -0,0 +1,1 @@
383+01-ftbfs-add-opendrim-lib.patch

Subscribers

People subscribed via source and target branches

to all changes: