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

[James Westby]

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)

[Stefano Rivera (stefanor)]

Quilt :(

Unmerged revisions

4. By Stefano Rivera on 2011-07-08

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)

=== added directory '.pc'
=== renamed directory '.pc' => '.pc.moved'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-07-08 19:26:59 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-07-08 19:26:59 +0000
@@ -0,0 +1,1 @@
+series
 
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-07-08 19:26:59 +0000
@@ -0,0 +1,1 @@
+2
 
=== added directory '.pc/01-ftbfs-add-opendrim-lib.patch'
=== added file '.pc/01-ftbfs-add-opendrim-lib.patch/.timestamp'
=== added file '.pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4'
--- .pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4	1970-01-01 00:00:00 +0000
+++ .pc/01-ftbfs-add-opendrim-lib.patch/acinclude.m4	2011-07-08 19:26:59 +0000
@@ -0,0 +1,318 @@
+################################################################################
+# Linux Management Providers (LMP), Physical Asset provider package
+# Copyright (C) 2008 Guillaume BOTTEX, ETRI <[e-mail], [e-mail]>
+# 
+# This program is being developed under the "OpenDRIM" project.
+# The "OpenDRIM" project web page: http://opendrim.sourceforge.net
+# The "OpenDRIM" project mailing list: [e-mail]
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#################################################################################
+
+#################################################################################
+# To contributors, please leave your contact information in this section
+# AND comment your changes in the source code.
+# 
+# Modified by <Author(s)>, <Affiliation>, <Year>
+################################################################################
+
+AC_DEFUN([SHOW_COPYRIGHT],
+	[
+	echo "#################################################################################
+# Linux Management Providers (LMP), PhysicalAsset provider package
+# Copyright (C) 2007 Guillaume BOTTEX <[e-mail]>
+# 
+# This program is being developed under the "OpenDRIM" project.
+# The "OpenDRIM" project web page: http://opendrim.sourceforge.net
+# The "OpenDRIM" project mailing list: [e-mail]
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#################################################################################
+"
+	]
+)
+
+AC_DEFUN([CHECK_CIMSERVER],
+	[
+	AC_MSG_CHECKING(for CIM servers)
+	
+	if test x"$CIMSERVER" == x
+	then
+		AC_MSG_ERROR([[please define the CIMSERVER variable (see ./configure --help)]])
+	fi
+	
+	if test "$CIMSERVER" != pegasus && test "$CIMSERVER" != sfcb && test "$CIMSERVER" != openwbem
+	then
+		AC_MSG_ERROR([[please define the CIMSERVER variable (see ./configure --help)]])
+	fi
+	
+	if test "$CIMSERVER" == pegasus
+	then
+		if !( command -v cimmof > /dev/null )
+		then
+			AC_MSG_ERROR([[no. the Pegasus mof compiler could not be found (cimmof)]])
+		fi
+	fi
+	
+	if test "$CIMSERVER" == openwbem
+	then
+		if !( command -v owmofc > /dev/null)
+		then
+			AC_MSG_ERROR([[no. the OpenWBEM mof compiler could not be found (owmofc)]])
+		fi
+	fi
+	
+	if test "$CIMSERVER" == sfcb
+	then
+		if !( command -v sfcbd > /dev/null )
+		then
+			AC_MSG_ERROR([[no. the SBLIM sfcb deamon could not be found (sfcbd)]])
+		fi
+		if !( command -v sfcbstage > /dev/null )
+		then
+			AC_MSG_ERROR([[no. the SBLIM mof stager could not be found (sfcbstage)]])
+		fi
+		if !( command -v sfcbrepos > /dev/null )
+		then
+			AC_MSG_ERROR([[no. the SBLIM repository builder could no be found (sfcbrepos)]])
+		fi
+	fi
+	
+	if test "$CIMSERVER" == pegasus
+	then
+		if test x"$prefix" == xNONE
+		then
+			if test "$HW" == X86_64 || test "$HW" == IA64
+			then
+				PROVIDERDIR_TMP=/usr/lib64/Pegasus/providers
+				COMMONLIBDIR_TMP=/usr/lib64
+				OPENDRIMCOMMONLIBDIR_TMP=/usr/lib64
+			else
+				PROVIDERDIR_TMP=/usr/lib/Pegasus/providers
+				COMMONLIBDIR_TMP=/usr/lib
+				OPENDRIMCOMMONLIBDIR_TMP=/usr/lib
+			fi
+			OPENDRIMCOMMONINCLUDE_TMP=/usr/include/OpenDRIM
+		else
+			if test "$HW" == X86_64 || test "$HW" == IA64
+			then
+				PROVIDERDIR_TMP=$prefix/lib64/Pegasus/providers
+				COMMONLIBDIR_TMP=$prefix/lib64
+				OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib64
+			else
+				PROVIDERDIR_TMP=$prefix/lib/Pegasus/providers
+				COMMONLIBDIR_TMP=$prefix/lib
+				OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib
+			fi
+			OPENDRIMCOMMONINCLUDE_TMP=$prefix/include/OpenDRIM
+		fi
+
+		if test x"$PEGASUS_HOME" != x
+		then
+			PROVIDERDIR_TMP=$PEGASUS_HOME/lib
+			COMMONLIBDIR_TMP=$PEGASUS_HOME/lib
+			OPENDRIMCOMMONLIBDIR_TMP=$PEGASUS_HOME/lib
+			OPENDRIMCOMMONINCLUDE_TMP=$PEGASUS_HOME/include/OpenDRIM
+		fi
+	fi
+	
+	if test "$CIMSERVER" == sfcb
+	then
+		if test x"$prefix" == xNONE
+		then
+			PROVIDERDIR_TMP=$ac_default_prefix/lib/cmpi
+			COMMONLIBDIR_TMP=$ac_default_prefix/lib
+			OPENDRIMCOMMONLIBDIR_TMP=$ac_default_prefix/lib
+			OPENDRIMCOMMONINCLUDE_TMP=$ac_default_prefix/include/OpenDRIM
+		else
+			PROVIDERDIR_TMP=$prefix/lib/cmpi
+			COMMONLIBDIR_TMP=$prefix/lib
+			OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib
+			OPENDRIMCOMMONINCLUDE_TMP=$prefix/include/OpenDRIM
+		fi
+	fi
+	
+	if test "$CIMSERVER" == openwbem
+	then
+		if test x"$prefix" == xNONE
+		then
+			if test "$HW" == X86_64 || test "$HW" == IA64
+			then
+				PROVIDERDIR_TMP=/usr/lib64/openwbem/cmpiproviders
+				COMMONLIBDIR_TMP=/usr/lib64
+				OPENDRIMCOMMONLIBDIR_TMP=/usr/lib64
+			else
+				PROVIDERDIR_TMP=/usr/lib/openwbem/cmpiproviders
+				COMMONLIBDIR_TMP=/usr/lib
+				OPENDRIMCOMMONLIBDIR_TMP=/usr/lib
+			fi
+			OPENDRIMCOMMONINCLUDE_TMP=/usr/include/OpenDRIM
+		else
+			PROVIDERDIR_TMP=$prefix/lib/openwbem/cmpiproviders
+			COMMONLIBDIR_TMP=$prefix/lib
+			OPENDRIMCOMMONLIBDIR_TMP=$prefix/lib
+			OPENDRIMCOMMONINCLUDE_TMP=$prefix/include/OpenDRIM
+		fi
+	fi
+	
+	if test x"$PROVIDERDIR" = x
+	then
+		PROVIDERDIR=$PROVIDERDIR_TMP
+	fi
+
+	if test x"$COMMONLIBDIR" = x
+	then
+		COMMONLIBDIR=$COMMONLIBDIR_TMP
+	fi
+
+	if test x"$OPENDRIMCOMMONLIBDIR" = x
+	then
+		OPENDRIMCOMMONLIBDIR=$OPENDRIMCOMMONLIBDIR_TMP
+	fi
+
+	if test x"$OPENDRIMCOMMONINCLUDE" = x
+	then
+		OPENDRIMCOMMONINCLUDE=$OPENDRIMCOMMONINCLUDE_TMP
+	fi
+	
+	TEMP_CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+	CFLAGS="-Wall -Wunused -fPIC -O2 $CFLAGS"
+	CXXFLAGS="-Wall -Wunused -fPIC -fno-rtti -fno-exceptions -O2 $CXXFLAGS"
+	LDFLAGS="$LDFLAGS -L. -L$PROVIDERDIR -L$COMMONLIBDIR"
+	
+	AC_MSG_RESULT(yes)
+	]
+)
+
+AC_DEFUN([CHECK_CIMNAMESPACE],
+	[
+	if test x"$CIMNAMESPACE" == x
+	then
+		CIMNAMESPACE=root/cimv2
+	fi
+	TEMP_CPPFLAGS="$TEMP_CPPFLAGS -D_NAMESPACE=\\\"$CIMNAMESPACE\\\""
+	]	
+)
+
+AC_DEFUN([CHECK_INTEROPNAMESPACE],
+	[
+	if test x"$INTEROPNAMESPACE" == x
+	then
+		if test "$CIMSERVER" == pegasus
+		then
+			INTEROPNAMESPACE=Interop
+		fi
+		if test "$CIMSERVER" == openwbem
+		then
+			INTEROPNAMESPACE=root/Interop
+		fi
+		if test "$CIMSERVER" == sfcb
+		then
+			INTEROPNAMESPACE=Interop
+		fi
+	fi
+	TEMP_CPPFLAGS="$TEMP_CPPFLAGS -D_INTEROP_NAMESPACE=\\\"$INTEROPNAMESPACE\\\""
+	]	
+)
+
+AC_DEFUN([CHECK_OPENDRIMCOMMONHEADERS],
+	[
+	AC_MSG_CHECKING(for OpenDRIM Common headers)
+	_HEADERS="Common.h Datastore.h CMPIBroking.h Association.h Indication.h Instance.h Objectpath.h Transtype.h"
+	for _HEADER in $_HEADERS
+	do
+		if !( test -e $OPENDRIMCOMMONINCLUDE/$_HEADER )
+		then
+			AC_MSG_ERROR([[no. Could not find OpenDRIM Common headers:] $_HEADER])
+		fi
+	done
+	AC_MSG_RESULT(yes)
+	]
+)
+
+AC_DEFUN([CHECK_OPENDRIMCOMMONLIBRARY],
+	[
+	AC_MSG_CHECKING(for OpenDRIM Common library)
+
+	if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
+	then
+		AC_MSG_RESULT(yes)
+	else
+		AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
+	fi
+	]
+)
+
+AC_DEFUN([_CHECK_CMPIHEADERS],
+	[
+	AC_MSG_CHECKING($1)
+	AC_TRY_LINK(
+	[
+		#include <cmpimacs.h>
+		#include <cmpidt.h>
+		#include <cmpift.h>
+	],
+	[
+		CMPIBroker broker;
+		CMPIStatus status = {CMPI_RC_OK, NULL};
+		CMPIString *s = CMNewString(&broker, "TEST", &status);
+	],
+	[
+		have_CMPI=yes
+	],
+	[
+		have_CMPI=no
+	])
+
+])
+
+AC_DEFUN([CHECK_CMPIHEADERS],
+	[
+	AC_MSG_CHECKING(for CMPI headers)
+	
+	CPPFLAGS="$TEMP_CPPFLAGS -DCMPI_PLATFORM_LINUX_GENERIC_GNU -I$OPENDRIMCOMMONINCLUDE/cmpi"
+	_CHECK_CMPIHEADERS($OPENDRIMCOMMONINCLUDE)
+	if test "$have_CMPI" == "yes"
+	then
+		CPPFLAGS="$TEMP_CPPFLAGS"
+		AC_MSG_RESULT(yes)
+	else
+		_CHECK_CMPIHEADERS(standard)
+		if test "$have_CMPI" == "yes"
+		then
+			CPPFLAGS="$TEMP_CPPFLAGS"
+			AC_MSG_RESULT(yes)
+		fi
+	fi
+	
+	if test "$have_CMPI" == "no"
+	then
+		AC_MSG_ERROR([[no. The CMPI headers could not be found (cmpidt.h, cmpimacs.h, cmpift.h)]])
+	fi
+
+	]
+)
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-07-08 19:26:59 +0000
@@ -0,0 +1,1 @@
+01-ftbfs-add-opendrim-lib.patch
 
=== added directory 'debian/patches'
=== renamed directory 'debian/patches' => 'debian/patches.moved'
=== added file 'debian/patches/01-ftbfs-add-opendrim-lib.patch'
--- debian/patches/01-ftbfs-add-opendrim-lib.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-ftbfs-add-opendrim-lib.patch	2011-07-08 19:26:59 +0000
@@ -0,0 +1,20 @@
+Description: To fix FTBFS because of changes in defaults for toolchain (binutils)
+ it is necessary to include library opendrim at linking time. This patch modifies
+ acinclude.m4 adding such library to the LIBS variable.
+ .
+Forwarded: http://sourceforge.net/apps/trac/opendrim/ticket/1
+Author: Sebastian Carneiro <[e-mail]>
+Last-Update: 2011-07-07
+
+Index: opendrim-lmp-physicalasset/acinclude.m4
+===================================================================
+--- opendrim-lmp-physicalasset.orig/acinclude.m4	2011-07-07 21:07:23.657179001 -0300
++++ opendrim-lmp-physicalasset/acinclude.m4	2011-07-07 21:07:46.317178249 -0300
+@@ -261,6 +261,7 @@
+ 	if test -e $OPENDRIMCOMMONLIBDIR/libopendrim.so
+ 	then
+ 		AC_MSG_RESULT(yes)
++		LIBS="${LIBS} -lopendrim"
+ 	else
+ 		AC_MSG_ERROR([[no. The OpenDRIM Common library could not be found (libopendrim.so)]])
+ 	fi
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-07-08 19:26:59 +0000
@@ -0,0 +1,1 @@
+01-ftbfs-add-opendrim-lib.patch