Merge lp:~costales/folder-color/no-deprecated-depedences into lp:folder-color

Proposed by costales on 2017-08-14
Status: Merged
Approved by: costales on 2017-08-14
Approved revision: 280
Merged at revision: 280
Proposed branch: lp:~costales/folder-color/no-deprecated-depedences
Merge into: lp:folder-color
Diff against target: 125 lines (+14/-14)
8 files modified
README (+3/-3)
debian/changelog (+3/-3)
debian/control (+2/-2)
install_scripts/caja.sh (+1/-1)
install_scripts/nautilus.sh (+1/-1)
install_scripts/nemo.sh (+1/-1)
nautilus-extension/folder-color.py (+1/-1)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~costales/folder-color/no-deprecated-depedences
Reviewer Review Type Date Requested Status
costales Pending
Review via email: mp+328987@code.launchpad.net

Description of the change

Removed deprecated depedences

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2017-07-02 11:14:40 +0000
3+++ README 2017-08-14 15:15:25 +0000
4@@ -27,11 +27,11 @@
5 DEPENDENCIES
6 ============
7 For Nautilus:
8- python-nautilus, nautilus, libgtk2.0-bin
9+ python-nautilus, nautilus
10 For Nemo:
11- python-nemo, nemo, libgtk2.0-bin
12+ python-nemo, nemo
13 For Caja:
14- python-caja, caja, gir1.2-caja, libgtk2.0-bin
15+ python-caja, caja
16
17
18
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2017-08-14 08:29:42 +0000
22+++ debian/changelog 2017-08-14 15:15:25 +0000
23@@ -1,7 +1,7 @@
24-folder-color (0.0.85) xenial; urgency=low
25+folder-color (0.0.86) artful; urgency=low
26
27- * File's emblem
28+ * Removed obsolete depedences
29 * Updated translations
30
31- -- costales <costales.marcos@gmail.com> Mon, 14 Aug 2017 10:16:31 +0000
32+ -- costales <costales.marcos@gmail.com> Mon, 14 Aug 2017 18:16:31 +0000
33
34
35=== modified file 'debian/control'
36--- debian/control 2017-08-14 08:02:15 +0000
37+++ debian/control 2017-08-14 15:15:25 +0000
38@@ -1,7 +1,7 @@
39 Source: folder-color
40 Section: utils
41 Priority: extra
42-Standards-Version: 0.0.85
43+Standards-Version: 0.0.86
44 Maintainer: costales <costales.marcos@gmail.com>
45 Build-Depends: python-distutils-extra, debhelper (>=7)
46 Homepage: https://code.launchpad.net/folder-color
47@@ -10,7 +10,7 @@
48 Architecture: all
49 Section: utils
50 Priority: extra
51-Depends: python-nautilus, nautilus, libgtk2.0-bin, ${python:Depends}
52+Depends: python-nautilus, nautilus, ${python:Depends}
53 Breaks: folder-color-nemo, folder-color-caja
54 Replaces: folder-color-nemo, folder-color-caja
55 Description: Folder Color for Nautilus
56
57=== modified file 'install_scripts/caja.sh'
58--- install_scripts/caja.sh 2017-08-12 15:11:28 +0000
59+++ install_scripts/caja.sh 2017-08-14 15:15:25 +0000
60@@ -36,7 +36,7 @@
61
62 sed -i 's/Source: folder-color/Source: folder-color-caja/' ../debian/control
63 sed -i 's/Package: folder-color/Package: folder-color-caja/' ../debian/control
64-sed -i 's/python-nautilus, nautilus, libgtk2.0-bin, /python-caja, gir1.2-caja, caja, gir1.2-gtk-2.0, folder-color-common, /' ../debian/control
65+sed -i 's/python-nautilus, nautilus, /python-caja, caja, folder-color-common, /' ../debian/control
66 sed -i '14,15d' ../debian/control
67 sed -i 's/Folder Color for Nautilus/Folder Color for Caja/' ../debian/control
68 sed -i 's/Change a folder color used in Nautilus/Change a folder color used in Caja/' ../debian/control
69
70=== modified file 'install_scripts/nautilus.sh'
71--- install_scripts/nautilus.sh 2017-06-27 19:19:46 +0000
72+++ install_scripts/nautilus.sh 2017-08-14 15:15:25 +0000
73@@ -16,7 +16,7 @@
74 sed -i '2d' ../debian/install
75
76 sed -i '14,15d' ../debian/control
77-sed -i 's/ python-nautilus, nautilus, libgtk2.0-bin, / python-nautilus, nautilus, folder-color-common, /' ../debian/control
78+sed -i 's/ python-nautilus, nautilus, / python-nautilus, nautilus, folder-color-common, /' ../debian/control
79
80 sed -i '25,44d' ../debian/copyright
81
82
83=== modified file 'install_scripts/nemo.sh'
84--- install_scripts/nemo.sh 2017-06-27 19:19:46 +0000
85+++ install_scripts/nemo.sh 2017-08-14 15:15:25 +0000
86@@ -27,7 +27,7 @@
87
88 sed -i 's/Source: folder-color/Source: folder-color-nemo/' ../debian/control
89 sed -i 's/Package: folder-color/Package: folder-color-nemo/' ../debian/control
90-sed -i 's/python-nautilus, nautilus, libgtk2.0-bin, /python-nemo, nemo, folder-color-common, /' ../debian/control
91+sed -i 's/python-nautilus, nautilus, /python-nemo, nemo, folder-color-common, /' ../debian/control
92 sed -i '14,15d' ../debian/control
93 sed -i 's/Folder Color for Nautilus/Folder Color for Nemo/' ../debian/control
94 sed -i 's/Change a folder color used in Nautilus/Change a folder color used in Nemo/' ../debian/control
95
96=== modified file 'nautilus-extension/folder-color.py'
97--- nautilus-extension/folder-color.py 2017-08-14 08:12:41 +0000
98+++ nautilus-extension/folder-color.py 2017-08-14 15:15:25 +0000
99@@ -1,4 +1,4 @@
100-# Folder Color 0.0.85
101+# Folder Color 0.0.86
102 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales
103 #
104 # Folder Color is free software; you can redistribute it and/or modify
105
106=== modified file 'setup.py'
107--- setup.py 2017-08-14 08:02:15 +0000
108+++ setup.py 2017-08-14 15:15:25 +0000
109@@ -1,6 +1,6 @@
110 #!/usr/bin/env python3
111
112-# Folder Color 0.0.85 - http://launchpad.net/folder-color
113+# Folder Color 0.0.86 - http://launchpad.net/folder-color
114 # Copyright (C) 2012-2017 Marcos Alvarez Costales https://launchpad.net/~costales
115 #
116 # folder-color is free software; you can redistribute it and/or modify
117@@ -32,7 +32,7 @@
118 # Setup stage
119 DistUtilsExtra.auto.setup(
120 name = "folder-color",
121- version = "0.0.85",
122+ version = "0.0.86",
123 description = "Change your folder color with just a click",
124 author = "Marcos Alvarez Costales https://launchpad.net/~costales",
125 author_email = "https://launchpad.net/~costales",

Subscribers

People subscribed via source and target branches

to all changes: