Fixed lintian errors.

diff --git a/ChangeLog b/ChangeLog
index 97773d04ba7272240b648c9faff174b0d3b55d72..ee5b50ccfe873a03438373fc5d07dc17ba829493 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
        * Updated the Standards-Version in debian/control. Still need to
        review whether we are in full compliance, though.
 
+       * Fixed lintian errors.
+
 2009-11-29  Markus Gutschke  <markus@shellinabox.com>
 
        * Preparations for packaging ShellInABox in a way that makes it

diff --git a/commit b/commit
index 5c0a285df42b33088df5183992fab7fd29798364..701f57ea8579d0942ea1226c1f959c980c40cf7d 100755 (executable)
--- a/commit
+++ b/commit
@@ -64,6 +64,9 @@ debian_package() {
 
     # Reset compatibility level
     echo 7 >"${prj}-${ver}/debian/compat"
+    sed -i -e 's/debhelper *([^0-9]*[^)]*)/debhelper (>= 7.0.0)/'             \
+        "${prj}-${ver}/debian/control"
+    sed -i -e 's/dh_clean *-k/dh_prep/' "${prj}-${ver}/debian/rules"
 
     # Check that the version number in the debian/changelog file matches
     if [ "$(sed -e 's/^'"${prj}"' *(\([^-]*\)-.*).*/\1/;t1;d;:1;q'            \
@@ -72,11 +75,13 @@ debian_package() {
       exit 1
     fi
 
-
     # Build Debian packages.
     (cd "${prj}-${ver}"
      fakeroot dpkg-buildpackage -sa -us -uc || :)
     trap '' EXIT
+
+    # Run lintian
+    lintian --verbose ${prj}_${ver}*_*.changes
   ) || exit 1
 
   # Revert any changes that might be pending in distributions/debian/*
@@ -167,6 +172,8 @@ svn st | egrep '^[MA]' | awk '{ print $2 }' |
 # compatibility level at 6. Once we no longer care about maintaining strict
 # backwards compatibility, we can lift this restriction.
 echo 6 >debian/compat
+sed -i -e 's/debhelper *([^0-9]*[^)]*)/debhelper (>= 6.0.0)/' debian/control
+sed -i -e 's/dh_prep/dh_clean *-k/' debian/rules
 
 # Build all the sources, create the distribution tar archive, and run some
 # basic sanity checks.

diff --git a/config.h b/config.h
index 076d9f3c1954316f65f3fafd2a11ef9c3cddd57e..150cd12e77167ab740cc9e0d6914996da56f6824 100644 (file)
--- a/config.h
+++ b/config.h
@@ -138,7 +138,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "194"
+#define VCS_REVISION "195"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index 2535ab91e6e197d4519f8f6962de7d4eb5e3fb4d..244ae8ebe5f19436539381340c74160af7b70eb7 100755 (executable)
--- a/configure
+++ b/configure
@@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=194
+VCS_REVISION=195
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index ac2c9946057706813bb2a6ca17022548b36f02e7..b0bd11001a073bc7c96cdb694da471bc9df52e5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
-VCS_REVISION=194
+VCS_REVISION=195
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/debian/control b/debian/control
index cbf4207e655c6c7b433a39ee1dca40878bbb8765..3e490d79f5443a4b1586b6268923a0d47f9e3fb3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,20 @@
 Source: shellinabox
 Section: web
 Priority: optional
+Homepage: http://shellinabox.com
 Maintainer: Markus Gutschke <markus@shellinabox.com>
-Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev,
+Build-Depends: debhelper (>= 6.0.0), binutils, libssl-dev, libpam0g-dev,
  zlib1g-dev
 Standards-Version: 3.8.3
 
 Package: shellinabox
 Section: web
+Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, adduser, lsb-base
 Suggests: libssl0.9.8, libpam0g, openssl
 Description: publish command line shell through AJAX interface
  Shellinabox can export arbitrary command line programs to any JavaScript
  enabled web browser. By default, it prompts for username and password
- and then exports a SSL/TLS encrypted login shell.
+ and then exports a SSL/TLS encrypted login shell. Shellinabox provides
+ a VT100 compatible terminal emulator that runs within any modern browser.

diff --git a/debian/docs b/debian/docs
index cdd3d28ca2d1ab5f213930387b30969c074e5dee..885f1b8e3cd75ffb547f0fdb9d921a7217d04a74 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -5,4 +5,3 @@ INSTALL
 NEWS
 README
 TODO
-shellinabox/cgi-mode-example.sh

diff --git a/debian/rules b/debian/rules
index c724ed9ca00724abe4210f3de10986b958fbc4e2..4592beb91aa7f5d87f9b411a05bf04b251c43c1c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ clean:
        dh_testroot
        rm -f build-stamp 
        @# Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -89,6 +89,13 @@ install: build
           "$(CURDIR)/debian/tmp/etc/shellinabox/options-available/README"
        cp "$(CURDIR)/debian/README.enabled"                                  \
           "$(CURDIR)/debian/tmp/etc/shellinabox/options-enabled/README"
+       # Add Lintian override. ShellInABox has an explicit exemption allowing
+       # the linking its GPLv2 code with OpenSSL.
+       mkdir -p "$(CURDIR)/debian/tmp/usr/share/lintian/overrides/"
+       { echo '# ShellInABox has an explicit exemption allowing the linking';\
+       echo '# of its GPLv2 code with OpenSSL';                              \
+       echo 'shellinabox binary: possible-gpl-code-linked-with-openssl'; }   \
+          >"$(CURDIR)/debian/tmp/usr/share/lintian/overrides/shellinabox"
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/debian/shellinabox.examples b/debian/shellinabox.examples
new file mode 100644 (file)
index 0000000..b9e01df
--- /dev/null
+++ b/debian/shellinabox.examples
@@ -0,0 +1 @@
+shellinabox/cgi-mode-example.sh

diff --git a/debian/shellinabox.install b/debian/shellinabox.install
index 673dad3519df38fad325d6c51e772178c8c437b1..a85965c3ccd0657897c6a600e199eb79abe9f2de 100644 (file)
--- a/debian/shellinabox.install
+++ b/debian/shellinabox.install
@@ -1,4 +1,5 @@
 etc/shellinabox/options-available
 etc/shellinabox/options-enabled
 usr/bin
+usr/share/lintian/overrides
 usr/share/man/man1

diff --git a/debian/shellinabox.postinst b/debian/shellinabox.postinst
index 9863de7695719f1f7d81aff950b85ab5118bfa0d..48a2f68795352f9e54dd9df0821a4c06e2b5e998 100755 (executable)
--- a/debian/shellinabox.postinst
+++ b/debian/shellinabox.postinst
@@ -30,13 +30,4 @@ case "$1" in
   ;;
 esac
 
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/shellinabox" ]; then
-        update-rc.d shellinabox start 30 2 3 4 5 . stop 01 0 1 6 . >/dev/null
-        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                invoke-rc.d shellinabox start || exit $?
-        else
-                /etc/init.d/shellinabox start || exit $?
-        fi
-fi
-# End automatically added section
+#DEBHELPER#

diff --git a/debian/shellinabox.postrm b/debian/shellinabox.postrm
index 75d3edb584f582a397671f3e17c1485e677020a7..c0cb656a8a25f526f4f4b0ee4da3f61f7b91d217 100755 (executable)
--- a/debian/shellinabox.postrm
+++ b/debian/shellinabox.postrm
@@ -2,12 +2,7 @@
 
 set -e
 
-# Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
-        update-rc.d shellinabox remove >/dev/null || exit $?
-fi
-# End automatically added section
-
+#DEBHELPER#
 
 if [ "$1" = "purge" ] ; then
         deluser --quiet --system --remove-home shellinabox > /dev/null || true

diff --git a/demo/vt100.js b/demo/vt100.js
index 1fc997bdf5c704f7309a7faf642c101191d9f7e8..ba8ce42f76b956bc730316cb4bf6e39e82a2be38 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 194)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 195)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/distributions/debian/shellinabox_2.10-1.diff.gz b/distributions/debian/shellinabox_2.10-1.diff.gz
index a2da18a2799f478f4086ec302b2640ed24450ad4..b29d657ee68f20bdc861defdcef0dedf29fa7e58 100644 (file)
Binary files a/distributions/debian/shellinabox_2.10-1.diff.gz and b/distributions/debian/shellinabox_2.10-1.diff.gz differ

diff --git a/distributions/debian/shellinabox_2.10-1.dsc b/distributions/debian/shellinabox_2.10-1.dsc
index ed4da2dbc260b5317b5c66ae4e476bb201473f31..6366081f3a3c210e0745ae079e8c8d30d96dda66 100644 (file)
--- a/distributions/debian/shellinabox_2.10-1.dsc
+++ b/distributions/debian/shellinabox_2.10-1.dsc
@@ -4,14 +4,15 @@ Binary: shellinabox
 Architecture: any
 Version: 2.10-1
 Maintainer: Markus Gutschke <markus@shellinabox.com>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev
+Homepage: http://shellinabox.com
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev
 Checksums-Sha1: 
- 1847ca3684a3cd07b0831b977a6dadf5775f0d58 516377 shellinabox_2.10.orig.tar.gz
- d724b4320311d93976bc70aceaaf3d3b9883cc1d 6073 shellinabox_2.10-1.diff.gz
+ 9aad731c32128d71442fcf6608b922b41b96e3ff 516590 shellinabox_2.10.orig.tar.gz
+ 0547e6c6ff2944e0f2504b4c5df119bf473d33f1 6235 shellinabox_2.10-1.diff.gz
 Checksums-Sha256: 
- 32d5307bd920232f21918a1edfe015da44b31991458a18e5760e60540052ceb2 516377 shellinabox_2.10.orig.tar.gz
- 119748a3a3e7d274ad9603ae5a751199c830f6e09ce6b699061c053ac03db549 6073 shellinabox_2.10-1.diff.gz
+ df60cd564d2463ef46fc5e84e38c542fd23328f55e976cceba2924629ba28924 516590 shellinabox_2.10.orig.tar.gz
+ c8b7ad912c67b5182c761bef708715f324510177a17579a5bd838b465685990f 6235 shellinabox_2.10-1.diff.gz
 Files: 
- b3474662e46077f023de95ca44154c80 516377 shellinabox_2.10.orig.tar.gz
- af657b1c3410a8c60225bb324642c26e 6073 shellinabox_2.10-1.diff.gz
+ 5fd7662d35cb30be92c25bc6bf860b87 516590 shellinabox_2.10.orig.tar.gz
+ 675290cc72ad53a0947ab9aef3adf444 6235 shellinabox_2.10-1.diff.gz

diff --git a/distributions/debian/shellinabox_2.10.orig.tar.gz b/distributions/debian/shellinabox_2.10.orig.tar.gz
index 1083dd4ef634b26895bfee511596261816605e05..be009de393e611e22cddb405990be95e1a93c962 100644 (file)
Binary files a/distributions/debian/shellinabox_2.10.orig.tar.gz and b/distributions/debian/shellinabox_2.10.orig.tar.gz differ

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 639ce4d5629918ab40b855c3bce4272e15e9cfb5..4c1baf47806e59f7b250eebe20340a36f24e169d 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.10 (revision 194)" +
+  alert("Shell In A Box version " + "2.10 (revision 195)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 1fc997bdf5c704f7309a7faf642c101191d9f7e8..ba8ce42f76b956bc730316cb4bf6e39e82a2be38 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 194)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 195)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };