diff -Nru scratchbox2-2.2.2/debian/changelog scratchbox2-2.2.2/debian/changelog --- scratchbox2-2.2.2/debian/changelog 2011-04-01 00:22:03.000000000 +0530 +++ scratchbox2-2.2.2/debian/changelog 2011-06-29 23:08:07.000000000 +0530 @@ -1,3 +1,10 @@ +scratchbox2 (2.2.2-2ubuntu1) oneiric; urgency=low + + * Changed the ordering of libs in the Makefile in utils folder to fix + FTBFS with ld --as-needed (LP: #803195). + + -- Nigel Babu Tue, 21 Jun 2011 21:51:56 +0530 + scratchbox2 (2.2.2-2) unstable; urgency=low * Added options -g and -G to sb2 (Lauri T. Aarnio) diff -Nru scratchbox2-2.2.2/debian/control scratchbox2-2.2.2/debian/control --- scratchbox2-2.2.2/debian/control 2011-04-01 00:22:03.000000000 +0530 +++ scratchbox2-2.2.2/debian/control 2011-06-21 21:59:40.000000000 +0530 @@ -1,5 +1,6 @@ Source: scratchbox2 -Maintainer: Riku Voipio +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Riku Voipio Section: utils Priority: extra Standards-Version: 3.8.0 diff -Nru scratchbox2-2.2.2/utils/Makefile scratchbox2-2.2.2/utils/Makefile --- scratchbox2-2.2.2/utils/Makefile 2011-04-01 00:22:03.000000000 +0530 +++ scratchbox2-2.2.2/utils/Makefile 2011-06-29 21:43:37.000000000 +0530 @@ -3,13 +3,13 @@ $(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \ -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \ - -I$(SRCDIR)/include -ldl + -I$(SRCDIR)/include $(D)/sb2-show.o: preload/exported.h $(D)/sb2-show: $(D)/sb2-show.o $(MKOUTPUTDIR) $(P)LD - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl $(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W -Werror \ @@ -25,7 +25,7 @@ -I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \ -I$(SRCDIR)/include -$(D)/sb2-interp-wrapper: preload/libsb2.$(SHLIBEXT) $(D)/sb2-interp-wrapper.o +$(D)/sb2-interp-wrapper: $(D)/sb2-interp-wrapper.o preload/libsb2.$(SHLIBEXT) $(MKOUTPUTDIR) $(P)LD $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl