* debian/rules, usr/bin/byobu, usr/bin/byobu-launcher:

- deprecate the launcher script as a separate script; do this
    in /usr/bin/byobu
* debian/control, debian/po/POTFILES.in, debian/po/templates.pot,
  debian/templates, usr/bin/byobu-config:
  - make the new debconf question translatable

debian/changelog

@@ -1,13 +1,17 @@
 byobu (2.52) unreleased; urgency=low
 
-  * debian/rules, usr/bin/byobu, usr/bin/byobu-launcher: deprecate the
+  * debian/rules, usr/bin/byobu, usr/bin/byobu-launcher:
-    launcher script as a separate script; do this in /usr/bin/byobu
+    - deprecate the launcher script as a separate script; do this
+      in /usr/bin/byobu
   * debian/config, debian/postinst, debian/prerm, debian/rules,
     debian/templates, usr/bin/byobu, usr/bin/byobu-launcher,
     usr/bin/byobu-launcher-install, usr/bin/byobu-launcher-uninstall:
     - support a preseedable debconf question that allows
       an administrator to launch byobu by default on all logins on a
       system (default = false), allow for per-user overriding
+  * debian/control, debian/po/POTFILES.in, debian/po/templates.pot,
+    debian/templates, usr/bin/byobu-config:
+    - make the new debconf question translatable
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 03 Feb 2010 10:56:23 -0800
 

debian/control

@@ -9,7 +9,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/byobu/trunk
 
 Package: byobu
 Architecture: all
-Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11)
+Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11), po-debconf
 Recommends: update-notifier-common, lsb-release
 Suggests: apport, vim, w3m
 Provides: screen-profiles, screen-profiles-extras, byobu-extras

debian/po/POTFILES.in

@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates

debian/po/templates.pot

@@ -0,0 +1,41 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: byobu@packages.debian.org\n"
+"POT-Creation-Date: 2010-02-05 00:55-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Do you want to launch Byobu at shell login for all users?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Byobu can launch automatically at login (e.g. console, ssh), providing an "
+"attachable/detachable window manager on the command line."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If you select this option, Byobu will install a symlink in /etc/profile.d. "
+"This setting is system-wide, for all users logging into the system. "
+"Individual users can disable this by touching ~/.byobu/disable-autolaunch, "
+"or configuring with 'byobu-config'."
+msgstr ""

debian/templates

@@ -1,11 +1,11 @@
 Template: byobu/launch-by-default
 Type: boolean
 Default: false
-Description: Do you want to launch Byobu at shell login for all users?
+_Description: Do you want to launch Byobu at shell login for all users?
  Byobu can launch automatically at login (e.g. console, ssh), providing
  an attachable/detachable window manager on the command line.
  .
  If you select this option, Byobu will install a symlink in /etc/profile.d.
  This setting is system-wide, for all users logging into the system.
- .
+ Individual users can disable this by touching ~/.byobu/disable-autolaunch,
- Individual users can disable this by touching ~/.byobu/disable-autolaunch.
+ or configuring with 'byobu-config'.

usr/bin/byobu-config

@@ -496,6 +496,16 @@ def chgesc(screen, size):
             return 0
     return 100
 
+def autolaunch():
+    if os.path.exists("%s/.%s/disable-autolaunch" % (HOME, PKG)):
+	return 0
+    if commands.getoutput('grep -qs byobu-launcher %s/.profile' % HOME):
+	return 1
+    if os.path.exists("/etc/profile.d/%s.sh" % PKG):
+	return 1
+    return 0
+
+
 def main():
     """This is the main loop of our utility
     """
@@ -507,7 +517,7 @@ def main():
 
     config = SafeConfigParser()
 
-    isInstalled = (commands.getoutput('grep byobu-launcher '+(HOME+'/.profile')) != "")
+    isInstalled = autolaunch()
 
     tag = 100