debian/0000755000000000000000000000000012143457210007165 5ustar debian/network-manager-iodine.install0000644000000000000000000000005512143457061015127 0ustar etc usr/lib/NetworkManager/nm-iodine-service debian/compat0000644000000000000000000000000212143457061010367 0ustar 8 debian/patches/0000755000000000000000000000000012143457120010614 5ustar debian/patches/0002-Switch-from-GtkTable-to-GtkGrid.patch0000644000000000000000000001343512143457120020070 0ustar From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Sat, 11 May 2013 16:37:48 +0200 Subject: Switch from GtkTable to GtkGrid since gtk_table_attach_defaults is deprecated. --- auth-dialog/vpn-password-dialog.c | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/auth-dialog/vpn-password-dialog.c b/auth-dialog/vpn-password-dialog.c index 28ce19b..79af9f7 100644 --- a/auth-dialog/vpn-password-dialog.c +++ b/auth-dialog/vpn-password-dialog.c @@ -43,8 +43,8 @@ typedef struct { GtkWidget *password_entry; GtkWidget *show_passwords_checkbox; - GtkWidget *table_alignment; - GtkWidget *table; + GtkWidget *grid_alignment; + GtkWidget *grid; GtkSizeGroup *group; char *primary_password_label; @@ -108,44 +108,44 @@ dialog_close_callback (GtkWidget *widget, gpointer callback_data) } static void -add_row (GtkWidget *table, int row, const char *label_text, GtkWidget *entry) +add_row (GtkWidget *grid, int row, const char *label_text, GtkWidget *entry) { GtkWidget *label; label = gtk_label_new_with_mnemonic (label_text); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1); - gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1); + gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry); } static void -remove_child (GtkWidget *child, GtkWidget *table) +remove_child (GtkWidget *child, GtkWidget *grid) { - gtk_container_remove (GTK_CONTAINER (table), child); + gtk_container_remove (GTK_CONTAINER (grid), child); } static void -add_table_rows (VpnPasswordDialog *dialog) +add_grid_rows (VpnPasswordDialog *dialog) { VpnPasswordDialogPrivate *priv = VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog); - int row; + int row = 0; int offset = 0; - gtk_alignment_set_padding (GTK_ALIGNMENT (priv->table_alignment), 0, 0, offset, 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (priv->grid_alignment), 0, 0, offset, 0); /* This will not kill the entries, since they are ref:ed */ - gtk_container_foreach (GTK_CONTAINER (priv->table), (GtkCallback) remove_child, priv->table); + gtk_container_foreach (GTK_CONTAINER (priv->grid), (GtkCallback) remove_child, priv->grid); - row = 0; if (priv->show_password) - add_row (priv->table, row++, priv->primary_password_label, priv->password_entry); + add_row (priv->grid, row++, priv->primary_password_label, priv->password_entry); - gtk_table_attach_defaults (GTK_TABLE (priv->table), priv->show_passwords_checkbox, 1, 2, row, row + 1); - - gtk_widget_show_all (priv->table); + gtk_grid_attach (GTK_GRID (priv->grid), + priv->show_passwords_checkbox, + 1, 2, 1, 1); + gtk_widget_show_all (priv->grid); } static void @@ -208,21 +208,21 @@ vpn_password_dialog_new (const char *title, G_CALLBACK (dialog_close_callback), dialog); - /* The table that holds the captions */ - priv->table_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); + /* The grid that holds the captions */ + priv->grid_alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - priv->table = gtk_table_new (4, 2, FALSE); - gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12); - gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6); - gtk_container_add (GTK_CONTAINER (priv->table_alignment), priv->table); + priv->grid = gtk_grid_new (); + gtk_grid_set_column_spacing (GTK_GRID (priv->grid), 12); + gtk_grid_set_row_spacing (GTK_GRID (priv->grid), 6); + gtk_container_add (GTK_CONTAINER (priv->grid_alignment), priv->grid); priv->password_entry = gtk_entry_new (); priv->show_passwords_checkbox = gtk_check_button_new_with_mnemonic (_("Sh_ow passwords")); - /* We want to hold on to these during the table rearrangement */ + /* We want to hold on to these during the grid rearrangement */ g_object_ref_sink (priv->password_entry); g_object_ref_sink (priv->show_passwords_checkbox); @@ -236,7 +236,7 @@ vpn_password_dialog_new (const char *title, G_CALLBACK (show_passwords_toggled_cb), dialog); - add_table_rows (VPN_PASSWORD_DIALOG (dialog)); + add_grid_rows (VPN_PASSWORD_DIALOG (dialog)); /* Adds some eye-candy to the dialog */ #if GTK_CHECK_VERSION (3,1,6) @@ -263,7 +263,7 @@ vpn_password_dialog_new (const char *title, gtk_label_set_max_width_chars (message_label, 35); gtk_size_group_add_widget (priv->group, GTK_WIDGET (message_label)); gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label), FALSE, FALSE, 0); - gtk_size_group_add_widget (priv->group, priv->table_alignment); + gtk_size_group_add_widget (priv->group, priv->grid_alignment); } #if GTK_CHECK_VERSION (3,1,6) @@ -272,7 +272,7 @@ vpn_password_dialog_new (const char *title, vbox = gtk_vbox_new (FALSE, 6); #endif gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), priv->table_alignment, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), priv->grid_alignment, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); gtk_box_pack_start (content, hbox, FALSE, FALSE, 0); gtk_widget_show_all (GTK_WIDGET (content)); @@ -321,7 +321,7 @@ vpn_password_dialog_set_show_password (VpnPasswordDialog *dialog, gboolean show) show = !!show; if (priv->show_password != show) { priv->show_password = show; - add_table_rows (dialog); + add_grid_rows (dialog); } } @@ -363,6 +363,6 @@ void vpn_password_dialog_set_password_label (VpnPasswordDialog *dialog, priv->primary_password_label = g_strdup (label); if (priv->show_password) - add_table_rows (dialog); + add_grid_rows (dialog); } debian/patches/series0000644000000000000000000000013712143457120012032 0ustar 0001-Don-t-invoke-g_type_init-for-recent-glib.patch 0002-Switch-from-GtkTable-to-GtkGrid.patch debian/patches/0001-Don-t-invoke-g_type_init-for-recent-glib.patch0000644000000000000000000000123612143457120021754 0ustar From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 10 May 2013 16:42:36 +0200 Subject: Don't invoke g_type_init for recent glib Since it it's not needed and causes a deprecation warning. Debian-Bug: #707469 --- src/nm-iodine-service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nm-iodine-service.c b/src/nm-iodine-service.c index b55ca2d..c99c384 100644 --- a/src/nm-iodine-service.c +++ b/src/nm-iodine-service.c @@ -687,7 +687,9 @@ int main (int argc, char *argv[]) NMIODINEPlugin *plugin; GMainLoop *main_loop; +#if !GLIB_CHECK_VERSION(2,36,0) g_type_init (); +#endif plugin = nm_iodine_plugin_new (); if (!plugin) debian/rules0000755000000000000000000000044212143457061010251 0ustar #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk %: dh $@ override_dh_auto_configure: ./autogen.sh dh_auto_configure -- \ --libexecdir=/usr/lib/NetworkManager \ --disable-static override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/NetworkManager/ debian/copyright0000644000000000000000000000415012143457061011124 0ustar This package was debianized by Guido Günther on Fri, 08 Feb 2012 20:42:50 +0100 It was downloaded from http://honk.sigxcpu.org/projects/network-manager-iodine auth-dialog/vpn-password-dialog.[ch] Copyright: Copyright (C) 1999, 2000 Eazel, Inc. Copyright (C) 2005, Red Hat, Inc. License: The Gnome Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. The Gnome Library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with the Gnome Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/LGPL-2'. All other files are licensed as following Copyright: Copyright © 2012 Guido Günther 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 2 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, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/changelog0000644000000000000000000000203312143457205011041 0ustar network-manager-iodine (0.0.4-2) unstable; urgency=low * [3bd8d8c] Avoid deprecation warnings on newer glib/gtk. (Closes: #707469) -- Guido Günther Sat, 11 May 2013 17:06:45 +0200 network-manager-iodine (0.0.4-1) unstable; urgency=low * [aac1905] New upstream version 0.0.4 * [db08d93] Remove all patches applied upstream -- Guido Günther Tue, 25 Dec 2012 13:39:39 +0100 network-manager-iodine (0.0.3-1) unstable; urgency=low * New upstream version * Upload to unstable * [1b0175f] Check password write result -- Guido Günther Tue, 27 Mar 2012 22:25:25 +0200 network-manager-iodine (0.0.2-1) experimental; urgency=low * New upstream version * [f0b6fa0] Update VCS fields * [87f56f6] Fix homepage URL (Closes: #660351) -- Guido Günther Sun, 19 Feb 2012 19:31:22 +0100 network-manager-iodine (0.0.1-1) experimental; urgency=low * Initial Release (Closes: #660019) -- Guido Günther Wed, 08 Feb 2012 13:33:27 +0100 debian/gbp.conf0000644000000000000000000000013212143457061010604 0ustar [DEFAULT] debian-branch = debian/sid upstream-tag = v%(version)s upstream-branch = master debian/network-manager-iodine.postinst0000644000000000000000000000100712143457061015342 0ustar #!/bin/sh set -e case "$1" in configure) if [ -x "/etc/init.d/dbus" ]; then if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d dbus force-reload || true else /etc/init.d/dbus force-reload || true fi fi if ! getent passwd nm-iodine >/dev/null; then adduser --quiet \ --system \ --quiet \ --disabled-login \ --disabled-password \ --home /var/run/iodine \ --no-create-home \ -gecos "Network Manager iodine" \ nm-iodine fi ;; esac #DEBHELPER# exit 0 debian/network-manager-iodine-gnome.install0000644000000000000000000000015112143457061016227 0ustar usr/lib/NetworkManager/*.so* usr/lib/NetworkManager/nm-iodine-auth-dialog usr/share/gnome-vpn-properties debian/network-manager-iodine.postrm0000644000000000000000000000202712143457061015006 0ustar #!/bin/sh # postrm script for #PACKAGE# # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `remove' # * `purge' # * `upgrade' # * `failed-upgrade' # * `abort-install' # * `abort-install' # * `abort-upgrade' # * `disappear' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in purge) if getent passwd nm-iodine >/dev/null; then deluser nm-iodine || true fi ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/control0000644000000000000000000000334312143457061010577 0ustar Source: network-manager-iodine Section: net Priority: optional Maintainer: Guido Günther Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), network-manager-dev (>= 0.9.2), libnm-util-dev (>= 0.9.2), libnm-glib-dev (>= 0.9.2), libnm-glib-vpn-dev (>= 0.9.2), intltool, libdbus-glib-1-dev (>= 0.74), libgnome-keyring-dev, libgtk-3-dev (>= 3.0), libglib2.0-dev, autoconf, automake, libtool Standards-Version: 3.9.2 Vcs-Git: git://git.gnome.org/network-manager-iodine Vcs-Browser: http://git.gnome.org/browse/network-manager-iodine Homepage: https://honk.sigxcpu.org/piki/projects/network-manager-iodine Package: network-manager-iodine Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, iodine, adduser Description: network management framework (iodine plugin core) NetworkManager is a system network service that manages your network devices and connections, attempting to keep active network connectivity when available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and provides VPN integration with a variety of different VPN services. . This package provides a VPN plugin for iodine. Package: network-manager-iodine-gnome Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager-iodine (= ${binary:Version}) Description: network management framework (iodine plugin GNOME GUI) NetworkManager is a system network service that manages your network devices and connections, attempting to keep active network connectivity when available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and provides VPN integration with a variety of different VPN services. . This package provides the GNOME bits of NetworkManager's iodine plugin. debian/source/0000755000000000000000000000000012143457061010471 5ustar debian/source/format0000644000000000000000000000001412143457061011677 0ustar 3.0 (quilt)