diff -Nru w3cam-0.7.2/cgi.c w3cam-0.7.2/cgi.c --- w3cam-0.7.2/cgi.c 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/cgi.c 2001-11-11 10:34:54.000000000 +0000 @@ -27,9 +27,6 @@ #include /* uname() */ #include /* time() */ #include "cgi.h" -#ifdef DEBIAN -#define DEFAULT_CFGFILE "/etc/w3cam.cgi.scf" -#endif #define MAX_LINE 1024 #define EMPTY '\0' @@ -564,10 +561,6 @@ strcpy (cfgfile, pname); strcat (cfgfile, ".scf"); fp = fopen (cfgfile, "rb"); -#ifdef DEBIAN - if (!fp) - fp = fopen (DEFAULT_CFGFILE, "rb"); -#endif if (!fp) { return (0); } diff -Nru w3cam-0.7.2/debian/changelog w3cam-0.7.2/debian/changelog --- w3cam-0.7.2/debian/changelog 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/debian/changelog 2023-08-24 13:52:40.000000000 +0000 @@ -1,3 +1,11 @@ +w3cam (0.7.2-6.4) unstable; urgency=medium + + * Non-maintainer upload + * Convert to source format 3.0 (Closes: #1049895) + * Regenerate build files via dh_autoreconf + + -- Bastian Germann Thu, 24 Aug 2023 13:52:40 +0000 + w3cam (0.7.2-6.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru w3cam-0.7.2/debian/control w3cam-0.7.2/debian/control --- w3cam-0.7.2/debian/control 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/debian/control 2023-08-24 13:52:40.000000000 +0000 @@ -2,7 +2,7 @@ Section: web Priority: optional Maintainer: Martin Meredith -Build-Depends: debhelper (>> 7.0.0), libjpeg-dev, libpng-dev, libfreetype6-dev, zlib1g-dev, libv4l-dev +Build-Depends: debhelper (>> 7.0.0), dh-autoreconf, libjpeg-dev, libpng-dev, libfreetype6-dev, zlib1g-dev, libv4l-dev Standards-Version: 3.8.1 Homepage: http://mpx.freeshell.net/ diff -Nru w3cam-0.7.2/debian/patches/debian.patch w3cam-0.7.2/debian/patches/debian.patch --- w3cam-0.7.2/debian/patches/debian.patch 1970-01-01 00:00:00.000000000 +0000 +++ w3cam-0.7.2/debian/patches/debian.patch 2023-08-24 13:52:40.000000000 +0000 @@ -0,0 +1,103 @@ +--- w3cam-0.7.2.orig/Makefile.in ++++ w3cam-0.7.2/Makefile.in +@@ -31,7 +31,7 @@ install: w3cam.cgi + test -f $(cgibindir)/w3cam.cgi.scf || \ + install w3cam.cgi.scf $(cgibindir)/ + install vidcat $(bindir)/ +- install vidcat.1 $(prefix)/man/man1/ ++ install vidcat.1 $(prefix)/share/man/man1/ + + vidcat.1: vidcat.man + sed "s/VERSION/$(VERSION)/" < vidcat.man > vidcat.1 +--- w3cam-0.7.2.orig/cgi.c ++++ w3cam-0.7.2/cgi.c +@@ -27,6 +27,9 @@ + #include /* uname() */ + #include /* time() */ + #include "cgi.h" ++#ifdef DEBIAN ++#define DEFAULT_CFGFILE "/etc/w3cam.cgi.scf" ++#endif + + #define MAX_LINE 1024 + #define EMPTY '\0' +@@ -561,6 +564,10 @@ cgi_init (const char *pname) + strcpy (cfgfile, pname); + strcat (cfgfile, ".scf"); + fp = fopen (cfgfile, "rb"); ++#ifdef DEBIAN ++ if (!fp) ++ fp = fopen (DEFAULT_CFGFILE, "rb"); ++#endif + if (!fp) { + return (0); + } +--- w3cam-0.7.2.orig/v4l.c ++++ w3cam-0.7.2/v4l.c +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include "v4l.h" + + #define min(a,b) ((a) < (b) ? (a) : (b)) +--- w3cam-0.7.2.orig/vidcat.c ++++ w3cam-0.7.2/vidcat.c +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #ifdef HAVE_LIBZ + #include + #endif +--- w3cam-0.7.2.orig/w3cam.c ++++ w3cam-0.7.2/w3cam.c +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #ifdef HAVE_LIBZ + #include + #endif +@@ -47,7 +47,7 @@ + #include + #endif + #ifdef HAVE_LIBTTF +-#include ++#include + #endif + #include "w3cam.h" + #include "cgi.h" +--- w3cam-0.7.2.orig/w3camd/Makefile ++++ w3cam-0.7.2/w3camd/Makefile +@@ -2,10 +2,10 @@ + # + # makefile for w3camd + # +-prefix=/usr/local +-sbindir=/usr/local/sbin ++prefix=/usr ++sbindir=/usr/sbin + +-CFLAGS = -O2 -Wall -I/usr/local/include -I/usr/local/X11/include -I.. -I. -I/usr/local/include -g -DDEBUG -DCAM_PORT=8999 -D_REENTRANT ++CFLAGS = -g -O2 -I/usr/local/include -I/usr/local/X11/include -I.. -I. -I/usr/include -g -DDEBUG -DCAM_PORT=8999 -D_REENTRANT + CC = gcc + + default: w3camd +--- w3cam-0.7.2.orig/w3camd/w3v4l.c ++++ w3cam-0.7.2/w3camd/w3v4l.c +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include "w3v4l.h" + + /* diff -Nru w3cam-0.7.2/debian/patches/series w3cam-0.7.2/debian/patches/series --- w3cam-0.7.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ w3cam-0.7.2/debian/patches/series 2023-08-24 13:52:40.000000000 +0000 @@ -0,0 +1 @@ +debian.patch diff -Nru w3cam-0.7.2/debian/rules w3cam-0.7.2/debian/rules --- w3cam-0.7.2/debian/rules 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/debian/rules 2023-08-24 13:52:40.000000000 +0000 @@ -9,6 +9,7 @@ configure-stamp: dh_testdir + dh_autoreconf ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info touch configure-stamp @@ -31,6 +32,7 @@ [ ! -f Makefile ] || $(MAKE) clean -rm -f config.* + dh_autoreconf_clean dh_clean install: build diff -Nru w3cam-0.7.2/debian/source/format w3cam-0.7.2/debian/source/format --- w3cam-0.7.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ w3cam-0.7.2/debian/source/format 2023-08-24 13:52:40.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru w3cam-0.7.2/Makefile w3cam-0.7.2/Makefile --- w3cam-0.7.2/Makefile 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -# Generated automatically from Makefile.in by configure. -CC = gcc -prefix=/usr -exec_prefix=${prefix} -sbindir=${exec_prefix}/sbin -cgibindir=$(prefix)/cgi-bin -bindir=${exec_prefix}/bin - -VERSION=0.7.2 -CFLAGS = -g -O2 -I/usr/local/include -I/usr/local/X11/include -DHAVE_LIBM=1 -DHAVE_LIBZ=1 -DHAVE_LIBPNG=1 -DHAVE_LIBJPEG=1 -DVIDEO_DEV=\"/dev/video\" -DVERSION=\"$(VERSION)\" -LDFLAGS = -L/usr/local/lib -L/usr/local/X11/lib -LIBS = -ljpeg -lpng -lz -lm - -OBJ = w3cam.o cgi.o v4l.o - -default: w3cam.cgi vidcat vidcat.1 README ppmtoascii w3camd/w3camd - -w3cam.cgi: $(OBJ) - $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) - -vidcat: vidcat.o v4l.o - $(CC) $(LDFLAGS) -o $@ vidcat.o v4l.o $(LIBS) - -ppmtoascii: ppmtoascii.o - $(CC) $(LDFLAGS) -o $@ ppmtoascii.o - -w3camd/w3camd: - cd w3camd && make - -install: w3cam.cgi - install w3cam.cgi $(cgibindir)/ - test -f $(cgibindir)/w3cam.cgi.scf || \ - install w3cam.cgi.scf $(cgibindir)/ - install vidcat $(bindir)/ - install vidcat.1 $(prefix)/share/man/man1/ - -vidcat.1: vidcat.man - sed "s/VERSION/$(VERSION)/" < vidcat.man > vidcat.1 - -clean: - rm -f *.o w3cam.cgi vidcat ppmtoascii - cd w3camd && make clean && rm -f w3camd - -msproper: clean - rm -f config.status config.log config.cache Makefile - -index.html: index.in - sed "s/@VERSION@/$(VERSION)/" < $< > $@ - -README: index.html - lynx -dump http://www/~rasca/w3cam/index.html | \ - sed "s%/www/%/home.pages.de/%g" > README - -tarball: msproper - cd .. && tar -czvf w3cam-$(VERSION).tar.gz w3cam-$(VERSION)/ - diff -Nru w3cam-0.7.2/Makefile.in w3cam-0.7.2/Makefile.in --- w3cam-0.7.2/Makefile.in 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/Makefile.in 2001-10-28 10:12:26.000000000 +0000 @@ -31,7 +31,7 @@ test -f $(cgibindir)/w3cam.cgi.scf || \ install w3cam.cgi.scf $(cgibindir)/ install vidcat $(bindir)/ - install vidcat.1 $(prefix)/share/man/man1/ + install vidcat.1 $(prefix)/man/man1/ vidcat.1: vidcat.man sed "s/VERSION/$(VERSION)/" < vidcat.man > vidcat.1 diff -Nru w3cam-0.7.2/v4l.c w3cam-0.7.2/v4l.c --- w3cam-0.7.2/v4l.c 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/v4l.c 2001-12-27 16:01:23.000000000 +0000 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "v4l.h" #define min(a,b) ((a) < (b) ? (a) : (b)) diff -Nru w3cam-0.7.2/vidcat.c w3cam-0.7.2/vidcat.c --- w3cam-0.7.2/vidcat.c 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/vidcat.c 2001-11-11 10:35:20.000000000 +0000 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #ifdef HAVE_LIBZ #include #endif diff -Nru w3cam-0.7.2/w3cam.c w3cam-0.7.2/w3cam.c --- w3cam-0.7.2/w3cam.c 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/w3cam.c 2001-12-27 17:43:23.000000000 +0000 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #ifdef HAVE_LIBZ #include #endif @@ -47,7 +47,7 @@ #include #endif #ifdef HAVE_LIBTTF -#include +#include #endif #include "w3cam.h" #include "cgi.h" diff -Nru w3cam-0.7.2/w3camd/Makefile w3cam-0.7.2/w3camd/Makefile --- w3cam-0.7.2/w3camd/Makefile 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/w3camd/Makefile 2001-12-27 16:03:57.000000000 +0000 @@ -2,10 +2,10 @@ # # makefile for w3camd # -prefix=/usr -sbindir=/usr/sbin +prefix=/usr/local +sbindir=/usr/local/sbin -CFLAGS = -g -O2 -I/usr/local/include -I/usr/local/X11/include -I.. -I. -I/usr/include -g -DDEBUG -DCAM_PORT=8999 -D_REENTRANT +CFLAGS = -O2 -Wall -I/usr/local/include -I/usr/local/X11/include -I.. -I. -I/usr/local/include -g -DDEBUG -DCAM_PORT=8999 -D_REENTRANT CC = gcc default: w3camd diff -Nru w3cam-0.7.2/w3camd/w3v4l.c w3cam-0.7.2/w3camd/w3v4l.c --- w3cam-0.7.2/w3camd/w3v4l.c 2023-10-29 07:22:16.000000000 +0000 +++ w3cam-0.7.2/w3camd/w3v4l.c 2000-08-21 21:17:55.000000000 +0000 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "w3v4l.h" /*