tags 662542 patch tags 720821 patch thanks Dear maintainer,
I've prepared an NMU for voxbo (versioned as 1.8.5~svn1246-1.1) and will try to find a sponsor in the next week. Please feel free to tell me if I should wait longer or you want to upload yourself. Regards.
diff -Nru voxbo-1.8.5~svn1246/debian/changelog voxbo-1.8.5~svn1246/debian/changelog --- voxbo-1.8.5~svn1246/debian/changelog 2011-02-25 19:24:51.000000000 +0100 +++ voxbo-1.8.5~svn1246/debian/changelog 2014-02-09 21:40:16.000000000 +0100 @@ -1,3 +1,14 @@ +voxbo (1.8.5~svn1246-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: + - No longer Build-Depends on obsolete libpng12-dev (Closes: #662542) + * debian/patches/fix-linking.patch: (Closes: #720821) + - Add -lboost_system where needed + - Use Wl,--no-as-needed where necessary to allow building in Ubuntu + + -- Andreas Moog <andreas.m...@warperbbs.de> Sun, 09 Feb 2014 20:12:36 +0100 + voxbo (1.8.5~svn1246-1) unstable; urgency=low * New upstream code. diff -Nru voxbo-1.8.5~svn1246/debian/control voxbo-1.8.5~svn1246/debian/control --- voxbo-1.8.5~svn1246/debian/control 2010-12-13 15:41:14.000000000 +0100 +++ voxbo-1.8.5~svn1246/debian/control 2014-02-09 20:12:24.000000000 +0100 @@ -2,7 +2,7 @@ Priority: extra Maintainer: NeuroDebian Team <t...@neuro.debian.net> Uploaders: Michael Hanke <m...@debian.org>, Yaroslav Halchenko <deb...@onerussian.com> -Build-Depends: debhelper (>= 7.0.50~), python, zlib1g-dev, libboost-dev, libboost-thread-dev, libgsl0-dev, libpng12-dev | libpng-dev, libqt4-dev, libxi-dev, libxrender-dev, libfontconfig1-dev | libfontconfig-dev +Build-Depends: debhelper (>= 7.0.50~), python, zlib1g-dev, libboost-dev, libboost-thread-dev, libgsl0-dev, libpng-dev, libqt4-dev, libxi-dev, libxrender-dev, libfontconfig1-dev | libfontconfig-dev Standards-Version: 3.9.1 Section: science Homepage: http://www.voxbo.org diff -Nru voxbo-1.8.5~svn1246/debian/patches/fix-linking.patch voxbo-1.8.5~svn1246/debian/patches/fix-linking.patch --- voxbo-1.8.5~svn1246/debian/patches/fix-linking.patch 1970-01-01 01:00:00.000000000 +0100 +++ voxbo-1.8.5~svn1246/debian/patches/fix-linking.patch 2014-02-09 21:39:07.000000000 +0100 @@ -0,0 +1,184 @@ +Description: Several parts of the code need boost_system, but don't explicitly + add it to their respective linker commands. This causes the build to fail when + --no-copy-dt-needed entries is set, so add them to the command line. + The -Wl,--no-as-needed flag is a workaround for cgsl being underlinked, causing a + build failure in Ubuntu, where --as-needed is set as default. Arguably, this + should be resolved in cgsl, but in the meantime, this is a good workaround. +Bug-Debian: http://bugs.debian.org/720821 +Forwarded: Yes, https://github.com/kimberg/voxbo/pull/1 +Author: Andreas Moog + +--- voxbo-1.8.5~svn1246.orig/crunch/Makefile ++++ voxbo-1.8.5~svn1246/crunch/Makefile +@@ -23,7 +23,7 @@ PERFMASKOBJECTS = perfmask.o realignutil + INCDIRS += -I/usr/local/include/octave + LIBDIRS += -L/usr/local/lib/octave + +-LIBS =$(LDFLAGS) $(LIBDIRS) -lm -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) ++LIBS =$(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) -lm -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) -lboost_system + OCTLIBS = $(LIBS) -loctave -lcruft $(FORTLIB) + + ALLBINS=vbmm2 vbmakeglm vbmakefilter #realign norm +--- voxbo-1.8.5~svn1246.orig/fileformats/Makefile ++++ voxbo-1.8.5~svn1246/fileformats/Makefile +@@ -6,7 +6,7 @@ include ../make_stuff.txt + + SHAREDFLAG=-shared + +-LIBS=$(LDFLAGS) $(LIBDIRS) -lvbio -lvbutil -lvbprefs -lz -lpng -lgsl -lgslcblas ++LIBS=$(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) -lvbio -lvbutil -lvbprefs -lz -lpng -lgsl -lgslcblas -lboost_system + + ALLBINS=dcmsplit dicominfo ffinfo vbrename analyzeinfo niftiinfo + BINS=$(ALLBINS) +--- voxbo-1.8.5~svn1246.orig/gdscript/Makefile ++++ voxbo-1.8.5~svn1246/gdscript/Makefile +@@ -13,7 +13,7 @@ ONEOVERFDIR=../utils + GDS_OBJECTS = gds_main.o gds.o + + # miscellaneous flags and such +-LIBS = $(LDFLAGS) $(LIBDIRS) $(DLLIB) -lm -lvbprefs -lvbglm -lvbio -lvbutil -lz -lpng $(GSL_LIBS) ++LIBS = $(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) $(DLLIB) -lm -lvbprefs -lvbglm -lvbio -lvbutil -lz -lpng $(GSL_LIBS) -lboost_system + + ALLBINS=gds + ifeq ($(VB_TARGET),all) +--- voxbo-1.8.5~svn1246.orig/lib/Makefile ++++ voxbo-1.8.5~svn1246/lib/Makefile +@@ -57,43 +57,43 @@ libvbio.a: $(IOOBJECTS) $(FFOBJECTS) + ranlib libvbio.a + + libvbio.so: $(IOOBJECTS) $(FFOBJECTS) libvbprefs.so libvbutil.so +- g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. -lc -lz -lgsl -lpng -lvbprefs -lvbutil $^ ++ g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. $^ -lc -lz -lgsl -lpng -lvbprefs -lvbutil -lboost_system + + libvbutil.a: $(UTILOBJECTS) + ar rc libvbutil.a $^ + ranlib libvbutil.a + + libvbutil.so: $(UTILOBJECTS) +- g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -lc -lz $^ ++ g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) $^ -lc -lz -lboost_system + + libvbprefs.a: $(VBPOBJECTS) + ar rc libvbprefs.a $^ + ranlib libvbprefs.a + + libvbprefs.so: $(VBPOBJECTS) libvbutil.so +- g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. -lc -lvbutil $^ ++ g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. $^ -lc -lvbutil -lboost_system + + libvbscripts.a: $(SCRIPTOBJECTS) + ar rc libvbscripts.a $^ + ranlib libvbscripts.a + + libvbscripts.so: $(SCRIPTOBJECTS) libvbprefs.so libvbutil.so +- g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. -lc -lvbprefs -lvbutil $^ ++ g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. $^ -lc -lvbprefs -lvbutil + + libvbglm.a: $(GLMOBJECTS) + ar rc libvbglm.a $^ + ranlib libvbglm.a + + libvbglm.so: $(GLMOBJECTS) libvbio.so libvbutil.so libvbprefs.so +-# g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. -lc -lgsl -lvbio -lvbutil -lvbscripts -lvbprefs $^ +- g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. -lc -lgsl -lvbio -lvbutil -lvbprefs $^ ++# g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. $^ -lc -lgsl -lvbio -lvbutil -lvbscripts -lvbprefs ++ g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. $^ -lc -lgsl -lvbio -lvbutil -lvbprefs -lboost_system + + libdbutil.a: $(DBOBJECTS) + ar rc libdbutil.a $^ + ranlib libdbutil.a + + libdbutil.so: $(DBOBJECTS) libvbio.so libvbutil.so +- g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. -lc -lvbio -lvbutil $^ ++ g++ -shared -Wl,-soname,$@ -o $@ $(LDFLAGS) -L. $^ -lc -lvbio -lvbutil + + # and now for the building blocks + +--- voxbo-1.8.5~svn1246.orig/munge/Makefile ++++ voxbo-1.8.5~svn1246/munge/Makefile +@@ -8,7 +8,7 @@ VBLIBS=$(VBLIBS2) + + # miscellaneous flags and such + +-LIBS =$(LDFLAGS) $(LIBDIRS) $(LIBPATHS) -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) ++LIBS =$(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) $(LIBPATHS) -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) -lboost_system + + CONVERTERS=tes2cub vb2cub vb2img vb2imgs vb2tes vb2vmp vbconv + MUNGERS=vbmunge vbcmp vbshift vbsmooth vbmaskmunge vecsplit vbinterpolate vbthresh +--- voxbo-1.8.5~svn1246.orig/qtglm/Makefile ++++ voxbo-1.8.5~svn1246/qtglm/Makefile +@@ -20,7 +20,7 @@ TCALC_OBJECTS= vbtcalc.o + PERMGEN_OBJECTS= vbpermgen.o + + # miscellaneous flags and such +-LIBS=$(LDFLAGS) $(LIBDIRS) $(QTLIBDIRS) $(QTLIBS) -lz -lvbglm -lvbprefs -lvbio -lvbutil -lz $(GSL_LIBS) $(DLLIB) ++LIBS=$(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) $(QTLIBDIRS) $(QTLIBS) -lz -lvbglm -lvbprefs -lvbio -lvbutil -lz $(GSL_LIBS) $(DLLIB) -lboost_system + + ALLBINS= glm gdw vecview vbpermgen vbtcalc + OSXTRA=glm.app glm.dmg gdw.app gdw.dmg vecview.app vecview.dmg vbpermgen.app vbpermgen.dmg vbtcalc.app vbtcalc.dmg +--- voxbo-1.8.5~svn1246.orig/resample/Makefile ++++ voxbo-1.8.5~svn1246/resample/Makefile +@@ -11,7 +11,7 @@ VBTRANSFORMOBJECTS = vbtransform.o + + # miscellaneous flags and such + +-LIBS = $(LDFLAGS) $(LIBDIRS) -lm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) ++LIBS = $(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) -lm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) -lboost_system + + # resample is in all packages + BINS=resample +--- voxbo-1.8.5~svn1246.orig/stand_alone/Makefile ++++ voxbo-1.8.5~svn1246/stand_alone/Makefile +@@ -13,7 +13,7 @@ TESJOIN_OBJECTS=$(TESPLIT_OBJECTS) + REGRESSION_OBJECTS=regression.o utils.o koshutil.o + PERMUTATION_OBJECTS=perm.o utils.o time_series_avg.o koshutil.o + +-LIBS=$(LDFLAGS) $(LIBDIRS) -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(GSL_LIBS) $(DLLIB) ++LIBS=$(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(GSL_LIBS) $(DLLIB) -lboost_system + + ALLBINS= calcgs calcps sliceacq tesplit tesjoin makematkg makematk\ + comptraces permstep vbregress vbpermmat +--- voxbo-1.8.5~svn1246.orig/stats/Makefile ++++ voxbo-1.8.5~svn1246/stats/Makefile +@@ -8,7 +8,7 @@ VBLIBS=$(VBLIBS2) + + # miscellaneous flags and such + +-LIBS = $(LDFLAGS) $(LIBDIRS) -lm -lvbprefs -lvbglm -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) ++LIBS = $(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) -lm -lvbprefs -lvbglm -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) -lboost_system + + ALLBINS=vbvolregress vbmakeregress vbstatmap vbdumpstats glminfo vbperminfo + ALLBINS+=vbxts vbtmap vbmakeresid vbfdr vbpermvec vbscoregen vbmap +--- voxbo-1.8.5~svn1246.orig/utils/Makefile ++++ voxbo-1.8.5~svn1246/utils/Makefile +@@ -7,7 +7,7 @@ include ../make_stuff.txt + # Some variables + MYLIBVOXBO=../lib + +-LIBS = $(LDFLAGS) $(LIBDIRS) -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) ++LIBS = $(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) -lvbglm -lvbprefs -lvbio -lvbutil -lz -lpng $(DLLIB) $(GSL_LIBS) -lboost_system + + ALLBINS=vbfit vbcfx txt2num gcheck sortmvpm + ifeq ($(VB_TARGET),all) +--- voxbo-1.8.5~svn1246.orig/vbview/Makefile ++++ voxbo-1.8.5~svn1246/vbview/Makefile +@@ -11,7 +11,7 @@ CXXFLAGS += -DQT3_SUPPORT $(QTLIBDIRS) $ + VBVIEW_SUBOBJECTS=vbview.o vbview_ts.o vbview_layers.o vbview_render.o vbview_io.o vbqt_masker.o vbqt_canvas.o vbqt_glmselect.o vbqt_scalewidget.o rsrc.o + VBVIEW_OBJECTS=vbviewmain.o $(VBVIEW_SUBOBJECTS) + +-LIBS=$(LDFLAGS) $(LIBDIRS) $(QTLIBDIRS) -L../vbwidgets $(QTLIBS) -lvbglm -lvbprefs -lvbio -lvbutil -lz $(DLLIB) -lgsl -lgslcblas ++LIBS=$(LDFLAGS) -Wl,--no-as-needed $(LIBDIRS) $(QTLIBDIRS) -L../vbwidgets $(QTLIBS) -lvbglm -lvbprefs -lvbio -lvbutil -lz $(DLLIB) -lgsl -lgslcblas -lboost_system + + # right now all three programs are in all packages, so we just + # conditionalize on ARCH +--- voxbo-1.8.5~svn1246.orig/vbwidgets/Makefile ++++ voxbo-1.8.5~svn1246/vbwidgets/Makefile +@@ -47,7 +47,7 @@ libvbwidgets.a: $(VBWIDGET_OBJECTS) + ranlib libvbwidgets.a + + libvbwidgets.so: $(VBWIDGET_OBJECTS) +- g++ -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ -lc $^ -L../lib -lvbio -lvbutil -lvbprefs -lvbglm -lQtCore -lQt3Support -lQtGui -lgsl ++ g++ -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ -lc $^ -L../lib -lvbio -lvbutil -lvbprefs -lvbglm -lQtCore -lQt3Support -lQtGui -lgsl -lboost_system + + moc_%.cpp : %.h + $(MOC) $< -o $@ diff -Nru voxbo-1.8.5~svn1246/debian/patches/series voxbo-1.8.5~svn1246/debian/patches/series --- voxbo-1.8.5~svn1246/debian/patches/series 2011-01-19 20:17:27.000000000 +0100 +++ voxbo-1.8.5~svn1246/debian/patches/series 2014-02-09 21:10:55.000000000 +0100 @@ -1,2 +1,3 @@ no_qtimageformats_linking manpages +fix-linking.patch
signature.asc
Description: Digital signature
