Bug#1049895: w3cam: please consider upgrading to 3.0 source format

2023-08-24 Thread Martin Meredith
It should be lownmu.  Go ahead and undelay if you wish. 

> On 24 Aug 2023, at 17:21, Bastian Germann  wrote:
> 
> I am uploading a NMU to DELAYED/10 in order to fix this.
> The debdiff is attached.
> 



Bug#1049895: w3cam: please consider upgrading to 3.0 source format

2023-08-24 Thread Bastian Germann

I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.diff -Nru w3cam-0.7.2/Makefile w3cam-0.7.2/Makefile
--- w3cam-0.7.2/Makefile2023-08-24 14:07:44.0 +
+++ w3cam-0.7.2/Makefile1970-01-01 00:00:00.0 +
@@ -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-08-24 14:07:44.0 +
+++ w3cam-0.7.2/Makefile.in 2001-10-28 10:12:26.0 +
@@ -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/cgi.c w3cam-0.7.2/cgi.c
--- w3cam-0.7.2/cgi.c   2023-08-24 14:07:44.0 +
+++ w3cam-0.7.2/cgi.c   2001-11-11 10:34:54.0 +
@@ -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/changelog2023-08-24 14:07:44.0 +
+++ w3cam-0.7.2/debian/changelog2023-08-24 13:52:40.0 +
@@ -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 +
+
 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-08-24 14:07:44.0 +
+++ w3cam-0.7.2/debian/control  2023-08-24 13:52:40.0 +
@@ -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.0 
+
+++ w3cam-0.7.2/debian/patches/debian.patch 2023-08-24 13:52:40.0 
+
@@ -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 @@
+ 

Bug#1049895: w3cam: please consider upgrading to 3.0 source format

2023-08-16 Thread Bastian Germann

Source: w3cam
Version: 0.7.2-6.3
Severity: minor

This package is among the few that still use source format 1.0.
Please upgrade it to source format 3.0:
https://wiki.debian.org/Projects/DebSrc3.0

If you do not want to move to format 3.0, please at least specify 1.0 
format so that dpkg-source can move to default 3.0 format.