Merge lp:~ssalley/ubuntu/natty/likewise-open/likewise-open-fix-716615 into lp:ubuntu/natty/likewise-open

[Scott Salley]

Allows the branch to build and adds a library to a plugin (driver.so) that it use to get from the container (lwsmd) but is now dropped by the linker since lwsmd doesn't actually need that library.

These changes were intended to go in the last set of changes but I somehow forgot to commit them.

[Benjamin Drung (bdrung)]

A upstream tarball that is packaged for Ubuntu should have -0ubuntuX as Debian revision instead of -X. -X is reserved for Debian. Please fix the version.

Most developers write first the change and then the fixed bug, e.g. "* Doing foobar (LP: #123456)." or "* Doing foobar. (LP: #123456)"

review: Needs Fixing

[Artur Rona (ari-tczew)]

Thank you for your time and efforts making Ubuntu better! However, there are some issues:

1) debian/changelog: I really encourage to improve entry, some like this:

 * debian/patches/add-dependencies-2.diff:
   - Fix FTBFS with ld --no-add-needed. (LP: #716615)

2) Could you add DEP3 tags to add-dependencies-2.diff?
https://wiki.ubuntu.com/PackagingGuide/PatchSystems#Patch%20Tagging%20Guidelines

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Hi All,

I've taken a look at previous uploads of likewise-open because of the versioning, and I've come to realize that natty version has been uploaded without the -0ubuntuX. This is because this package is maintained by upstream, and upstream itself provides the packaging for Ubuntu. (I can't seem to find it in Debian).

Now, given that upstream is providing its own debian directory and maintaining the changelog that way, I believe that the versioning is correct and should be kept, given that we should not remove upstream changelogs (or debian dirs), such as in this case.

review: Approve

[Benjamin Drung (bdrung)]

> [...]This is because this package is maintained by upstream,
> and upstream itself provides the packaging for Ubuntu. (I can't seem to find
> it in Debian).

Not having a package in Debian isn't a reason for using -X instead of -0ubuntuX. When someone package likewise-open for Debian, the same version will be used for two different package. That will lead to confusion.

Using the wrong revision for the previous uploads does not permit to continue using the wrong revision.

[Andres Rodriguez (andreserl)]

Hi Benjamin,

I never said that not having a package in Debian is a reason for using -X instead of -0ubuntuX. This is a particular case on which upstream itself is maintaining packages directly in Ubuntu and such package has been quite a while in Ubuntu, but not in Debian.

Now, as far as I can see, given that in Ubuntu archives there's a package already with -2 (not -0ubuntu2), "fixing" it would involve doing something like -0ubuntu3 will result in a package with lower version. This is because -2 > -0ubuntu2.

This however, should ideally be fixed for new upstream release of likewise-open. Instead of using -X, should be -0ubuntuX.

[Benjamin Drung (bdrung)]

> Now, as far as I can see, given that in Ubuntu archives there's a package
> already with -2 (not -0ubuntu2), "fixing" it would involve doing something
> like -0ubuntu3 will result in a package with lower version. This is because -2
> > -0ubuntu2.

Yes, that's right.

> This however, should ideally be fixed for new upstream release of likewise-
> open. Instead of using -X, should be -0ubuntuX.

Yes (or doing something like 6.0.0.53010-2is0ubuntu1).

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-24 15:57:30 +0000
+++ debian/changelog	2011-02-11 20:27:54 +0000
@@ -1,3 +1,11 @@
+likewise-open (6.0.0.53010-3) natty; urgency=low
+
+  * LP: #716615
+    - added debian/patches/add-dependencies-2.diff to add in more libraries
+      needed for building and running.
+
+ -- Scott Salley <[e-mail]>  Thu, 10 Feb 2011 11:15:29 -0800
+
 likewise-open (6.0.0.53010-2) natty; urgency=low
 
   * LP: #684579

=== added file 'debian/patches/add-dependencies-2.diff'
--- debian/patches/add-dependencies-2.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/add-dependencies-2.diff	2011-02-11 20:27:54 +0000
@@ -0,0 +1,38 @@
+--- likewise-open-6.0.0.53010/lwsm/Makefile.am	2010-11-22 12:06:00 +0000
++++ likewise-open-6.0.0.53010/lwsm/Makefile.am	2011-02-10 21:08:26 +0000
+@@ -56,7 +56,8 @@
+ server_driver_la_LIBADD = \
+     $(top_builddir)/server/liblwsmloader.la \
+     $(top_builddir)/common/liblwsmcommon.la \
+-    @LIB_PTHREAD@
++    @LIB_PTHREAD@ \
++    -llwioclient -llwadvapi -llwadvapi_nothr
+ server_driver_la_LDFLAGS = $(AM_LDFLAGS) $(LOADER_LDFLAGS)
+ 
+ server_stub_la_SOURCES = server/stub.c
+
+--- likewise-open-6.0.0.53010/lwsm/Makefile.am	2010-11-22 12:06:00 +0000
++++ likewise-open-6.0.0.53010/lwsm/Makefile.am	2011-02-09 21:54:38 +0000
+@@ -90,7 +90,7 @@
+ client_lwsm_LDADD = \
+ 	$(top_builddir)/client/liblwsm.la \
+ 	$(top_builddir)/common/liblwsmcommon.la \
+-	-llwadvapi -llwadvapi_nothr @LIB_PTHREAD@
++	-llwadvapi -llwadvapi_nothr -llwmsg -llwmsg_nothr @LIB_PTHREAD@
+ 
+ # documentation
+ 
+
+=== modified file 'lwsm/Makefile.am'
+--- likewise-open-6.0.0.53010/lwsm/Makefile.am	2010-11-22 12:06:00 +0000
++++ likewise-open-6.0.0.53010/lwsm/Makefile.am	2011-02-10 23:09:16 +0000
+@@ -33,7 +33,7 @@
+ client_liblwsm_la_SOURCES = \
+ 	client/client.c \
+ 	client/call.c
+-client_liblwsm_la_LIBADD = $(top_builddir)/common/liblwsmcommon.la @LIB_PTHREAD@
++client_liblwsm_la_LIBADD = $(top_builddir)/common/liblwsmcommon.la -llwmsg -llwmsg_nothr -llwadvapi_nothr @LIB_PTHREAD@
+ client_liblwsm_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols $(top_srcdir)/client/liblwsm.sym
+ 
+ server_liblwsmloader_la_SOURCES = server/loader.c
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-24 15:57:30 +0000
+++ debian/patches/series	2011-02-11 20:27:54 +0000
@@ -17,3 +17,4 @@
 eventlog-libxml2
 use_offsetof.diff
 add-dependencies-1.diff
+add-dependencies-2.diff