Package: xpuzzles Version: 7.5-1 Followup-For: Bug #556717 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 *** /tmp/tmp5ty_WM In Ubuntu, the attached patch was applied to achieve the following: * Makefile.in: Add -laudiofile to fix a FTBFS with ld --as-needed. (LP: #756014) (Closes: #556717) Thanks for considering the patch. - -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-999-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJOGInXAAoJEGHzRCZ03mYkHNkQAIlAxFx2Uz2ixjLevR+MMVPf zFx5+xcRuSTpIZH/jHx+UzML18HCl27+CGZxLRi2uLorADWnHk5QmpOTKsR0ztxp poF5McbqIdLGvVVL9p9evYoUUjhlIBYO5cOy5V3xmf01m1pjEAzszjJijHfz+L9S +0vCmXHCE6U2NhnbhRdru2ZOCpB7AwvNQ3l8GXxXWnHt1SeAUgJTYfQLS2m6kEYD 6i2DzTCytnhauNJBqXsNDiolXPl6lIITqSds8aZilaWcEAOudKili0K8JtBDweMM 3FPtjJ5rOay/jlPcJkN69i7hIkeiDGtqzNJlBc8sxsA+02MvSn8kz/npjWhMnt0X zi4xLg1q8KhbWi+kmsulN/35ylbgymZmnETlyFuvwJIvsyUeszMAsOUXoXwRJ6n9 bkJe2/iJpBV/rzGhLX5MR6siKFrLsPr1koafz0d1fWcYcKzlVXD1GZQQmjyUk8Se tbeOhRgKqLiijIkb4hyuMyNcfi+UOGeKV1Z/O8xaZmB/pHH127l+6cfZgjZuHnjV G6wgyMwannGlCopFbOXzmKvUWpLTfXlpAjs8O/bk5437+pnc/Ii9k+Vbm79Ysl8B k3pzTSXQ96SvFXpsN0rgkVgBSoP2lcNjjFxN9aH6+sV++eYNyBjR9RUSdw1U4M6e L+Nv3zpO2gk4KVZ1jYUW =+0g6 -----END PGP SIGNATURE-----
only in patch2: unchanged: --- xpuzzles-7.5.orig/hexagons/Makefile.in +++ xpuzzles-7.5/hexagons/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -170,7 +171,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/mball/Makefile.in +++ xpuzzles-7.5/mball/Makefile.in @@ -119,6 +119,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ -lm +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -168,8 +169,8 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) - @ $(ECHO) "$@ BUILD COMPLETE" + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) + @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" @ $(ECHO) "\"make install-games\" may work better, see INSTALL." only in patch2: unchanged: --- xpuzzles-7.5.orig/triangles/Makefile.in +++ xpuzzles-7.5/triangles/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -170,7 +171,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/oct/Makefile.in +++ xpuzzles-7.5/oct/Makefile.in @@ -119,6 +119,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -168,7 +169,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/barrel/Makefile.in +++ xpuzzles-7.5/barrel/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ -lm +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -170,7 +171,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/threed/Makefile.in +++ xpuzzles-7.5/threed/Makefile.in @@ -109,6 +109,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ -lm +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -158,7 +159,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/rubik/Imakefile +++ xpuzzles-7.5/rubik/Imakefile @@ -208,6 +208,8 @@ XCOMM *** END RNG CONFIG SECTION *** +EXTRA_LIBRARIES += -laudiofile + #ifdef SunArchitecture #if SystemV4 EXTRA_LDOPTIONS = -R/usr/lib:/usr/openwin/lib only in patch2: unchanged: --- xpuzzles-7.5.orig/rubik/Makefile.in +++ xpuzzles-7.5/rubik/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -175,7 +176,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/mlink/Makefile.in +++ xpuzzles-7.5/mlink/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ -lm +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -170,7 +171,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/cubes/Makefile.in +++ xpuzzles-7.5/cubes/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -170,7 +171,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/dial/Makefile.in +++ xpuzzles-7.5/dial/Makefile.in @@ -106,6 +106,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ -lm +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -152,7 +153,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" $(WIDGET)$(O) : $(WIDGET)$(C) $(WIDGET)P.h $(WIDGET).h xwin.h only in patch2: unchanged: --- xpuzzles-7.5.orig/panex/Makefile.in +++ xpuzzles-7.5/panex/Makefile.in @@ -119,7 +119,8 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ -lm - +EXTRA_LIBRARIES = -laudiofile + N= C=.c #C++ @@ -168,7 +169,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/skewb/Makefile.in +++ xpuzzles-7.5/skewb/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -175,7 +176,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/dino/Makefile.in +++ xpuzzles-7.5/dino/Makefile.in @@ -121,6 +121,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -175,7 +176,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but" only in patch2: unchanged: --- xpuzzles-7.5.orig/pyraminx/Makefile.in +++ xpuzzles-7.5/pyraminx/Makefile.in @@ -119,6 +119,7 @@ XWIDGETLDFLAGS = @XWIDGETLDFLAGS@ XLIBS = @XLIBS@ XWIDGETLIBS = @XWIDGETLIBS@ +EXTRA_LIBRARIES = -laudiofile N= C=.c @@ -168,7 +169,7 @@ done $(PROG) : $(OBJS) - $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) + $(CC) -o $@ $(OBJS) $(XWIDGETLDFLAGS) $(XWIDGETLIBS) $(EXTRA_LIBRARIES) @ $(ECHO) "$@ BUILD COMPLETE" @ $(ECHO) "" @ $(ECHO) "To install: \"make install\" is safer but"