* 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
This commit is contained in:
parent
8238d7d66f
commit
cc4caca982
12 changed files with 29 additions and 10 deletions
|
@ -4,6 +4,13 @@
|
||||||
sure we at least attempt to keep copyright dates updated whenever we
|
sure we at least attempt to keep copyright dates updated whenever we
|
||||||
make changes.
|
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>
|
2009-11-29 Markus Gutschke <markus@shellinabox.com>
|
||||||
|
|
||||||
* Preparations for packaging ShellInABox in a way that makes it
|
* Preparations for packaging ShellInABox in a way that makes it
|
||||||
|
|
|
@ -55,7 +55,8 @@ EXTRA_DIST = INSTALL.Debian \
|
||||||
debian/shellinabox.init \
|
debian/shellinabox.init \
|
||||||
debian/shellinabox.install \
|
debian/shellinabox.install \
|
||||||
debian/shellinabox.postinst \
|
debian/shellinabox.postinst \
|
||||||
debian/shellinabox.postrm
|
debian/shellinabox.postrm \
|
||||||
|
debian/watch
|
||||||
LIBLOGGING_INCLUDES = logging/logging.h \
|
LIBLOGGING_INCLUDES = logging/logging.h \
|
||||||
config.h
|
config.h
|
||||||
liblogging_la_SOURCES= logging/logging.c \
|
liblogging_la_SOURCES= logging/logging.c \
|
||||||
|
|
|
@ -314,7 +314,8 @@ EXTRA_DIST = INSTALL.Debian \
|
||||||
debian/shellinabox.init \
|
debian/shellinabox.init \
|
||||||
debian/shellinabox.install \
|
debian/shellinabox.install \
|
||||||
debian/shellinabox.postinst \
|
debian/shellinabox.postinst \
|
||||||
debian/shellinabox.postrm
|
debian/shellinabox.postrm \
|
||||||
|
debian/watch
|
||||||
|
|
||||||
LIBLOGGING_INCLUDES = logging/logging.h \
|
LIBLOGGING_INCLUDES = logging/logging.h \
|
||||||
config.h
|
config.h
|
||||||
|
|
10
commit
10
commit
|
@ -65,11 +65,19 @@ debian_package() {
|
||||||
# Reset compatibility level
|
# Reset compatibility level
|
||||||
echo 7 >"${prj}-${ver}/debian/compat"
|
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.
|
# Build Debian packages.
|
||||||
(cd "${prj}-${ver}"
|
(cd "${prj}-${ver}"
|
||||||
fakeroot dpkg-buildpackage -sa -us -uc || :)
|
fakeroot dpkg-buildpackage -sa -us -uc || :)
|
||||||
trap '' EXIT
|
trap '' EXIT
|
||||||
)
|
) || exit 1
|
||||||
|
|
||||||
# Revert any changes that might be pending in distributions/debian/*
|
# Revert any changes that might be pending in distributions/debian/*
|
||||||
local revert="$(svn st |
|
local revert="$(svn st |
|
||||||
|
|
2
config.h
2
config.h
|
@ -138,7 +138,7 @@
|
||||||
#define STDC_HEADERS 1
|
#define STDC_HEADERS 1
|
||||||
|
|
||||||
/* Most recent revision number in the version control system */
|
/* Most recent revision number in the version control system */
|
||||||
#define VCS_REVISION "193"
|
#define VCS_REVISION "194"
|
||||||
|
|
||||||
/* Version number of package */
|
/* Version number of package */
|
||||||
#define VERSION "2.10"
|
#define VERSION "2.10"
|
||||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -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
|
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
|
|
||||||
VCS_REVISION=193
|
VCS_REVISION=194
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
|
|
@ -2,7 +2,7 @@ AC_PREREQ(2.57)
|
||||||
|
|
||||||
dnl This is the one location where the authoritative version number is stored
|
dnl This is the one location where the authoritative version number is stored
|
||||||
AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
|
AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
|
||||||
VCS_REVISION=193
|
VCS_REVISION=194
|
||||||
AC_SUBST(VCS_REVISION)
|
AC_SUBST(VCS_REVISION)
|
||||||
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
|
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
|
||||||
[Most recent revision number in the version control system])
|
[Most recent revision number in the version control system])
|
||||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -4,7 +4,7 @@ Priority: optional
|
||||||
Maintainer: Markus Gutschke <markus@shellinabox.com>
|
Maintainer: Markus Gutschke <markus@shellinabox.com>
|
||||||
Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev,
|
Build-Depends: debhelper (>= 4.0.0), binutils, libssl-dev, libpam0g-dev,
|
||||||
zlib1g-dev
|
zlib1g-dev
|
||||||
Standards-Version: 3.6.1
|
Standards-Version: 3.8.3
|
||||||
|
|
||||||
Package: shellinabox
|
Package: shellinabox
|
||||||
Section: web
|
Section: web
|
||||||
|
|
2
debian/watch
vendored
Normal file
2
debian/watch
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
version=3
|
||||||
|
http://code.google.com/p/shellinabox/source/browse/trunk/distributions/debian/shellinabox_([\d\.]+).orig.tar.gz
|
|
@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
VT100.prototype.about = 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" +
|
"\nCopyright 2008-2009 by Markus Gutschke\n" +
|
||||||
"For more information check http://shellinabox.com");
|
"For more information check http://shellinabox.com");
|
||||||
};
|
};
|
||||||
|
|
|
@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ShellInABox.prototype.about = function() {
|
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" +
|
"\nCopyright 2008-2009 by Markus Gutschke\n" +
|
||||||
"For more information check http://shellinabox.com" +
|
"For more information check http://shellinabox.com" +
|
||||||
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
|
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
|
||||||
|
|
|
@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
VT100.prototype.about = 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" +
|
"\nCopyright 2008-2009 by Markus Gutschke\n" +
|
||||||
"For more information check http://shellinabox.com");
|
"For more information check http://shellinabox.com");
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue