* Added checks that the debian/changelog file is up-to-date

* Added debian/watch file

* Updated the Standards-Version in debian/control. Still need to
  review whether we are in full compliance, though.

diff --git a/ChangeLog b/ChangeLog
index 6d804f360626552398e690f209a7eb9950a4318b..97773d04ba7272240b648c9faff174b0d3b55d72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@
        sure we at least attempt to keep copyright dates updated whenever we
        make changes.
 
+       * Added checks that the debian/changelog file is up-to-date
+
+       * Added debian/watch file
+
+       * Updated the Standards-Version in debian/control. Still need to
+       review whether we are in full compliance, though.
+
 2009-11-29  Markus Gutschke  <markus@shellinabox.com>
 
        * Preparations for packaging ShellInABox in a way that makes it

diff --git a/Makefile.am b/Makefile.am
index 6e075536a06e23343405125f95dfefc66ac1c57a..0cb1307fe00168dfc6fd71b955c09044e51ccab7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,8 @@ EXTRA_DIST           = INSTALL.Debian                                         \
                        debian/shellinabox.init                                \
                        debian/shellinabox.install                             \
                        debian/shellinabox.postinst                            \
-                       debian/shellinabox.postrm
+                       debian/shellinabox.postrm                              \
+                       debian/watch
 LIBLOGGING_INCLUDES  = logging/logging.h                                      \
                        config.h
 liblogging_la_SOURCES= logging/logging.c                                      \

diff --git a/Makefile.in b/Makefile.in
index d345066997f7d391f0e312db423e703a9864f37c..f63e861f4a879e8f812ac7a8cdf4e14cae7a9d78 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -314,7 +314,8 @@ EXTRA_DIST = INSTALL.Debian                                         \
                        debian/shellinabox.init                                \
                        debian/shellinabox.install                             \
                        debian/shellinabox.postinst                            \
-                       debian/shellinabox.postrm
+                       debian/shellinabox.postrm                              \
+                       debian/watch
 
 LIBLOGGING_INCLUDES = logging/logging.h                                      \
                        config.h

diff --git a/commit b/commit
index 0ea86847c0e6ab9d9e40b310bd9b066dda1e1b43..5c0a285df42b33088df5183992fab7fd29798364 100755 (executable)
--- a/commit
+++ b/commit
@@ -65,11 +65,19 @@ debian_package() {
     # Reset compatibility level
     echo 7 >"${prj}-${ver}/debian/compat"
 
+    # Check that the version number in the debian/changelog file matches
+    if [ "$(sed -e 's/^'"${prj}"' *(\([^-]*\)-.*).*/\1/;t1;d;:1;q'            \
+             "${prj}-${ver}/debian/changelog")" != "${ver}" ]; then
+      echo "Debian changelog file does not match current version number!" >&2
+      exit 1
+    fi
+
+
     # Build Debian packages.
     (cd "${prj}-${ver}"
      fakeroot dpkg-buildpackage -sa -us -uc || :)
     trap '' EXIT
-  )
+  ) || exit 1
 
   # Revert any changes that might be pending in distributions/debian/*
   local revert="$(svn st |

diff --git a/config.h b/config.h
index e627a2deadbecf8a4b0c9eaaaed2cdadde664023..076d9f3c1954316f65f3fafd2a11ef9c3cddd57e 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 "193"
+#define VCS_REVISION "194"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index ebf45ad61e59cf2fbb2805a60dce981359c214e0..2535ab91e6e197d4519f8f6962de7d4eb5e3fb4d 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=193
+VCS_REVISION=194
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index fe8cba1ce1795e3b1d9b548d58db9a0f9a01bfbe..ac2c9946057706813bb2a6ca17022548b36f02e7 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=193
+VCS_REVISION=194
 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 bf9bf67d3672154c1d3ea5a5f6ceb862bdaf5348..cbf4207e655c6c7b433a39ee1dca40878bbb8765 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Markus Gutschke <markus@shellinabox.com>
 Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev,
  zlib1g-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.8.3
 
 Package: shellinabox
 Section: web

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..a028ba0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://code.google.com/p/shellinabox/source/browse/trunk/distributions/debian/shellinabox_([\d\.]+).orig.tar.gz

diff --git a/demo/vt100.js b/demo/vt100.js
index 485ccefa063cb74be6d1363870d317c3537d684c..1fc997bdf5c704f7309a7faf642c101191d9f7e8 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 193)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 194)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 034aef9c22e8dd18b2e664b307da312c6b396247..639ce4d5629918ab40b855c3bce4272e15e9cfb5 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 193)" +
+  alert("Shell In A Box version " + "2.10 (revision 194)" +
         "\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 485ccefa063cb74be6d1363870d317c3537d684c..1fc997bdf5c704f7309a7faf642c101191d9f7e8 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 193)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 194)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };