Package: fsvs Version: 1.1.17-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for fsvs (versioned as 1.1.17-1.1) and uploaded without delay. The FTBFS bugs had been open for quite some time, with both users and upstream complaining. Please state whether you are still interested in maintaining fsvs. Regards. -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ] PhD student [ i...@cs.nott.ac.uk ]
diff -u fsvs-1.1.17/config.guess fsvs-1.1.17/config.guess diff -u fsvs-1.1.17/config.sub fsvs-1.1.17/config.sub diff -u fsvs-1.1.17/debian/changelog fsvs-1.1.17/debian/changelog --- fsvs-1.1.17/debian/changelog +++ fsvs-1.1.17/debian/changelog @@ -1,3 +1,14 @@ +fsvs (1.1.17-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Backport patch from upstream to fix compilation errors with gcc > 4.4. + (Closes: #564990) + * Add BD on libdb4.8-dev; required for build + * Patch Makefile to link to needed libraries, fixing FTBFS with + --no-add-needed (Closes: #554367) + + -- Iain Lane <la...@debian.org> Thu, 15 Sep 2011 22:48:41 +0100 + fsvs (1.1.17-1) unstable; urgency=low * New upstream release diff -u fsvs-1.1.17/debian/control fsvs-1.1.17/debian/control --- fsvs-1.1.17/debian/control +++ fsvs-1.1.17/debian/control @@ -2,7 +2,7 @@ Section: admin Priority: optional Maintainer: Sheldon Hearn <sheld...@starjuice.net> -Build-Depends: debhelper (>= 5), autotools-dev, libsvn-dev, libgdbm-dev, ctags, libaprutil1-dev, libpcre3-dev +Build-Depends: debhelper (>= 5), autotools-dev, libsvn-dev, libgdbm-dev, ctags, libdb4.8-dev, libapr1-dev, libaprutil1-dev, libpcre3-dev Standards-Version: 3.8.0 Homepage: http://fsvs.tigris.org/ only in patch2: unchanged: --- fsvs-1.1.17.orig/src/options.c +++ fsvs-1.1.17/src/options.c @@ -632,7 +632,7 @@ * loop via \c getenv() over all options? */ char *opt__variable_from_option(enum opt__settings_e which) { - static char buffer[ strlen(ENV_PREFIX) + + static char buffer[ sizeof(ENV_PREFIX) + sizeof(opt__list[0].name) + 1] = ENV_PREFIX; char * const target=buffer+strlen(ENV_PREFIX); int i; only in patch2: unchanged: --- fsvs-1.1.17.orig/src/helper.c +++ fsvs-1.1.17/src/helper.c @@ -1674,7 +1674,7 @@ { static int last=0; /* Sadly GCC doesn't statically solve sizeof(rev)*log(10)/log(2) ... */ - static char buffers[2][(int)(sizeof(rev)*3.32)+3]; + static char buffers[2][(int)(sizeof(rev)*4)+3]; last++; if (last>= sizeof(buffers)/sizeof(buffers[0])) last=0; only in patch2: unchanged: --- fsvs-1.1.17.orig/src/Makefile.in +++ fsvs-1.1.17/src/Makefile.in @@ -18,7 +18,7 @@ CFLAGS := @CFLAGS@ CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' LDFLAGS := @LDFLAGS@ -FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm +FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lapr-1 -laprutil-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm ifdef RPATH LDFLAGS += -Wl,-rpath,$(RPATH) only in patch2: unchanged: --- fsvs-1.1.17.orig/src/status.c +++ fsvs-1.1.17/src/status.c @@ -381,6 +381,7 @@ } +#define BAR_CHART_WIDTH 20 /** -. * A secondary status function for commit and update (and other functions * which run silently through the filesystem), which shows local progress @@ -400,8 +401,7 @@ int status; time_t now; int print; - const int bar_chart_width=20; - static const char bar_chart[bar_chart_width+1]="###################>"; + static const char bar_chart[BAR_CHART_WIDTH+1]="###################>"; float pct; @@ -446,7 +446,7 @@ if (counter <= approx_entry_count && now<too_many_new) { pct=(float)counter/approx_entry_count; - print = (int)((float)bar_chart_width*pct +0.5); + print = (int)((float)BAR_CHART_WIDTH*pct +0.5); /* In perl it works to say "%0*s"; gcc warns here * "'0' flag used with %s" and it doesn't work. * So we have to show part of a (constant) string. @@ -456,8 +456,8 @@ "\r%8d of %8d done (%5.1f%%); [%s%*s]", counter, approx_entry_count, pct*100.0, - bar_chart+bar_chart_width-print, - bar_chart_width-print, ""); + bar_chart+BAR_CHART_WIDTH-print, + BAR_CHART_WIDTH-print, ""); if (pct > 0.96 && !too_many_new) too_many_new=now+5;
signature.asc
Description: Digital signature
