Merge lp:~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-ssh/oneiric-201107071349 into lp:ubuntu/oneiric/opendrim-lmp-ssh

[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-ssh reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-ssh/oneiric-201107071349. 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)

[Didier Roche-Tolomelli (didrocks)]

see https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-powermanagement/oneiric-201107070710/+merge/67122

review: Disapprove

Unmerged revisions

3. By Sebastian Carneiro on 2011-07-07

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: #756110)

=== 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-07 13:53:30 +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-06
+
+Index: opendrim-lmp-ssh/acinclude.m4
+===================================================================
+--- opendrim-lmp-ssh.orig/acinclude.m4	2011-07-07 00:12:31.567179001 -0300
++++ opendrim-lmp-ssh/acinclude.m4	2011-07-07 00:13:17.057222114 -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-07 13:53:30 +0000
@@ -0,0 +1,1 @@
+01-ftbfs-add-opendrim-lib.patch