← Back to branch summary

~ubuntu-branches/ubuntu/raring/remmina/raring

« back to all changes in this revision

Viewing changes to debian/patches/translations.patch

  • Committer: Package Import Robot
  • Author(s): Alex Chiang, Alex Chiang, Iain Lane
  • Date: 2013-01-17 16:31:24 UTC
  • mfrom: (14.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20130117163124-wibom3bg8r2qexp1
Tags: 1.0.0-4ubuntu1
https://launchpad.net/bugs/943434
https://launchpad.net/bugs/943279
https://launchpad.net/bugs/1024480
https://launchpad.net/bugs/938026
[ Alex Chiang ]
* Merge from Debian unstable.
  - Dropped in favor of upstream debian's patches:
    . install_desktop_file.patch => desktop_file.patch
    . scroll_smooth.patch => scroll.patch
    . trayicon_option.patch => systray.patch
* Remaining changes:
  - debian/patches/indicator_set_title.patch:
    . set a title so the unity-hud doesn't list as "untitled" (lp: #943434)
  - debian/patches/translations.patch,
    debian/rules:
    . improve translation support, add a .desktop.in, update potfiles.in
      lists, call intltool-update on build (lp: #943279)
  - debian/patches/keywords.patch:
    . backport upstream patch to set keywords in the desktop entry, 
      it makes easier to find remmina in the unity dash or gnome-shell
      (lp: #1024480)
  - debian/patches/unity_launcher_list.patch: unity launcher list support
    thanks Nekhelesh Ramananthan (lp: #938026)

[ Iain Lane ]
* Add Breaks and Replaces from remmina to remmina-common as the .desktop
  file has moved across.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/translations.patch
1
 
Index: remmina-1.0.0/remmina/desktop/remmina.desktop.in
 
1
Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in
2
2
===================================================================
3
3
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4
 
+++ remmina-1.0.0/remmina/desktop/remmina.desktop.in    2012-03-22 12:00:33.000000000 +0100
5
 
@@ -0,0 +1,23 @@
 
4
+++ remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop.in   2012-12-23 14:43:08.743890098 -0800
 
5
@@ -0,0 +1,25 @@
6
6
+[Desktop Entry]
7
7
+Version=1.0
8
 
+_Name=Remmina Remote Desktop Client
 
8
+_Name=Remmina
 
9
+_GenericName=Remote Desktop Client
 
10
+_X-GNOME-FullName=Remmina Remote Desktop Client
9
11
+_Comment=Connect to remote desktops
10
12
+TryExec=remmina
11
13
+Exec=remmina
26
28
+Exec=remmina --icon
27
29
+OnlyShowIn=Unity;
28
30
+
29
 
Index: remmina-1.0.0/remmina/po/POTFILES.in
 
31
Index: remmina-1.0.0-4ubuntu1/remmina/po/POTFILES.in
30
32
===================================================================
31
 
--- remmina-1.0.0.orig/remmina/po/POTFILES.in   2012-02-10 19:54:23.000000000 +0100
32
 
+++ remmina-1.0.0/remmina/po/POTFILES.in        2012-03-22 12:00:33.000000000 +0100
 
33
--- remmina-1.0.0-4ubuntu1.orig/remmina/po/POTFILES.in  2012-12-23 14:38:34.830531831 -0800
 
34
+++ remmina-1.0.0-4ubuntu1/remmina/po/POTFILES.in       2012-12-23 14:38:50.966611835 -0800
33
35
@@ -1,27 +1,29 @@
34
36
 desktop/remmina.desktop.in
35
37
-src/remmina.c
86
88
+../remmina-plugins/vnc/vnc_plugin.c
87
89
+../remmina-plugins/xdmcp/xdmcp_plugin.c
88
90
+
89
 
Index: remmina-1.0.0/remmina/desktop/remmina.desktop
 
91
Index: remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop
90
92
===================================================================
91
 
--- remmina-1.0.0.orig/remmina/desktop/remmina.desktop  2012-03-22 12:00:33.000000000 +0100
92
 
+++ remmina-1.0.0/remmina/desktop/remmina.desktop       2012-03-22 12:41:07.510227645 +0100
93
 
@@ -10,6 +10,7 @@
 
93
--- remmina-1.0.0-4ubuntu1.orig/remmina/desktop/remmina.desktop 2012-12-23 14:38:34.810531724 -0800
 
94
+++ remmina-1.0.0-4ubuntu1/remmina/desktop/remmina.desktop      2012-12-23 14:38:50.966611835 -0800
 
95
@@ -12,6 +12,7 @@
94
96
 Actions=
95
97
 Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
96
98
 Actions=Profile;Tray;