Merge lp:~jtaylor/ubuntu/oneiric/mooproxy/fix-770784 into lp:ubuntu/oneiric/mooproxy

[Julian Taylor]

fix ftbs

[Chase Douglas (chasedouglas)]

The fix looks good. However, it should be in a patch in debian/patches instead of a direct change to the top-level Makefile.

It would be good to get this fix pushed upstream. I can't find an upstream contact, though. Perhaps you could email the change to the upstream maintainer listed in debian/copyright? This is not a blocker for getting the change into Ubuntu.

review: Needs Fixing

[Julian Taylor (jtaylor)]

the package has no patchsystem.
should one be added?

[Chase Douglas (chasedouglas)]

Yes, a patch system should be added. You can find info at http://pkg-perl.alioth.debian.org/howto/quilt.html#integrating_with_the_package_build_process. The more modern the better :). Please let us know if you need help!

I would suggest coordinating this work with the Debian maintainer if possible. The ideal solution would be to have it fixed in Debian and then request a package sync back to Ubuntu. If the Debian maintainer isn't responsive at first, we can upload the changes to Ubuntu first and then try to get them back into Debian afterwards.

[lp:~jtaylor/ubuntu/oneiric/mooproxy/fix-770784]

5. By Julian Taylor on 2011-08-22

* change to source format 3.0 (quilt)
* debian/patches/fix_as_needed_build.patch:
  - patch Makefile to fix build with ld --as-needed (LP: #770784)

[Julian Taylor (jtaylor)]

branch updated.
I have submitted the fix to debian on 29 Jun 2011 and have not yet received an answer yet.
I attached the debdiff with the patch system to the bug.

The debian maintainer seems to be the upstream maintainer, so no further forwarding should be necessary. But I still pinged him directly.

[Chase Douglas (chasedouglas)]

Looks good. I forgot to mention that the distro should be left as UNRELEASED instead of oneiric, but that can be fixed by the merger/uploader.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-11 22:49:31 +0000
+++ debian/changelog	2011-08-22 18:54:24 +0000
@@ -1,3 +1,11 @@
+mooproxy (1.0.0-1ubuntu1) oneiric; urgency=low
+
+  * change to source format 3.0 (quilt) 
+  * debian/patches/fix_as_needed_build.patch:
+    - patch Makefile to fix build with ld --as-needed (LP: #770784) 
+
+ -- Julian Taylor <[e-mail]>  Mon, 22 Aug 2011 20:45:21 +0200
+
 mooproxy (1.0.0-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-02-11 22:49:31 +0000
+++ debian/control	2011-08-22 18:54:24 +0000
@@ -1,7 +1,8 @@
 Source: mooproxy
 Section: net
 Priority: extra
-Maintainer: Marcel Moreaux <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Marcel Moreaux <[e-mail]>
 Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.9.1
 
 
=== added directory 'debian/patches'
=== added file 'debian/patches/fix_as_needed_build.patch'
--- debian/patches/fix_as_needed_build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_as_needed_build.patch	2011-08-22 18:54:24 +0000
@@ -0,0 +1,19 @@
+Description: fix build with -Wl,--as-needed
+ The object files must be before the libraries which provide the
+ symbols they need
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mooproxy/+bug/770784
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632114
+Author: Julian Taylor <[e-mail]>
+Index: mooproxy-1.0.0/Makefile
+===================================================================
+--- mooproxy-1.0.0.orig/Makefile	2011-06-29 19:18:05.966860693 +0200
++++ mooproxy-1.0.0/Makefile	2011-06-29 19:18:28.196860701 +0200
+@@ -10,7 +10,7 @@
+ all: mooproxy
+ 
+ mooproxy: $(OBJS)
+-	$(CC) $(LFLAGS) $(OBJS) -o mooproxy
++	$(CC) $(OBJS) -o mooproxy $(LFLAGS)
+ #	strip mooproxy
+ 
+ # If a header file changed, maybe some data formats changed, and all object
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-08-22 18:54:24 +0000
@@ -0,0 +1,1 @@
+fix_as_needed_build.patch
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-08-22 18:54:24 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)