Merge lp:~noskcaj/file-roller/3.16 into lp:~ubuntu-desktop/file-roller/ubuntu

Proposed by Jackson Doak on 2015-06-16
Status: Merged
Merged at revision: 165
Proposed branch: lp:~noskcaj/file-roller/3.16
Merge into: lp:~ubuntu-desktop/file-roller/ubuntu
Diff against target: 187 lines (+47/-51)
7 files modified
debian/changelog (+33/-0)
debian/compat (+1/-1)
debian/control (+4/-5)
debian/control.in (+3/-4)
debian/patches/99_ltmain_as-needed.patch (+0/-35)
debian/patches/series (+0/-1)
debian/rules (+6/-5)
To merge this branch: bzr merge lp:~noskcaj/file-roller/3.16
Reviewer Review Type Date Requested Status
Robert Ancell 2015-06-16 Approve on 2015-06-17
Review via email: mp+262147@code.launchpad.net

Description of the change

Merge from debian.
Significant changes:
 * Drop the Depends on nautilus-data. It's no longer strictly necessary since
   file-roller has been updated to not crash if the nautilus GSettings schema
   is not present. This makes file-roller more suitable for non-GNOME
   environments, where nautilus is not wanted.
 * Drop ltmain patch, dh-autoreconf makes this unneeded

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Thanks Jackson!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-06-02 04:11:34 +0000
3+++ debian/changelog 2015-06-16 21:54:50 +0000
4@@ -1,3 +1,36 @@
5+file-roller (3.16.2-2ubuntu1) wily; urgency=medium
6+
7+ * Merge from debian. Remaining changes:
8+ - Make a compatibility desktop file for upgraders
9+ - Use ubuntu VCS in d/control
10+ - Depend on zip and unzip instead of p7zip-full which is in universe
11+ - Suggest p7zip-full (LP: #918107)
12+ - Recommend sessioninstaller
13+ - Drop unar to suggests
14+ - Add patch to not use GtkHeaderBar in Unity
15+
16+ -- Jackson Doak <noskcaj@ubuntu.com> Wed, 17 Jun 2015 07:35:31 +1000
17+
18+file-roller (3.16.2-2) unstable; urgency=medium
19+
20+ * Drop the Depends on nautilus-data. It's no longer strictly necessary since
21+ file-roller has been updated to not crash if the nautilus GSettings schema
22+ is not present. This makes file-roller more suitable for non-GNOME
23+ environments, where nautilus is not wanted. (Closes: #788690)
24+
25+ -- Michael Biebl <biebl@debian.org> Mon, 15 Jun 2015 14:56:52 +0200
26+
27+file-roller (3.16.2-1) unstable; urgency=medium
28+
29+ * New upstream release.
30+ * Drop obsolete --disable-scrollkeeper configure flag.
31+ * Drop obsolete Replaces from pre-wheezy.
32+ * Point Homepage: URL to the more up-to-date GNOME wiki page.
33+ * Bump debhelper compatibility level to 9.
34+ * Use dh-autoreconf --as-needed instead of patching ltmain.sh.
35+
36+ -- Michael Biebl <biebl@debian.org> Thu, 28 May 2015 02:59:25 +0200
37+
38 file-roller (3.16.2-0ubuntu1) wily; urgency=medium
39
40 * New upstream release
41
42=== modified file 'debian/compat'
43--- debian/compat 2011-11-15 04:45:53 +0000
44+++ debian/compat 2015-06-16 21:54:50 +0000
45@@ -1,1 +1,1 @@
46-8
47+9
48
49=== modified file 'debian/control'
50--- debian/control 2015-02-02 13:59:23 +0000
51+++ debian/control 2015-06-16 21:54:50 +0000
52@@ -7,11 +7,11 @@
53 Priority: optional
54 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
55 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
56-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org>
57+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
58 Build-Depends: cdbs (>= 0.4.41),
59- debhelper (>= 8),
60+ debhelper (>= 9),
61+ dh-autoreconf,
62 desktop-file-utils,
63- dh-autoreconf,
64 gettext,
65 gnome-pkg-tools (>= 0.19.4ubuntu1~),
66 intltool (>= 0.40.0),
67@@ -25,12 +25,11 @@
68 yelp-tools
69 Standards-Version: 3.9.6
70 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/file-roller/ubuntu
71-Homepage: http://fileroller.sourceforge.net/
72+Homepage: https://wiki.gnome.org/Apps/FileRoller
73
74 Package: file-roller
75 Architecture: any
76 Depends: bzip2,
77- nautilus-data (>= 3.0),
78 unzip,
79 zip,
80 ${misc:Depends},
81
82=== modified file 'debian/control.in'
83--- debian/control.in 2015-02-02 13:59:23 +0000
84+++ debian/control.in 2015-06-16 21:54:50 +0000
85@@ -5,9 +5,9 @@
86 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
87 Uploaders: @GNOME_TEAM@
88 Build-Depends: cdbs (>= 0.4.41),
89- debhelper (>= 8),
90+ debhelper (>= 9),
91+ dh-autoreconf,
92 desktop-file-utils,
93- dh-autoreconf,
94 gettext,
95 gnome-pkg-tools (>= 0.19.4ubuntu1~),
96 intltool (>= 0.40.0),
97@@ -21,12 +21,11 @@
98 yelp-tools
99 Standards-Version: 3.9.6
100 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/file-roller/ubuntu
101-Homepage: http://fileroller.sourceforge.net/
102+Homepage: https://wiki.gnome.org/Apps/FileRoller
103
104 Package: file-roller
105 Architecture: any
106 Depends: bzip2,
107- nautilus-data (>= 3.0),
108 unzip,
109 zip,
110 ${misc:Depends},
111
112=== removed file 'debian/patches/99_ltmain_as-needed.patch'
113--- debian/patches/99_ltmain_as-needed.patch 2015-06-02 04:11:34 +0000
114+++ debian/patches/99_ltmain_as-needed.patch 1970-01-01 00:00:00 +0000
115@@ -1,35 +0,0 @@
116-Bug-Debian: http://bugs.debian.org/347650
117-Last-Update: 2011-06-14
118-
119-Index: file-roller-3.16.2/ltmain.sh
120-===================================================================
121---- file-roller-3.16.2.orig/ltmain.sh
122-+++ file-roller-3.16.2/ltmain.sh
123-@@ -7220,6 +7220,11 @@ func_mode_link ()
124- arg=$func_stripname_result
125- ;;
126-
127-+ -Wl,--as-needed|-Wl,--no-as-needed)
128-+ deplibs="$deplibs $arg"
129-+ continue
130-+ ;;
131-+
132- -Wl,*)
133- func_stripname '-Wl,' '' "$arg"
134- args=$func_stripname_result
135-@@ -7604,6 +7609,15 @@ func_mode_link ()
136- lib=
137- found=false
138- case $deplib in
139-+ -Wl,--as-needed|-Wl,--no-as-needed)
140-+ if test "$linkmode,$pass" = "prog,link"; then
141-+ compile_deplibs="$deplib $compile_deplibs"
142-+ finalize_deplibs="$deplib $finalize_deplibs"
143-+ else
144-+ deplibs="$deplib $deplibs"
145-+ fi
146-+ continue
147-+ ;;
148- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
149- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
150- if test prog,link = "$linkmode,$pass"; then
151
152=== modified file 'debian/patches/series'
153--- debian/patches/series 2015-06-02 04:11:34 +0000
154+++ debian/patches/series 2015-06-16 21:54:50 +0000
155@@ -1,3 +1,2 @@
156 01_package_names.patch
157-99_ltmain_as-needed.patch
158 bz_unity_headerbar.patch
159
160=== modified file 'debian/rules'
161--- debian/rules 2015-01-08 17:29:19 +0000
162+++ debian/rules 2015-06-16 21:54:50 +0000
163@@ -1,19 +1,20 @@
164 #!/usr/bin/make -f
165
166+include /usr/share/cdbs/1/rules/debhelper.mk
167 include /usr/share/cdbs/1/rules/autoreconf.mk
168-include /usr/share/cdbs/1/rules/debhelper.mk
169 include /usr/share/cdbs/1/class/gnome.mk
170 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
171 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
172
173 include /usr/share/gnome-pkg-tools/1/rules/make-compat-desktop-file.mk
174
175+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
176+
177+DEB_DH_AUTORECONF_ARGS = --as-needed
178+
179 DEB_MK_COMPAT_DESKTOP_file-roller := $(CURDIR)/debian/file-roller/usr/share/applications/org.gnome.FileRoller.desktop $(CURDIR)/debian/file-roller/usr/share/applications/file-roller.desktop
180
181-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
182-
183-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
184- --enable-magic
185+DEB_CONFIGURE_EXTRA_FLAGS += --enable-magic
186
187 DEB_DH_MAKESHLIBS_ARGS += --no-act
188

Subscribers

People subscribed via source and target branches

to all changes: