Merge lp:dash-privacy-interface into lp:~cm-t/dash-privacy-interface/quickly_trunk

Proposed by Kanor
Status: Merged
Approved by: cm-t 🦄🏂🌈🎵
Approved revision: 6
Merged at revision: 9
Proposed branch: lp:dash-privacy-interface
Merge into: lp:~cm-t/dash-privacy-interface/quickly_trunk
Diff against target: 450 lines (+137/-155)
9 files modified
build/share/applications/dash-privacy-interface.desktop (+0/-8)
dash_privacy_interface/DashPrivacyInterfaceWindow.py (+31/-26)
data/dash-privacy-interface.desktop (+8/-0)
data/legalnotice/searchingthedashlegalnotice_fr.html (+67/-0)
data/ui/DashPrivacyInterfaceWindow.ui (+2/-1)
debian/changelog (+2/-98)
debian/copyright (+1/-0)
po/dash-privacy-interface.pot (+5/-10)
setup.py (+21/-12)
To merge this branch: bzr merge lp:dash-privacy-interface
Reviewer Review Type Date Requested Status
cm-t 🦄🏂🌈🎵 Pending
Review via email: mp+130697@code.launchpad.net
To post a comment you must log in.
lp:dash-privacy-interface updated
7. By rdubreil <email address hidden>

This window is suposed to be launched on the first user login

8. By rdubreil <email address hidden>

Legal notice in french

9. By rdubreil <email address hidden>

Merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'bin/dash-privacy-interfacec'
0Binary files bin/dash-privacy-interfacec 2012-10-20 07:41:01 +0000 and bin/dash-privacy-interfacec 1970-01-01 00:00:00 +0000 differ0Binary files bin/dash-privacy-interfacec 2012-10-20 07:41:01 +0000 and bin/dash-privacy-interfacec 1970-01-01 00:00:00 +0000 differ
=== removed directory 'build'
=== removed directory 'build/share'
=== removed directory 'build/share/applications'
=== removed file 'build/share/applications/dash-privacy-interface.desktop'
--- build/share/applications/dash-privacy-interface.desktop 2012-10-20 07:54:32 +0000
+++ build/share/applications/dash-privacy-interface.desktop 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1[Desktop Entry]
2Name=Dash Privacy Interface
3Comment=DashPrivacyInterface application
4Categories=GNOME;Utility;
5Exec=dash-privacy-interface
6Icon=dash-privacy-interface
7Terminal=false
8Type=Application
90
=== modified file 'dash_privacy_interface/DashPrivacyInterfaceWindow.py'
--- dash_privacy_interface/DashPrivacyInterfaceWindow.py 2012-10-20 07:41:01 +0000
+++ dash_privacy_interface/DashPrivacyInterfaceWindow.py 2012-10-22 16:50:24 +0000
@@ -1,44 +1,53 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2### BEGIN LICENSE2### BEGIN LICENSE
3# Copyright (C) 3# Copyright (C)
4# ubuntu-fr <LoCo Team> 4# ubuntu-fr <LoCo Team>
5# kanor <Romain DUBREIL> <contact@kanor.fr>5# kanor <Romain DUBREIL> <contact@kanor.fr>
6# cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org>6# cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org>
7# olive <Olivier FRAYSSE> <olive@picapo.org>7# olive <Olivier FRAYSSE> <olive@picapo.org>
8# quesh <Frédéric MANDE> <quesh@quesh.fr>8# quesh <Frédéric MANDE> <quesh@quesh.fr>
9# This program is free software: you can redistribute it and/or modify it 9# This program is free software: you can redistribute it and/or modify it
10# under the terms of the GNU General Public License version 3, as published 10# under the terms of the GNU General Public License version 3, as published
11# by the Free Software Foundation.11# by the Free Software Foundation.
12# 12#
13# This program is distributed in the hope that it will be useful, but 13# This program is distributed in the hope that it will be useful, but
14# WITHOUT ANY WARRANTY; without even the implied warranties of 14# WITHOUT ANY WARRANTY; without even the implied warranties of
15# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 15# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
16# PURPOSE. See the GNU General Public License for more details.16# PURPOSE. See the GNU General Public License for more details.
17# 17#
18# You should have received a copy of the GNU General Public License along 18# You should have received a copy of the GNU General Public License along
19# with this program. If not, see <http://www.gnu.org/licenses/>.19# with this program. If not, see <http://www.gnu.org/licenses/>.
20### END LICENSE20### END LICENSE
2121
22from locale import gettext as _22from locale import gettext as _
23import locale
23import os24import os
24from gi.repository import Gio, Gtk # pylint: disable=E061125from gi.repository import Gio, Gtk # pylint: disable=E0611
25import logging26import logging
26logger = logging.getLogger('dash_privacy_interface')27logger = logging.getLogger('dash_privacy_interface')
2728
28from dash_privacy_interface_lib import Window29from dash_privacy_interface_lib import Window
29from dash_privacy_interface.AboutDashPrivacyInterfaceDialog import AboutDashPrivacyInterfaceDialog
30from dash_privacy_interface.PreferencesDashPrivacyInterfaceDialog import PreferencesDashPrivacyInterfaceDialog
3130
32# See dash_privacy_interface_lib.Window.py for more details about how this class works31# See dash_privacy_interface_lib.Window.py for more details about how this class works
33class DashPrivacyInterfaceWindow(Window):32class DashPrivacyInterfaceWindow(Window):
34 __gtype_name__ = "DashPrivacyInterfaceWindow"33 __gtype_name__ = "DashPrivacyInterfaceWindow"
35 34
36 def finish_initializing(self, builder): # pylint: disable=E100235 def finish_initializing(self, builder): # pylint: disable=E1002
37 """Set up the main window"""36 """Set up the main window"""
38 super(DashPrivacyInterfaceWindow, self).finish_initializing(builder)37 super(DashPrivacyInterfaceWindow, self).finish_initializing(builder)
3938 #Add url to read legal notice with local language
40 #self.AboutDialog = AboutDashPrivacyInterfaceDialog39 btn_label = builder.get_object("lbl_do_later_descrp")
41 #self.PreferencesDialog = PreferencesDashPrivacyInterfaceDialog40 text_label = btn_label.get_label()
41 language = locale.getdefaultlocale()[0].split('_')[0]
42 lien = "/usr/share/unity/6/searchingthedashlegalnotice%s.html"
43 lien_locale = lien % ( "_%s" % language)
44 if os.path.exists(lien_locale) and language != 'en':
45 lien = lien_locale
46 else:
47 lien = lien % ""
48 lien = "file:" + lien
49 text_label = text_label % {'url': lien}
50 btn_label.set_label(text_label)
4251
43 # Code for other initialization actions should be added here.52 # Code for other initialization actions should be added here.
44 settings = Gtk.Settings.get_default()53 settings = Gtk.Settings.get_default()
@@ -61,16 +70,12 @@
61 self.quit_after_choice()70 self.quit_after_choice()
6271
63 def quit_after_choice(self):72 def quit_after_choice(self):
64 self.set_has_been_displayed()73 self.disable_auto_start()
65 self.disable_auto_start()
66 Gtk.main_quit()74 Gtk.main_quit()
67 75
68 def set_has_been_displayed(self):
69 cookiFile = os.path.expanduser("~/config/.dash-privacy-interface/screen_seen")
70 if os.path.exists(cookiFile):
71 with open(cookiFile, 'w') as f:
72 f.write(_("The file was created after the current user has manualy chosen his dash privacy search result setting (online and local or local only). \n For more information: https://launchpad.net/dash-privacy-interface "))
7376
74 def disable_auto_start(self):77 def disable_auto_start(self):
75 return78 desktopFile = os.path.expanduser("~/.config/autostart/dash-privacy-interface.desktop")
76 79 if os.path.exists(desktopFile):
80 os.remove(desktopFile)
81
7782
=== added file 'data/dash-privacy-interface.desktop'
--- data/dash-privacy-interface.desktop 1970-01-01 00:00:00 +0000
+++ data/dash-privacy-interface.desktop 2012-10-22 16:50:24 +0000
@@ -0,0 +1,8 @@
1[Desktop Entry]
2Name=Dash Privacy Interface
3Comment=DashPrivacyInterface application
4Categories=GNOME;Utility;
5Exec=dash-privacy-interface
6Icon=dash-privacy-interface
7Terminal=false
8Type=Application
09
=== added directory 'data/legalnotice'
=== added file 'data/legalnotice/searchingthedashlegalnotice_fr.html'
--- data/legalnotice/searchingthedashlegalnotice_fr.html 1970-01-01 00:00:00 +0000
+++ data/legalnotice/searchingthedashlegalnotice_fr.html 2012-10-22 16:50:24 +0000
@@ -0,0 +1,67 @@
1<html><head><title>Recherche dans le tableau de bord, mentions légales.</title>
2<meta http-equiv="content-type" content="text/html; charset=UTF-8">
3<style type="text/css">
4body {font-family:Ubuntu; font-size:9pt;padding:50pt}
5h1{font-size:11pt;font-weight:bold;text-align:center;padding:10pt}
6h2{font-size:11pt;font-weight:bold;}
7</style>
8</head>
9<body>
10<h1>Recherche dans le tableau de bord - Mentions légales<br>Traduction non-officielle datée du 20 octobre 2012</h1>
11<p><a href="file:///usr/share/unity/6/searchingthedashlegalnotice.html">Consultez la version originale (en anglais).</a></p>
12
13<p>Cette fonction de recherche est fournie par la société Canonical
14Group Limited (Canonical). Cette notice légale s'applique à la fonction
15de recherche et inclue les
16<a href="http://www.canonical.com/legal">mentions légales</a> et la politique de respect de la vie privée, de Canonical.</p>
17
18<h2>Collecte et usage des données</h2>
19<p>Quand vous entrez une recherche dans le dash, Ubuntu cherchera sur votre ordinateur et enregistrera cette recherche localement.</p>
20
21<p>À moins que vous ayez désactivé cette option, (voir la section
22«&nbsp;Recherche en ligne&nbsp;» ci-dessous), nous enverrons aussi vos
23frappes de clavier en tant que recherches à productsearch.ubuntu.com et à
24 des tiers sélectionnés afin de pouvoir compléter vos recherches par des
25 résultats de recherches en ligne de tierces parties telles que :
26Facebook, Twitter, BBC et Amazon. Canonical et ces tiers sélectionnés
27collecteront vos recherches et les utiliseront pour vous fournir des
28résultats de recherche durant votre utilisation d'Ubuntu.</p>
29<p>En effectuant des recherches dans le tableau de bord, vous acceptez :</p>
30
31<ul>
32<li>la collecte et l'utilisation de vos recherches et de votre adresse IP de cette façon, et</li>
33<li>le stockage de vos recherches et adresses IP par Canonical et ces tierces parties (si applicable).</li>
34</ul>
35
36<p>Canonical n'utilisera ces recherches et adresses IP qu'en accord avec ces mentions légales et
37<a href="http://www.ubuntu.com/aboutus/privacypolicy">notre politique de respect de la vie privée</a>. Veuillez consulter <a href="http://www.ubuntu.com/aboutus/privacypolicy">notre politique de respect de la vie privée</a>
38 pour toute information complémentaire sur la façon dont Canonical
39protège vos informations personelles. Pour toute information sur la
40manière dont les parties tierces peuvent utiliser vos informations,
41veuillez consulter leurs politiques de respect de la vie privée.</p>
42
43<h2>Recherche en ligne</h2>
44<p>Vous pouvez restreindre votre tableau de bord de telle sorte que nous
45 n'envoyions pas les recherches à des tiers et que vous ne receviez pas
46de résultat de recherche en ligne. Pour ce faire, allez dans le panneau
47de configuration «&nbsp;vie privée&nbsp;» et désactivez «&nbsp;Inclure
48les résultats de la recherche en ligne&nbsp;». Le panneau de
49configuration «&nbsp;vie privée&nbsp;» peut être trouvé dans les
50paramètres système ou via une recherche dans le tableau de bord. Pour
51une liste actualisée des parties tierces sélectionnées veuillez
52consulter
53<a href="http://www.ubuntu.com/privacypolicy/thirdparties">www.ubuntu.com/privacypolicy/thirdparties</a>.</p>
54
55<h2>Modifications</h2>
56<p>Même si les changements seront probablement mineurs, Canonical peut
57modifier ces mentions légales de temps à autres et à la seule discrétion
58 de Canonical. Veuillez consulter régulièrement cette page pour tout
59changement dans les mentions légales, il nous est impossible de vous en
60avertir directement.</p>
61
62<h2>Comment nous contacter</h2>
63<p>Veuillez soumettre toute question ou commentaire à propos de la
64recherche dans le tableau de bord ou de ces mentions légales, en nous
65contactant à l'adresse suivante : </p><address>Canonical Group Ltd, 5th Floor, Blue Fin Building, 110 Southwark Street, London, England, SE1 0SU.</address><p></p>
66
67</body></html>
0\ No newline at end of file68\ No newline at end of file
169
=== modified file 'data/ui/DashPrivacyInterfaceWindow.ui'
--- data/ui/DashPrivacyInterfaceWindow.ui 2012-10-20 07:41:01 +0000
+++ data/ui/DashPrivacyInterfaceWindow.ui 2012-10-22 16:50:24 +0000
@@ -195,7 +195,8 @@
195 <property name="xpad">27</property>195 <property name="xpad">27</property>
196 <property name="ypad">5</property>196 <property name="ypad">5</property>
197 <property name="label" translatable="yes" comments="This field explain that you can change this setting later + legal notice">You can go back on your choice at any time, in the private life menu in the system settings.197 <property name="label" translatable="yes" comments="This field explain that you can change this setting later + legal notice">You can go back on your choice at any time, in the private life menu in the system settings.
198Learn more about this function and browse the legal notice.</property>198 Learn more about this function and browse &lt;a href="%(url)s"&gt;the legal notice&lt;/a&gt;.</property>
199 <property name="use_markup">True</property>
199 <property name="justify">fill</property>200 <property name="justify">fill</property>
200 <property name="wrap">True</property>201 <property name="wrap">True</property>
201 <property name="ellipsize">start</property>202 <property name="ellipsize">start</property>
202203
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-20 08:03:08 +0000
+++ debian/changelog 2012-10-22 16:50:24 +0000
@@ -1,101 +1,5 @@
1dash-privacy-interface (12.10.1) quantal; urgency=low1dash-privacy-interface (12.10.1) precise; urgency=low
2
3 * translation added
4
5 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 10:03:05 +0200
6
7dash-privacy-interface (12.10) quantal; urgency=low
8
9 * New release.
10
11 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:41:05 +0200
12
13dash-privacy-interface (0.1-public17) quantal; urgency=low
14
15 * New release.
16
17 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:37:26 +0200
18
19dash-privacy-interface (0.1-public16) quantal; urgency=low
20
21 * New release.
22
23 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:15:13 +0200
24
25dash-privacy-interface (0.1-public15) quantal; urgency=low
26
27 * New release.
28
29 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:08:30 +0200
30
31dash-privacy-interface (0.1-public14) quantal; urgency=low
32
33 * New release.
34
35 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 09:02:33 +0200
36
37dash-privacy-interface (0.1-public13) quantal; urgency=low
38
39 * New release.
40
41 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:57:51 +0200
42
43dash-privacy-interface (0.1-public12) quantal; urgency=low
44
45 * New release.
46
47 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:54:18 +0200
48
49dash-privacy-interface (0.1-public11) quantal; urgency=low
50
51 * New release.
52
53 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:51:30 +0200
54
55dash-privacy-interface (0.1-public10) quantal; urgency=low
56
57 * New release.
58
59 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:49:04 +0200
60
61dash-privacy-interface (0.1-public9) quantal; urgency=low
62
63 * New release.
64
65 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:47:47 +0200
66
67dash-privacy-interface (0.1-public8) quantal; urgency=low
68
69 * New release.
70
71 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:45:06 +0200
72
73dash-privacy-interface (0.1-public7) quantal; urgency=low
74
75 * New release.
76
77 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:38:50 +0200
78
79dash-privacy-interface (0.1-public6) quantal; urgency=low
80
81 * New release.
82
83 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:36:49 +0200
84
85dash-privacy-interface (0.1-public5) quantal; urgency=low
86
87 * New release.
88
89 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:34:39 +0200
90
91dash-privacy-interface (0.1-public4) quantal; urgency=low
92
93 * New release.
94
95 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:33:06 +0200
96
97dash-privacy-interface (0.1-public3) quantal; urgency=low
982
99 * Initial release.3 * Initial release.
1004
101 -- cm-t arudy <arudy@ubuntu-fr.org> Sat, 20 Oct 2012 08:31:23 +02005 -- Tyrus <tyrus@tyrus-carthage> Sun, 21 Oct 2012 21:25:06 +0200
1026
=== modified file 'debian/copyright'
--- debian/copyright 2012-10-20 07:41:10 +0000
+++ debian/copyright 2012-10-22 16:50:24 +0000
@@ -4,6 +4,7 @@
4Source: https://launchpad.net/dash-privacy-interface4Source: https://launchpad.net/dash-privacy-interface
55
6Files: *6Files: *
7Copyright: (C)
7Copyright: (C) 8Copyright: (C)
8Copyright: (C) </property><property name="can_focus">False</property>9Copyright: (C) </property><property name="can_focus">False</property>
9License: GPL-310License: GPL-3
1011
=== modified file 'po/dash-privacy-interface.pot'
--- po/dash-privacy-interface.pot 2012-10-20 07:54:32 +0000
+++ po/dash-privacy-interface.pot 2012-10-22 16:50:24 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-10-20 09:52+0200\n"11"POT-Creation-Date: 2012-10-21 21:25+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,6 @@
17"Content-Type: text/plain; charset=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../dash_privacy_interface/DashPrivacyInterfaceWindow.py:72
21msgid ""
22"The file was created after the current user has manualy chosen his dash "
23"privacy search result setting (online and local or local only). \n"
24" For more information: https://launchpad.net/dash-privacy-interface "
25msgstr ""
26
27#. Code for other initialization actions should be added here.20#. Code for other initialization actions should be added here.
28#. Window title21#. Window title
29#: ../data/ui/DashPrivacyInterfaceWindow.ui.h:222#: ../data/ui/DashPrivacyInterfaceWindow.ui.h:2
@@ -63,11 +56,13 @@
63msgstr ""56msgstr ""
6457
65#. This field explain that you can change this setting later + legal notice58#. This field explain that you can change this setting later + legal notice
66#: ../data/ui/DashPrivacyInterfaceWindow.ui.h:1559#: ../data/ui/DashPrivacyInterfaceWindow.ui.h:16
60#, no-c-format
67msgid ""61msgid ""
68"You can go back on your choice at any time, in the private life menu in the "62"You can go back on your choice at any time, in the private life menu in the "
69"system settings.\n"63"system settings.\n"
70"Learn more about this function and browse the legal notice."64" Learn more about this function and browse <a href=\"%(url)s"
65"\">the legal notice</a>."
71msgstr ""66msgstr ""
7267
73#: ../data/ui/PreferencesDashPrivacyInterfaceDialog.ui.h:168#: ../data/ui/PreferencesDashPrivacyInterfaceDialog.ui.h:1
7469
=== modified file 'setup.py'
--- setup.py 2012-10-20 08:03:02 +0000
+++ setup.py 2012-10-22 16:50:24 +0000
@@ -1,22 +1,22 @@
1#!/usr/bin/env python1#!/usr/bin/env python
2# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-2# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3### BEGIN LICENSE3### BEGIN LICENSE
4# Copyright (C) 4# Copyright (C)
5# ubuntu-fr <LoCo Team> 5# ubuntu-fr <LoCo Team>
6# kanor <Romain DUBREIL> <contact@kanor.fr>6# kanor <Romain DUBREIL> <contact@kanor.fr>
7# cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org>7# cm-t <Rudy ANDRÉ> <arudy@ubuntu-fr.org>
8# olive <Olivier FRAYSSE> <olive@picapo.org>8# olive <Olivier FRAYSSE> <olive@picapo.org>
9# quesh <Frédéric MANDE> <quesh@quesh.fr>9# quesh <Frédéric MANDE> <quesh@quesh.fr>
10# This program is free software: you can redistribute it and/or modify it 10# This program is free software: you can redistribute it and/or modify it
11# under the terms of the GNU General Public License version 3, as published 11# under the terms of the GNU General Public License version 3, as published
12# by the Free Software Foundation.12# by the Free Software Foundation.
13# 13#
14# This program is distributed in the hope that it will be useful, but 14# This program is distributed in the hope that it will be useful, but
15# WITHOUT ANY WARRANTY; without even the implied warranties of 15# WITHOUT ANY WARRANTY; without even the implied warranties of
16# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 16# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
17# PURPOSE. See the GNU General Public License for more details.17# PURPOSE. See the GNU General Public License for more details.
18# 18#
19# You should have received a copy of the GNU General Public License along 19# You should have received a copy of the GNU General Public License along
20# with this program. If not, see <http://www.gnu.org/licenses/>.20# with this program. If not, see <http://www.gnu.org/licenses/>.
21### END LICENSE21### END LICENSE
2222
@@ -24,6 +24,7 @@
2424
25import os25import os
26import sys26import sys
27import glob
2728
28try:29try:
29 import DistUtilsExtra.auto30 import DistUtilsExtra.auto
@@ -134,10 +135,14 @@
134 update_desktop_file(desktop_file, target_pkgdata, target_scripts)135 update_desktop_file(desktop_file, target_pkgdata, target_scripts)
135 compile_schemas(self.root, target_data)136 compile_schemas(self.root, target_data)
136137
137 138
138##################################################################################139##################################################################################
139###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ######################140###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ######################
140##################################################################################141##################################################################################
142#List translate legal notice
143l_file_legal_notice = glob.glob(os.path.join(
144 os.path.dirname(os.path.abspath(__file__)),
145 "data/legalnotice/*.html"))
141146
142DistUtilsExtra.auto.setup(147DistUtilsExtra.auto.setup(
143 name='dash-privacy-interface',148 name='dash-privacy-interface',
@@ -148,6 +153,10 @@
148 #description='UI for managing …',153 #description='UI for managing …',
149 #long_description='Here a longer description',154 #long_description='Here a longer description',
150 url='https://launchpad.net/dash-privacy-interface',155 url='https://launchpad.net/dash-privacy-interface',
151 cmdclass={'install': InstallAndUpdateDataDirectory}156 cmdclass={'install': InstallAndUpdateDataDirectory},
157 data_files=[("/etc/skel/.config/autostart/",
158 ["data/dash-privacy-interface.desktop"]),
159 ("/usr/share/unity/6/",
160 l_file_legal_notice)]
152 )161 )
153162

Subscribers

People subscribed via source and target branches