Browse Source

Switch to source format "3.0 (quilt)"

Axel Beckert 11 years ago
parent
commit
313bcffdd2

+ 1 - 0
debian/changelog

@@ -1,6 +1,7 @@
 mssh (1.2-3) UNRELEASED; urgency=low
 
   * Fix lintian warning debian-rules-missing-recommended-target
+  * Switch to source format "3.0 (quilt)"
 
  -- Axel Beckert <[email protected]>  Tue, 01 Jan 2013 16:00:00 +0100
 

+ 39 - 0
debian/patches/fix-ftbfs-vte_terminal_fork_command-is-deprecated.patch

@@ -0,0 +1,39 @@
+Description: Fix FTBFS due to vte_terminal_fork_command being deprecated
+  Fix "FTBFS: mssh-terminal.c:49:5: error: 'vte_terminal_fork_command'
+  is deprecated (declared at /usr/include/vte-0.0/vte/vtedeprecated.h:82)
+  [-Werror=deprecated-declarations]"
+Author: Michael Vogt <[email protected]>
+Origin: Ubuntu, https://launchpadlibrarian.net/79958381/mssh_1.2-1_1.2-1ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/634426
+Bug-Ubuntu: https://launchpad.net/bugs/756105
+Reviewed-By: gregor herrmann <[email protected]>
+Last-Update: 2011-11-02
+
+--- mssh-1.2.orig/src/mssh-terminal.c
++++ mssh-1.2/src/mssh-terminal.c
+@@ -40,14 +40,23 @@ void mssh_terminal_init_session(MSSHTerm
+ 
+ void mssh_terminal_start_session(MSSHTerminal *terminal, char **env)
+ {
++    GError *error = NULL;
+     char *args[3];
+ 
+     args[0] = strdup("ssh");
+     args[1] = terminal->hostname;
+     args[2] = NULL;
+ 
+-    vte_terminal_fork_command(VTE_TERMINAL(terminal), "ssh", args,
+-        env, NULL, FALSE, FALSE, FALSE);
++    vte_terminal_fork_command_full(VTE_TERMINAL(terminal), 
++                                   VTE_PTY_NO_LASTLOG|VTE_PTY_NO_UTMP|VTE_PTY_NO_WTMP,
++                                   NULL,  /* working dir */
++                                   args,
++                                   env, 
++                                   G_SPAWN_SEARCH_PATH,
++                                   NULL,  /* child_setup */
++                                   NULL,  /* child_setup_data */
++                                   NULL,  /* *child_pid */
++                                   &error);
+ 
+     free(args[0]);
+ }

+ 1 - 0
debian/patches/series

@@ -0,0 +1 @@
+fix-ftbfs-vte_terminal_fork_command-is-deprecated.patch

+ 1 - 0
debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

+ 2 - 11
src/mssh-terminal.c

@@ -40,23 +40,14 @@ void mssh_terminal_init_session(MSSHTerminal *terminal, char *hostname)
 
 void mssh_terminal_start_session(MSSHTerminal *terminal, char **env)
 {
-    GError *error = NULL;
     char *args[3];
 
     args[0] = strdup("ssh");
     args[1] = terminal->hostname;
     args[2] = NULL;
 
-    vte_terminal_fork_command_full(VTE_TERMINAL(terminal), 
-                                   VTE_PTY_NO_LASTLOG|VTE_PTY_NO_UTMP|VTE_PTY_NO_WTMP,
-                                   NULL,  /* working dir */
-                                   args,
-                                   env, 
-                                   G_SPAWN_SEARCH_PATH,
-                                   NULL,  /* child_setup */
-                                   NULL,  /* child_setup_data */
-                                   NULL,  /* *child_pid */
-                                   &error);
+    vte_terminal_fork_command(VTE_TERMINAL(terminal), "ssh", args,
+        env, NULL, FALSE, FALSE, FALSE);
 
     free(args[0]);
 }