Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
I prepared a fix for #590654, debdiff attached. The .deb looks okay to
me, but as I don't have a ISDN card, I could not do any real testing.
Is the release team okay with uploading this to unstable (delayed as
appropriate for a NMU)?
Regards,
Ansgar
diff -Nru vbox3-0.1.9.4/debian/README.Debian vbox3-0.1.9.4+nmu1/debian/README.Debian
--- vbox3-0.1.9.4/debian/README.Debian 2002-03-02 23:11:25.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/README.Debian 2010-08-28 13:52:51.000000000 +0900
@@ -11,7 +11,7 @@
See subdirectory doc/ for some ducumentation, see debian/changelog for
changes.
-For more Informations see the author's documentation and the documentation
+For more information see the author's documentation and the documentation
of the package raccess4vbox3.
-- Gerrit Pape <p...@smarden.org>, Mon, 22 Jan 2001 14:12:53 +0100
diff -Nru vbox3-0.1.9.4/debian/changelog vbox3-0.1.9.4+nmu1/debian/changelog
--- vbox3-0.1.9.4/debian/changelog 2007-04-10 23:17:20.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/changelog 2010-08-28 14:33:07.000000000 +0900
@@ -1,3 +1,19 @@
+vbox3 (0.1.9.4+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build-depend on tcl-dev instead of tcl8.3-dev, look for include files in
+ /usr/include/tcl. (Closes: #590654)
+ * debian/control: Use Homepage field.
+ * debian/control: Add ${misc:Depends}.
+ * Use debhelper compat level 7; use dh_prep instead of dh_clean -k;
+ remove debian/conffiles.
+ * debian/rules: Do not ignore errors from $(MAKE) distclean.
+ * Do not include empty /usr/bin directory.
+ * Fix spelling errors pointed out by lintian.
+ * debian/copyright: Include proper copyright statement.
+
+ -- Ansgar Burchardt <ans...@43-1.org> Sat, 28 Aug 2010 14:30:56 +0900
+
vbox3 (0.1.9.4) unstable; urgency=low
* config.sub, config.guess: update from autotools-dev package (thx Cyril
diff -Nru vbox3-0.1.9.4/debian/compat vbox3-0.1.9.4+nmu1/debian/compat
--- vbox3-0.1.9.4/debian/compat 1970-01-01 09:00:00.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/compat 2010-08-28 13:49:18.000000000 +0900
@@ -0,0 +1 @@
+7
diff -Nru vbox3-0.1.9.4/debian/conffiles vbox3-0.1.9.4+nmu1/debian/conffiles
--- vbox3-0.1.9.4/debian/conffiles 2001-04-15 23:37:38.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/conffiles 1970-01-01 09:00:00.000000000 +0900
@@ -1,6 +0,0 @@
-/etc/isdn/vbox/vboxgetty.conf
-/etc/isdn/vbox/vboxcallerid.conf
-/etc/isdn/vbox/vboxgetty-ttyI4/log/run
-/etc/isdn/vbox/vboxgetty-ttyI4/run
-/etc/isdn/vbox/vboxgetty-ttyI5/log/run
-/etc/isdn/vbox/vboxgetty-ttyI5/run
diff -Nru vbox3-0.1.9.4/debian/control vbox3-0.1.9.4+nmu1/debian/control
--- vbox3-0.1.9.4/debian/control 2004-09-22 21:48:00.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/control 2010-08-28 14:01:34.000000000 +0900
@@ -3,11 +3,12 @@
Priority: extra
Maintainer: Gerrit Pape <p...@smarden.org>
Standards-Version: 3.6.0
-Build-Depends: debhelper (>> 3.0.0), tcl8.3-dev
+Build-Depends: debhelper (>= 7), tcl-dev
+Homepage: http://smarden.org/pape/vbox3/
Package: vbox3
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: isdnutils-base, raccess4vbox3
Conflicts: isdnvboxserver
Description: voice response system for isdn4linux
@@ -18,5 +19,3 @@
it's possible to create a complete voice response system, with DTMF
touch-tone support, navigating through menus, and even remote
controlling your Debian system.
- .
- See http://smarden.org/pape/vbox3/ for details.
diff -Nru vbox3-0.1.9.4/debian/copyright vbox3-0.1.9.4+nmu1/debian/copyright
--- vbox3-0.1.9.4/debian/copyright 2003-09-30 17:43:44.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/copyright 2010-08-28 14:29:15.000000000 +0900
@@ -4,8 +4,8 @@
It was taken from the isdn4linux cvs repository:
http://www.isdn4linux.de/cgi-bin/cvsweb.cgi/isdn4k-utils/vbox3/
-Upstream Authors: Michael Herold <mich...@abadonna.mayn.de>
- G. Pape <p...@smarden.org>
+Copyright 1996-1998, Michael Herold <mich...@abadonna.mayn.de>
+Copyright 2001-2007, G. Pape <p...@smarden.org>
Copyright: GPL
diff -Nru vbox3-0.1.9.4/debian/dirs vbox3-0.1.9.4+nmu1/debian/dirs
--- vbox3-0.1.9.4/debian/dirs 2001-01-14 20:52:29.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/dirs 2010-08-28 13:55:55.000000000 +0900
@@ -1,4 +1,3 @@
etc
-usr/bin
usr/sbin
var/spool/vbox
diff -Nru vbox3-0.1.9.4/debian/rules vbox3-0.1.9.4+nmu1/debian/rules
--- vbox3-0.1.9.4/debian/rules 2005-02-06 05:52:28.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/rules 2010-08-28 14:02:26.000000000 +0900
@@ -5,20 +5,16 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- sed -e s/-ltcl/-ltcl8.3/g < configure > configure.debian
- CFLAGS='-O2 -Wall' sh ./configure.debian --prefix=/usr \
+ CFLAGS='-O2 -Wall' sh ./configure --prefix=/usr \
--datadir=\$${prefix}/share/isdn \
--sysconfdir=\$${prefix}/../etc/isdn/vbox \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-tcl-include=/usr/include/tcl8.3
+ --with-tcl-include=/usr/include/tcl
touch configure-stamp
@@ -38,7 +34,7 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f configure.debian
rm -f debian/*~
dh_clean
@@ -46,7 +42,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp.
diff -Nru vbox3-0.1.9.4/debian/vboxgetty.8 vbox3-0.1.9.4+nmu1/debian/vboxgetty.8
--- vbox3-0.1.9.4/debian/vboxgetty.8 2001-11-24 01:09:09.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/vboxgetty.8 2010-08-28 13:56:44.000000000 +0900
@@ -38,7 +38,7 @@
E \- error messages
W \- warnings
- I \- informations
+ I \- informational message
A \- action messages (main routines)
D \- debugging messages
diff -Nru vbox3-0.1.9.4/debian/vboxputty.8 vbox3-0.1.9.4+nmu1/debian/vboxputty.8
--- vbox3-0.1.9.4/debian/vboxputty.8 2001-11-24 01:09:09.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/debian/vboxputty.8 2010-08-28 14:04:30.000000000 +0900
@@ -71,7 +71,7 @@
E \- error messages
W \- warnings
- I \- informations
+ I \- informational messages
A \- action messages (main routines)
D \- debugging messages
diff -Nru vbox3-0.1.9.4/vboxgetty/log.h vbox3-0.1.9.4+nmu1/vboxgetty/log.h
--- vbox3-0.1.9.4/vboxgetty/log.h 2001-01-14 22:50:20.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/vboxgetty/log.h 2010-08-28 13:55:39.000000000 +0900
@@ -11,7 +11,7 @@
#define LOG_E (0) /* Errors */
#define LOG_W (1) /* Warnings */
-#define LOG_I (2) /* Informations */
+#define LOG_I (2) /* Informational */
#define LOG_A (4) /* Action */
#define LOG_D (128) /* Debug */
#define LOG_X (255) /* Full debug */
diff -Nru vbox3-0.1.9.4/vboxgetty/vboxgetty.c vbox3-0.1.9.4+nmu1/vboxgetty/vboxgetty.c
--- vbox3-0.1.9.4/vboxgetty/vboxgetty.c 2001-04-19 19:05:10.000000000 +0900
+++ vbox3-0.1.9.4+nmu1/vboxgetty/vboxgetty.c 2010-08-28 14:01:10.000000000 +0900
@@ -256,7 +256,7 @@
if (access(temppathname, F_OK|R_OK|W_OK) != 0)
{
- fprintf(stderr, "\n%s: error: \"%s\" doesn't exist or is not accessable!\n\n", progbasename, temppathname);
+ fprintf(stderr, "\n%s: error: \"%s\" doesn't exist or is not accessible!\n\n", progbasename, temppathname);
quit_program(100);
}
@@ -504,7 +504,7 @@
fprintf(stdout, "\n");
fprintf(stdout, "E - Error messages\n");
fprintf(stdout, "W - Warnings\n");
- fprintf(stdout, "I - Informations\n");
+ fprintf(stdout, "I - Informational messages\n");
fprintf(stdout, "A - Action messages (main routines)\n");
fprintf(stdout, "D - Debugging messages (long output)\n");
fprintf(stdout, "FULL - Full debugging\n");
@@ -535,7 +535,7 @@
fprintf(stdout, "\n");
fprintf(stdout, "E - Error messages\n");
fprintf(stdout, "W - Warnings\n");
- fprintf(stdout, "I - Informations\n");
+ fprintf(stdout, "I - Informational messages\n");
fprintf(stdout, "A - Action messages (main routines)\n");
fprintf(stdout, "D - Debugging messages (long output)\n");
fprintf(stdout, "FULL - Full debugging\n");
