From cc4caca98229e5598c15f6fbe2b742ff66233d2a Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Wed, 2 Dec 2009 04:32:09 +0000 Subject: [PATCH] * 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. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@194 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- ChangeLog | 7 +++++++ Makefile.am | 3 ++- Makefile.in | 3 ++- commit | 10 +++++++++- config.h | 2 +- configure | 2 +- configure.ac | 2 +- debian/control | 2 +- debian/watch | 2 ++ demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 2 +- 12 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 debian/watch diff --git a/ChangeLog b/ChangeLog index 6d804f3..97773d0 100644 --- 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 * Preparations for packaging ShellInABox in a way that makes it diff --git a/Makefile.am b/Makefile.am index 6e07553..0cb1307 100644 --- 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 d345066..f63e861 100644 --- 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 0ea8684..5c0a285 100755 --- 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 e627a2d..076d9f3 100644 --- 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 ebf45ad..2535ab9 100755 --- 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 fe8cba1..ac2c994 100644 --- 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 bf9bf67..cbf4207 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Markus Gutschke 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 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 485ccef..1fc997b 100644 --- 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 034aef9..639ce4d 100644 --- 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 485ccef..1fc997b 100644 --- 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"); };