--- 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/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 @@ 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/Makefile.in +++ w3cam-0.7.2/Makefile.in @@ -31,7 +31,7 @@ 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/Makefile +++ w3cam-0.7.2/Makefile @@ -0,0 +1,56 @@ +# 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)/ + --- 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/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/w3camd/w3v4l.c +++ w3cam-0.7.2/w3camd/w3v4l.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "w3v4l.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/debian/watch +++ w3cam-0.7.2/debian/watch @@ -0,0 +1,4 @@ +version=3 + +http://mpx.freeshell.net/ w3cam-(.*).tar.gz + --- w3cam-0.7.2.orig/debian/README.Debian +++ w3cam-0.7.2/debian/README.Debian @@ -0,0 +1,9 @@ +w3cam.cgi for Debian. + +Modifies, + 1. /etc/w3cam.cgi.scf as Default cfg file. + if w3cam.cgi.scf is not in same place with w3cam.cgi, cgi will try open + /etc/w3cam.cgi.scf + +NOTE: + 1. cgi needs +wr permissin to /dev/video. --- w3cam-0.7.2.orig/debian/rules +++ w3cam-0.7.2/debian/rules @@ -0,0 +1,78 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +configure: configure-stamp +configure-stamp: + dh_testdir + + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + $(MAKE) CPPFLAGS=-DDEBIAN + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) clean + -rm -f config.* + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) install prefix=$(CURDIR)/debian/w3cam/usr \ + cgibindir=$(CURDIR)/debian/w3cam/usr/lib/cgi-bin + mv $(CURDIR)/debian/w3cam/usr/lib/cgi-bin/*.scf \ + $(CURDIR)/debian/w3cam/etc + chmod -x $(CURDIR)/debian/w3cam/etc/*.scf + $(MAKE) -C w3camd install \ + prefix=$(CURDIR)/debian/w3cam/usr sbindir=\$${prefix}/sbin + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples samples + mkdir -p $(CURDIR)/debian/w3cam/usr/share/doc/w3cam/examples/w3camd/ + cp -a w3camd/*.html \ + $(CURDIR)/debian/w3cam/usr/share/doc/w3cam/examples/w3camd/ + -rm -f $(CURDIR)/debian/w3cam/usr/share/doc/w3cam/examples/samples/w3cam.css + cp -a w3cam.css $(CURDIR)/debian/w3cam/usr/share/doc/w3cam/examples/samples/ + dh_installinfo + dh_installman debian/w3camd.1 + dh_installchangelogs ChangeLog.txt + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- w3cam-0.7.2.orig/debian/docs +++ w3cam-0.7.2/debian/docs @@ -0,0 +1,6 @@ +FAQ.txt +FAQ.txt +README +TODO.txt +TODO.txt +w3camd/README --- w3cam-0.7.2.orig/debian/compat +++ w3cam-0.7.2/debian/compat @@ -0,0 +1 @@ +7 --- w3cam-0.7.2.orig/debian/copyright +++ w3cam-0.7.2/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Takuo KITAME on +Mon, 10 Sep 2001 09:07:44 +0900. + +It was downloaded from http://www.hdk-berlin.de/~rasca/w3cam/ + +Upstream Author: Rasca, Berlin + +Copyright: (C) 1997,1998 Rasca, Berlin + + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2`'. + --- w3cam-0.7.2.orig/debian/dirs +++ w3cam-0.7.2/debian/dirs @@ -0,0 +1,5 @@ +usr/bin +usr/sbin +usr/lib/cgi-bin +usr/share/man/man1 +etc --- w3cam-0.7.2.orig/debian/w3camd.1 +++ w3cam-0.7.2/debian/w3camd.1 @@ -0,0 +1,30 @@ +.\" +.\" Written by Rasca, Berlin 2001 +.\" Published under the GNU GPL V2 +.\" +.TH W3CAMD 1 "Dec 2007" "GNU" "Version 0.7.1" +.SH NAME +w3camd - A simple web camera daemon + +.SH SYNOPSIS +.BI "w3camd [-v] [-p port] [-h host] [-m connections] [-s size] [-i tv|comp1|com1|s-video ] [-d ]" +.SH DESCRIPTION +.I w3camd +A simple daemon to read from a web camera. +.SH OPTIONS + -v verbose mode + -p # port number (default: 8999) + -h host host name to bind to (default: localhost) + -m # max connections to serve (default: 10) + -s #x# size of image + -i input 0=TV, 1=comp1, 2=comp2, 3=s-video + -d dev camera device, default: /dev/video0 +.SH AUTHOR +Rasca, Berlin +.br +http://home.pages.de/~rasca/ +.br +w3camd is published under the GNU General Public License +.PP +This manual page was written by Barry deFreese for the +Debian/Ubuntu distributions but may be used by others. --- w3cam-0.7.2.orig/debian/changelog +++ w3cam-0.7.2/debian/changelog @@ -0,0 +1,84 @@ +w3cam (0.7.2-6.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: Update Build-Depends for libjpeg and PNG transition: + libjpeg62-dev -> libjpeg-dev + libpng3-dev -> libpng-dev + + -- Bill Allombert Wed, 06 Jun 2012 12:54:54 +0200 + +w3cam (0.7.2-6.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: Build-Depends: libv4l-dev and replace + linux/videodev.h by libv4l1-videodev.h. Closes: #621971. + + -- Bart Martens Fri, 30 Sep 2011 22:39:25 +0200 + +w3cam (0.7.2-6) unstable; urgency=low + + * Added Homepage + * Updated Watch file + + -- Martin Meredith Sun, 12 Apr 2009 17:05:22 +0100 + +w3cam (0.7.2-5) unstable; urgency=low + + * New Maintainer + * Bumped Standards Version + * Fixed Minor Lintian issues + * Updated to debhelper 7 + + -- Martin Meredith Sat, 11 Apr 2009 12:52:51 +0100 + +w3cam (0.7.2-4) unstable; urgency=low + + * NMU: + * Really get rid of libttf2 by dropping libttf-dev from build deps + + -- Moritz Muehlenhoff Wed, 13 Feb 2008 22:05:47 +0100 + +w3cam (0.7.2-3) unstable; urgency=low + + * QA Upload + * freetype transition (Closes: #431780) + * Add manpage for w3camd (Closes: #135766) + * Bump debhelper b-d to 5 + * Move DH_COMPAT to compat and set to 5 + * Update FSF address in Copyright + * Make clean not ignore errors + * Bump Standards Version to 3.7.3 + + -- Barry deFreese Sat, 22 Dec 2007 08:28:54 -0500 + +w3cam (0.7.2-2) unstable; urgency=low + + * change maintainer address to @debian.org + + -- Takuo KITAME Fri, 22 Nov 2002 15:48:46 +0900 + +w3cam (0.7.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 22 Feb 2002 10:33:12 +0900 + +w3cam (0.7.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 19 Nov 2001 19:02:47 +0900 + +w3cam (0.7.0-2) unstable; urgency=low + + * Fix Maintainer address + + -- Takuo KITAME Tue, 9 Oct 2001 12:28:43 +0900 + +w3cam (0.7.0-1) unstable; urgency=low + + * Initial Release. (closes: Bug#111826) + + -- Takuo KITAME Tue, 11 Sep 2001 03:48:43 +0900 + + --- w3cam-0.7.2.orig/debian/control +++ w3cam-0.7.2/debian/control @@ -0,0 +1,18 @@ +Source: w3cam +Section: web +Priority: optional +Maintainer: Martin Meredith +Build-Depends: debhelper (>> 7.0.0), libjpeg-dev, libpng-dev, libfreetype6-dev, zlib1g-dev, libv4l-dev +Standards-Version: 3.8.1 +Homepage: http://mpx.freeshell.net/ + +Package: w3cam +Architecture: any +Depends: ${shlibs:Depends} +Description: a simple CGI to retrieve images from video4linux device + w3cam is a simple CGI to retrieve images from video4linux device. + In other words this program will only run on Linux machines + which support a video4linux-device. + . + w3cam supports a plain mode and a gui mode. In the gui mode a html + with a form is supplied to change some parameters with the mouse