From da7c1b5ec1000517b24304c00dd8e915fe6bc6f6 Mon Sep 17 00:00:00 2001 From: Marc Singer Date: Sat, 31 Mar 2012 16:35:15 -0700 Subject: [PATCH] Cleanup of debian control file before 2.11. --- contrib/siab.rb | 10 +++--- debian/README.source | 15 ++------ debian/changelog | 74 +++----------------------------------- debian/control | 13 +++---- debian/source/options | 2 +- debian/source/patch-header | 4 --- debian/watch | 3 +- 7 files changed, 21 insertions(+), 100 deletions(-) delete mode 100644 debian/source/patch-header diff --git a/contrib/siab.rb b/contrib/siab.rb index fcacdda..fedb397 100644 --- a/contrib/siab.rb +++ b/contrib/siab.rb @@ -5,7 +5,7 @@ # # USAGE: ruby siab.rb [start|stop|restar|help] # -# DESCRIPTION: a ShellInAbox control script and configuration system reader. +# DESCRIPTION: a ShellInAbox control script and configuration system reader. # To auto-configure a shellinabox service create a conf directory # in the shellinabox home dir. The URL will be the name of the file(s) # that reside in conf, and the command will be the contents of the file. @@ -14,7 +14,7 @@ # conf/nethack contents : /usr/games/nethack # # Change the value of @siab_home to where you install shellinabox -# OPTIONS: none +# OPTIONS: none # REQUIREMENTS: ruby # BUGS: --- # NOTES: --- @@ -44,7 +44,7 @@ end def start command_line = "" @urls.each_pair do |k,v| - command_line = command_line + "-s " + "/#{k}:root:root:/:'#{v}' " + command_line = command_line + "-s " + "/#{k}:root:root:/:'#{v}' " end exec("#{@siab_home}/bin/shellinaboxd --background='#{@siab_home}/siab.pid' -c /tmp #{command_line}") if fork.nil? end @@ -70,7 +70,7 @@ end def get_args() case ARGV.size - when 0 + when 0 read_configuration restart() when 1 @@ -93,5 +93,5 @@ def get_args() end end -#Main +#Main get_args() diff --git a/debian/README.source b/debian/README.source index c4c9596..52ab12f 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,12 +1,3 @@ -The upstream source for shellinabox is archived in googlecode SVN -repository, . Some -patches were made by users before this package was prepared for the -Debian archive. Those patches as well as some of the unreleased -changes made by the author are included in a single patch file. -dpkg-source -x should prepare a patched directory for building. - -The working Debian repository for shellinabox is archived in github, -. Upgrading the upstream -sources may be accomplished by looking for the upstream tag in the -repository, pulling back the changes since then, and reapplying those -changes to updated archive. +The upstream source for shellinabox is archived in googlecode GIT +repository, . The package is +being maintained as a native Debian package. diff --git a/debian/changelog b/debian/changelog index 4a62472..04652e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,73 +1,7 @@ -shellinabox (2.10-2) unstable; urgency=low +shellinabox (2.11-1) unstable; urgency=low - * NMU: this would be an NMU, but the package has never been added to - the archive. * First release into archive. (Closes: #535905.) + * Applied patches from the issues database. + * Rolled major revision so that the tarball is complete. - -- Marc Singer Sat, 24 Mar 2012 13:59:33 -0700 - -shellinabox (2.10-1) unstable; urgency=low - - * New upstream release, version 2.10. - - -- Markus Gutschke Sat, 21 Nov 2009 14:42:03 -0800 - -shellinabox (2.9-1) unstable; urgency=low - - * New upstream release, version 2.9. - - -- Markus Gutschke Sun, 05 Jul 2009 21:08:47 -0800 - -shellinabox (2.8-1) unstable; urgency=low - - * New upstream release, version 2.8. - - -- Markus Gutschke Sat, 23 May 2009 11:53:13 -0800 - -shellinabox (2.7-1) unstable; urgency=low - - * New upstream release, version 2.7. - - -- Markus Gutschke Mon, 27 Apr 2009 09:43:58 -0800 - -shellinabox (2.6-1) unstable; urgency=low - - * New upstream release, version 2.6. - - -- Markus Gutschke Sun, 12 Apr 2009 10:16:31 -0800 - -shellinabox (2.5-1) unstable; urgency=low - - * New upstream release, version 2.5. - - -- Markus Gutschke Sat, 21 Mar 2009 08:31:52 -0800 - -shellinabox (2.4-1) unstable; urgency=low - - * New upstream release, version 2.4. - - -- Markus Gutschke Thu, 12 Feb 2009 17:52:14 -0800 - -shellinabox (2.3-1) unstable; urgency=low - - * New upstream release, version 2.3. - - -- Markus Gutschke Wed, 21 Jan 2009 18:39:25 -0800 - -shellinabox (2.2-1) unstable; urgency=low - - * New upstream release, version 2.2. - - -- Markus Gutschke Wed, 21 Jan 2009 16:32:17 -0800 - -shellinabox (2.1-1) unstable; urgency=low - - * New upstream release, version 2.1. - - -- Markus Gutschke Thu, 8 Jan 2009 18:47:08 -0800 - -shellinabox (2.0-1) unstable; urgency=low - - * Initial release. - - -- Markus Gutschke Sat, 27 Dec 2008 09:15:32 -0800 + -- Marc Singer Sat, 31 Mar 2012 16:33:31 -0700 diff --git a/debian/control b/debian/control index 590845c..07d0232 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,18 @@ Source: shellinabox Section: web Priority: optional -Maintainer: Marc Singer -Build-Depends: debhelper (>= 8.0.0), autotools-dev, binutils, libssl-dev, libpam0g-dev, - zlib1g-dev +Maintainer: Marc Singer +Build-Depends: debhelper (>= 8.0.0), autotools-dev, binutils, + libssl-dev, libpam0g-dev, zlib1g-dev Standards-Version: 3.9.2 Homepage: http://shelinabox.com -Vcs-Git: git://github.com/beewoolie/shellinabox.git -Vcs-Browser: https://github.com/beewoolie/shellinabox +Vcs-Git: https://code.google.com/p/shellinabox/ +Vcs-Browser: https://code.google.com/p/shellinabox/source/browse/ Package: shellinabox Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libssl0.9.8 (>= 0.9.8m-1), adduser, lsb-base +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-bbase, + libssl0.9.8 (>= 0.9.8m-1) Suggests: libpam0g, openssl Description: publish command line shell through AJAX interface Shellinabox can export arbitrary command line programs to any JavaScript diff --git a/debian/source/options b/debian/source/options index 7423a2d..8b13789 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1 @@ -single-debian-patch + diff --git a/debian/source/patch-header b/debian/source/patch-header deleted file mode 100644 index e187fbd..0000000 --- a/debian/source/patch-header +++ /dev/null @@ -1,4 +0,0 @@ -While we wait for the (git) format to become supported the Debian -patch for this package includes changes to the source tree to fix -bugs. The repository -holds the development repository. diff --git a/debian/watch b/debian/watch index 850d454..cb7fa73 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ version=3 -http://shellinabox.googlecode.com/svn/trunk/distributions/debian/shellinabox_([\d\.]+).orig.tar.gz -http://githubredir.debian.net/github/beewoolie/shellinabox (.+).tar.gz \ No newline at end of file +https://code.google.com/p/shellinabox/downloads/detail?name=shellinabox-(.+).tar.gz