Cleanup of debian control file before 2.11.

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()

debian/README.source

@@ -1,12 +1,3 @@
-The upstream source for shellinabox is archived in googlecode SVN
+The upstream source for shellinabox is archived in googlecode GIT
-repository, <http://shellinabox.googlecode.com/svn/trunk>.  Some
+repository, <http://code.google.com/p/shellinabox/>.  The package is
-patches were made by users before this package was prepared for the
+being maintained as a native Debian package.
-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,
-<git://github.com/beewoolie/shellinabox.git>.  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.

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 <elf@debian.org>  Sat, 24 Mar 2012 13:59:33 -0700
+ -- Marc Singer <elf@debian.org>  Sat, 31 Mar 2012 16:33:31 -0700
-
-shellinabox (2.10-1) unstable; urgency=low
-
-  * New upstream release, version 2.10.
-
- -- Markus Gutschke <markus@shellinabox.com>  Sat, 21 Nov 2009 14:42:03 -0800
-
-shellinabox (2.9-1) unstable; urgency=low
-
-  * New upstream release, version 2.9.
-
- -- Markus Gutschke <markus@shellinabox.com>  Sun, 05 Jul 2009 21:08:47 -0800
-
-shellinabox (2.8-1) unstable; urgency=low
-
-  * New upstream release, version 2.8.
-
- -- Markus Gutschke <markus@shellinabox.com>  Sat, 23 May 2009 11:53:13 -0800
-
-shellinabox (2.7-1) unstable; urgency=low
-
-  * New upstream release, version 2.7.
-
- -- Markus Gutschke <markus@shellinabox.com>  Mon, 27 Apr 2009 09:43:58 -0800
-
-shellinabox (2.6-1) unstable; urgency=low
-
-  * New upstream release, version 2.6.
-
- -- Markus Gutschke <markus@shellinabox.com>  Sun, 12 Apr 2009 10:16:31 -0800
-
-shellinabox (2.5-1) unstable; urgency=low
-
-  * New upstream release, version 2.5.
-
- -- Markus Gutschke <markus@shellinabox.com>  Sat, 21 Mar 2009 08:31:52 -0800
-
-shellinabox (2.4-1) unstable; urgency=low
-
-  * New upstream release, version 2.4.
-
- -- Markus Gutschke <markus@shellinabox.com>  Thu, 12 Feb 2009 17:52:14 -0800
-
-shellinabox (2.3-1) unstable; urgency=low
-
-  * New upstream release, version 2.3.
-
- -- Markus Gutschke <markus@shellinabox.com>  Wed, 21 Jan 2009 18:39:25 -0800
-
-shellinabox (2.2-1) unstable; urgency=low
-
-  * New upstream release, version 2.2.
-
- -- Markus Gutschke <markus@shellinabox.com>  Wed, 21 Jan 2009 16:32:17 -0800
-
-shellinabox (2.1-1) unstable; urgency=low
-
-  * New upstream release, version 2.1.
-
- -- Markus Gutschke <markus@shellinabox.com>  Thu,  8 Jan 2009 18:47:08 -0800
-
-shellinabox (2.0-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Markus Gutschke <markus@shellinabox.com>  Sat, 27 Dec 2008 09:15:32 -0800

debian/control

@@ -1,17 +1,18 @@
 Source: shellinabox
 Section: web
 Priority: optional
-Maintainer: Marc Singer <elf@buici.com>
+Maintainer: Marc Singer <elf@debian.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, binutils, libssl-dev, libpam0g-dev,
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, binutils,
- zlib1g-dev
+ libssl-dev, libpam0g-dev, zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://shelinabox.com
-Vcs-Git: git://github.com/beewoolie/shellinabox.git
+Vcs-Git: https://code.google.com/p/shellinabox/
-Vcs-Browser: https://github.com/beewoolie/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

debian/source/options

@@ -1 +1 @@
-single-debian-patch
+

debian/source/patch-header

@@ -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 <git://github.com/beewoolie/shellinabox.git>
-holds the development repository.

debian/watch

@@ -1,3 +1,2 @@
 version=3
-http://shellinabox.googlecode.com/svn/trunk/distributions/debian/shellinabox_([\d\.]+).orig.tar.gz
+https://code.google.com/p/shellinabox/downloads/detail?name=shellinabox-(.+).tar.gz
-http://githubredir.debian.net/github/beewoolie/shellinabox (.+).tar.gz