Merge lp:~cameronnemo/capnet-assist/various-fixups into lp:~elementary-apps/capnet-assist/trunk

[Cameron Norman]

Mainly improves logging and packaging. See the individual commit descriptions for more details. I find it easier to review commit by commit (there are four) than all at once.

[Cody Garver (codygarver)]

I think network-manager belongs in Depends instead of Recommends, isn't it a critical dependency?

[Cameron Norman (cameronnemo)]

We can install without it. The captive-login binary still works. It is
just that the NM script is never run. If we ever support other wifi
daemons, we can just change it then I guess.

So your call, you think we should make it a Depends?

[Cody Garver (codygarver)]

Yeah move it to Depends.

Also why did you disable xz compression? (BTW "Pre-Depends: dpkg (>= 1.15.6)" line is exclusively there because it's xz package compression dependency.

[Cameron Norman (cameronnemo)]

xz compression is default since dpkg 1.17

Do you still want to force it on older stuff or just use the default?

[Cody Garver (codygarver)]

Oh cool, I didn't know that.

Remove the Pre-Depends line too then.

[lp:~cameronnemo/capnet-assist/various-fixups]

23. By Cameron Norman on 2015-04-15

Remove versioned dpkg PreDepends (xz is default now), switch network-manager to depends

[Cameron Norman (cameronnemo)]

Pushed both changes.

[Cody Garver (codygarver)]

I merged these changes excluding r21 (licensing changes) because I am not sure how elementary LLC. is supposed to be attributed

review: Approve

=== modified file '90captive_portal_test'
--- 90captive_portal_test	2015-03-03 18:28:28 +0000
+++ 90captive_portal_test	2015-04-15 02:41:11 +0000
@@ -24,26 +24,26 @@
     local user="$1"
     wait_for_process nm-applet
     $logger "Running browser as '$user' to login in captive portal"
-    su "$user" -s /bin/sh -c "captive-login 2>/dev/null || sensible-browser start.elementaryos.org 2>/dev/null"
+    su "$user" -s /bin/sh -c "captive-login 2>/dev/null"
 }
 
 # Run the right scripts
 case "$2" in
     up|vpn-up)
-    $logger "DetectCaptivePortal script triggered"
+    $logger -p user.debug "DetectCaptivePortal script triggered"
 
     # assume the DISPLAY where to show the browser
     if [ -z $DISPLAY ];then
         export DISPLAY=':0'
     fi
 
-    $logger "Display set"
+    $logger -p user.debug "Display set as: $DISPLAY"
 
     #get the usernames
     users=$(who | grep "$DISPLAY" | awk '{print $1}')
 
     for u in $users; do
-        start_browser $u || :
+        start_browser $u || $logger -p user.err "captive-login browser failed for user: $u"
     done
     ;;
     *)

=== modified file 'AUTHORS'
--- AUTHORS	2013-08-22 15:09:15 +0000
+++ AUTHORS	2015-04-15 02:41:11 +0000
@@ -1,6 +1,6 @@
-Sergio Spinatelli <[e-mail]>
-
-Copyright 2013 Sergio Spinatelli
+Copyright 2013 Sergio Spinatelli <[e-mail]>
+          2015 Daniel Foré <[e-mail]>
+          2015 Cameron Norman <[e-mail]>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

=== modified file 'README'
--- README	2013-08-22 15:06:17 +0000
+++ README	2015-04-15 02:41:11 +0000
@@ -2,3 +2,5 @@
 ===
 
 A small WebKit app only to make a user log in when a captive portal is detected.
+
+Set the environment variable G_MESSAGES_DEBUG to "all" to have the captive-login binary print debug messages.

=== modified file 'debian/control'
--- debian/control	2015-03-04 23:49:03 +0000
+++ debian/control	2015-04-15 02:41:11 +0000
@@ -8,13 +8,14 @@
                libwebkitgtk-3.0-dev,
                libgtk-3-dev,
                valac (>= 0.18)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 Homepage: https://launchpad.net/capnet-assist
+Vcs-Bzr: https://code.launchpad.net/capnet-assist
+Vcs-Browser: http://bazaar.launchpad.net/~elementary-apps/capnet-assist/trunk/files
 
 Package: capnet-assist
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: dpkg (>= 1.15.6)
+Depends: ${misc:Depends}, ${shlibs:Depends}, network-manager
 Description: Captive login detector (debugging symbols)
  A small WebKit app only to make a user log in when a
  captive portal is detected.

=== modified file 'debian/copyright'
--- debian/copyright	2013-08-22 15:09:15 +0000
+++ debian/copyright	2015-04-15 02:41:11 +0000
@@ -1,39 +1,31 @@
-This work was packaged for Debian by:
-
-    Cody Garver <[e-mail]> on Thu, 22 Aug 2013
-
-It was downloaded from:
-
-    https://launchpad.net/capnet-assist
-
-Upstream Author(s):
-
-    Sergio Spinatelli <[e-mail]>
-
-Copyright:
-
-    Copyright (C) 2013 Sergio Spinatelli
-
-License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-The Debian packaging is:
-
-    Copyright (C) 2013 Cody Garver <[e-mail]>
-
-and is licensed under the GPL version 3, see above.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: capnet-assist
+Source: https://launchpad.net/capnet-assist
+
+Files: *
+Copyright: 2013 Sergio Spinatelli <[e-mail]>
+           2015 Daniel Foré <[e-mail]>
+           2015 Cameron Norman <[e-mail]>
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2013-2015 Cody Garver <[e-mail]>
+           2015 Cameron Norman <[e-mail]>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in `/usr/share/common-licenses/GPL-3'.

=== modified file 'debian/rules'
--- debian/rules	2013-08-22 15:06:17 +0000
+++ debian/rules	2015-04-15 02:41:11 +0000
@@ -12,9 +12,6 @@
 %:
 	dh $@ 
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
 override_dh_strip:
 	dh_strip --dbg-package=capnet-assist-dbg
 

=== modified file 'src/CaptiveLogin.vala'
--- src/CaptiveLogin.vala	2015-03-04 20:53:40 +0000
+++ src/CaptiveLogin.vala	2015-04-15 02:41:11 +0000
@@ -1,20 +1,24 @@
 /***
-    BEGIN LICENSE
-
-    Copyright (C) 2015 elementary LLC.
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>
-
-    END LICENSE
+  BEGIN LICENSE
+
+  Copyright (C) 2013 Sergio Spinatelli <[e-mail]>
+                2015 Daniel Foré <[e-mail]>
+                2015 Cameron Norman <[e-mail]>
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as
+  published by the Free Software Foundation; either version 3 of the License,
+  or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses>
+
+  END LICENSE
 ***/
 
 public class ValaBrowser : Gtk.Window {
@@ -47,20 +51,20 @@
         scrolled_window.add (this.web_view);
         var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
         vbox.set_homogeneous (false);
-        vbox.pack_start (scrolled_window,true,true,0);
+        vbox.pack_start (scrolled_window, true, true, 0);
         add (vbox);
     }
     
     public bool isLoggedIn () {
         var page = "http://clients3.google.com/generate_204";
-        stdout.printf ("Getting 204 page\n");
+        debug ("Getting 204 page");
 
         var session = new Soup.Session ();
         var message = new Soup.Message ("GET", page);
 
         session.send_message (message);
 
-        stdout.printf ("Return code: %u\n",message.status_code);
+        debug ("Return code: %u", message.status_code);
         return message.status_code == 204;
     }
 
@@ -73,11 +77,11 @@
         
         this.web_view.document_load_finished.connect ( (frame) => {
             if (isLoggedIn ()) {
-                stdout.printf ("Logged in!\n");
+                debug ("Logged in!");
                 Gtk.main_quit ();
-            } else
-                stdout.printf ("Still not logged in.\n");
-            stdout.flush ();
+            } else {
+                debug ("Still not logged in.");
+            }
         });
     }
     
@@ -91,12 +95,12 @@
 
         var browser = new ValaBrowser ();
         
-        if (!browser.isLoggedIn ()){
-            stdout.printf ("Opening browser to login\n");
+        if (!browser.isLoggedIn ()) {
+            debug ("Opening browser to login");
             browser.start ();
             Gtk.main ();
         } else {
-            stdout.printf ("Already logged in and connected, shutting down.\n");
+            debug ("Already logged in and connected, shutting down.");
         }
 
         return 0;