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

[Jackson Doak]

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

[Robert Ancell (robert-ancell)]

Thanks Jackson!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-02 04:11:34 +0000
+++ debian/changelog	2015-06-16 21:54:50 +0000
@@ -1,3 +1,36 @@
+file-roller (3.16.2-2ubuntu1) wily; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - Make a compatibility desktop file for upgraders
+    - Use ubuntu VCS in d/control
+    - Depend on zip and unzip instead of p7zip-full which is in universe
+    - Suggest p7zip-full (LP: #918107)
+    - Recommend sessioninstaller
+    - Drop unar to suggests
+    - Add patch to not use GtkHeaderBar in Unity
+
+ -- Jackson Doak <[e-mail]>  Wed, 17 Jun 2015 07:35:31 +1000
+
+file-roller (3.16.2-2) unstable; urgency=medium
+
+  * 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. (Closes: #788690)
+
+ -- Michael Biebl <[e-mail]>  Mon, 15 Jun 2015 14:56:52 +0200
+
+file-roller (3.16.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop obsolete --disable-scrollkeeper configure flag.
+  * Drop obsolete Replaces from pre-wheezy.
+  * Point Homepage: URL to the more up-to-date GNOME wiki page.
+  * Bump debhelper compatibility level to 9.
+  * Use dh-autoreconf --as-needed instead of patching ltmain.sh.
+
+ -- Michael Biebl <[e-mail]>  Thu, 28 May 2015 02:59:25 +0200
+
 file-roller (3.16.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release 

=== modified file 'debian/compat'
--- debian/compat	2011-11-15 04:45:53 +0000
+++ debian/compat	2015-06-16 21:54:50 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2015-02-02 13:59:23 +0000
+++ debian/control	2015-06-16 21:54:50 +0000
@@ -7,11 +7,11 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>, Sjoerd Simons <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 8),
+               debhelper (>= 9),
+               dh-autoreconf,
                desktop-file-utils,
-               dh-autoreconf,
                gettext,
                gnome-pkg-tools (>= 0.19.4ubuntu1~),
                intltool (>= 0.40.0),
@@ -25,12 +25,11 @@
                yelp-tools
 Standards-Version: 3.9.6
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/file-roller/ubuntu
-Homepage: http://fileroller.sourceforge.net/
+Homepage: https://wiki.gnome.org/Apps/FileRoller
 
 Package: file-roller
 Architecture: any
 Depends: bzip2,
-         nautilus-data (>= 3.0),
          unzip,
          zip,
          ${misc:Depends},

=== modified file 'debian/control.in'
--- debian/control.in	2015-02-02 13:59:23 +0000
+++ debian/control.in	2015-06-16 21:54:50 +0000
@@ -5,9 +5,9 @@
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 8),
+               debhelper (>= 9),
+               dh-autoreconf,
                desktop-file-utils,
-               dh-autoreconf,
                gettext,
                gnome-pkg-tools (>= 0.19.4ubuntu1~),
                intltool (>= 0.40.0),
@@ -21,12 +21,11 @@
                yelp-tools
 Standards-Version: 3.9.6
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/file-roller/ubuntu
-Homepage: http://fileroller.sourceforge.net/
+Homepage: https://wiki.gnome.org/Apps/FileRoller
 
 Package: file-roller
 Architecture: any
 Depends: bzip2,
-         nautilus-data (>= 3.0),
          unzip,
          zip,
          ${misc:Depends},

=== removed file 'debian/patches/99_ltmain_as-needed.patch'
--- debian/patches/99_ltmain_as-needed.patch	2015-06-02 04:11:34 +0000
+++ debian/patches/99_ltmain_as-needed.patch	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-Bug-Debian: http://bugs.debian.org/347650
-Last-Update: 2011-06-14
-
-Index: file-roller-3.16.2/ltmain.sh
-===================================================================
---- file-roller-3.16.2.orig/ltmain.sh
-+++ file-roller-3.16.2/ltmain.sh
-@@ -7220,6 +7220,11 @@ func_mode_link ()
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,--as-needed|-Wl,--no-as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -7604,6 +7609,15 @@ func_mode_link ()
- 	lib=
- 	found=false
- 	case $deplib in
-+	-Wl,--as-needed|-Wl,--no-as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test prog,link = "$linkmode,$pass"; then

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-06-02 04:11:34 +0000
+++ debian/patches/series	2015-06-16 21:54:50 +0000
@@ -1,3 +1,2 @@
 01_package_names.patch
-99_ltmain_as-needed.patch
 bz_unity_headerbar.patch

=== modified file 'debian/rules'
--- debian/rules	2015-01-08 17:29:19 +0000
+++ debian/rules	2015-06-16 21:54:50 +0000
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 include /usr/share/gnome-pkg-tools/1/rules/make-compat-desktop-file.mk
 
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_DH_AUTORECONF_ARGS = --as-needed
+
 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
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
-			     --enable-magic
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-magic
 
 DEB_DH_MAKESHLIBS_ARGS += --no-act