Control: tags 890980 + pending
Control: tags 906855 + patch
Control: tags 906855 + pending
Dear maintainer,
I've prepared an NMU for gnome-chemistry-utils (versioned as 0.14.17-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru gnome-chemistry-utils-0.14.17/debian/changelog gnome-chemistry-utils-0.14.17/debian/changelog
--- gnome-chemistry-utils-0.14.17/debian/changelog 2018-01-14 01:50:37.000000000 +0200
+++ gnome-chemistry-utils-0.14.17/debian/changelog 2018-10-28 01:35:58.000000000 +0300
@@ -1,3 +1,11 @@
+gnome-chemistry-utils (0.14.17-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with gnumeric >= 1.12.42.
+ * Drop the obsolete gcu-plugin. (Closes: #906855, #890980)
+
+ -- Adrian Bunk <[email protected]> Sun, 28 Oct 2018 01:35:58 +0300
+
gnome-chemistry-utils (0.14.17-1) unstable; urgency=medium
* New upstream release.
diff -Nru gnome-chemistry-utils-0.14.17/debian/control gnome-chemistry-utils-0.14.17/debian/control
--- gnome-chemistry-utils-0.14.17/debian/control 2018-01-14 01:50:31.000000000 +0200
+++ gnome-chemistry-utils-0.14.17/debian/control 2018-10-28 01:35:58.000000000 +0300
@@ -27,7 +27,6 @@
libtool (>= 2.2.6),
libx11-dev (>= 1.0.0),
libxml2-dev (>= 2.4.16),
- npapi-sdk-dev,
shared-mime-info (>= 0.12),
xsltproc,
zlib1g-dev | libz-dev
@@ -69,20 +68,6 @@
* a periodic table of the elements (GChemTable)
* a spectra viewer (GSpectrum)
-Package: gcu-plugin
-Architecture: any
-Depends: libgcu0v5 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
- ${vendor:Browser}
-Description: GNOME chemistry utils (browser plugin)
- The GNOME Chemistry Utils provide C++ classes and Gtk+-2 widgets
- related to chemistry. They will be used in future versions of both
- gcrystal and gchempaint.
- .
- This package provides a browser plugin for Gecko-based browsers.
- It does not (yet) work with WebKit-based browsers.
-
Package: gcrystal
Architecture: any
Depends: chemical-mime-data,
diff -Nru gnome-chemistry-utils-0.14.17/debian/gcu-plugin.install gnome-chemistry-utils-0.14.17/debian/gcu-plugin.install
--- gnome-chemistry-utils-0.14.17/debian/gcu-plugin.install 2016-10-03 13:58:51.000000000 +0300
+++ gnome-chemistry-utils-0.14.17/debian/gcu-plugin.install 1970-01-01 02:00:00.000000000 +0200
@@ -1,2 +0,0 @@
-usr/lib/*/gchemutils/chem-viewer
-usr/lib/*/mozilla/plugins/*.so
diff -Nru gnome-chemistry-utils-0.14.17/debian/patches/gnumeric-ftbfs.patch gnome-chemistry-utils-0.14.17/debian/patches/gnumeric-ftbfs.patch
--- gnome-chemistry-utils-0.14.17/debian/patches/gnumeric-ftbfs.patch 1970-01-01 02:00:00.000000000 +0200
+++ gnome-chemistry-utils-0.14.17/debian/patches/gnumeric-ftbfs.patch 2018-10-28 01:35:58.000000000 +0300
@@ -0,0 +1,47 @@
+Index: gchemutils/configure.ac
+===================================================================
+--- gchemutils/configure.ac (revision 2072)
++++ gchemutils/configure.ac (revision 2073)
+@@ -352,7 +352,7 @@
+ libspreadsheet=libspreadsheet-1.12
+ fi
+
+-PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.11.6], [build_gnumeric_plugin=yes],
++PKG_CHECK_MODULES(gnumeric, [$libspreadsheet >= 1.12.42], [build_gnumeric_plugin=yes],
+ [build_gnumeric_plugin=no])
+ dnl --without is not handled
+
+Index: gchemutils/gnumeric/functions.cc
+===================================================================
+--- gchemutils/gnumeric/functions.cc (revision 2072)
++++ gchemutils/gnumeric/functions.cc (revision 2073)
+@@ -195,23 +195,23 @@
+ const GnmFuncDescriptor Chemistry_functions[] = {
+
+ { N_("molarmass"), "s",
+- help_molarmass, gnumeric_molarmass, NULL, NULL, NULL,
++ help_molarmass, gnumeric_molarmass, NULL,
+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
+ { N_("monoisotopicmass"), "s",
+- help_monoisotopicmass, gnumeric_monoisotopicmass, NULL, NULL, NULL,
++ help_monoisotopicmass, gnumeric_monoisotopicmass, NULL,
+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
+ { N_("chemcomposition"), "ss",
+- help_chemcomposition, gnumeric_chemcomposition, NULL, NULL, NULL,
++ help_chemcomposition, gnumeric_chemcomposition, NULL,
+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
+ { N_("elementnumber"), "s",
+- help_elementnumber, gnumeric_elementnumber, NULL, NULL, NULL,
++ help_elementnumber, gnumeric_elementnumber, NULL,
+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
+ { N_("elementsymbol"), "f",
+- help_elementsymbol, gnumeric_elementsymbol, NULL, NULL, NULL,
++ help_elementsymbol, gnumeric_elementsymbol, NULL,
+ GNM_FUNC_SIMPLE, GNM_FUNC_IMPL_STATUS_COMPLETE, GNM_FUNC_TEST_STATUS_NO_TESTSUITE},
+
+
+- {NULL, NULL, NULL, NULL, NULL, NULL, NULL,
++ {NULL, NULL, NULL, NULL, NULL,
+ GNM_FUNC_IS_PLACEHOLDER, GNM_FUNC_IMPL_STATUS_UNIMPLEMENTED, GNM_FUNC_TEST_STATUS_NO_TESTSUITE}
+ };
+
diff -Nru gnome-chemistry-utils-0.14.17/debian/patches/series gnome-chemistry-utils-0.14.17/debian/patches/series
--- gnome-chemistry-utils-0.14.17/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ gnome-chemistry-utils-0.14.17/debian/patches/series 2018-10-28 01:35:58.000000000 +0300
@@ -0,0 +1 @@
+gnumeric-ftbfs.patch
diff -Nru gnome-chemistry-utils-0.14.17/debian/rules gnome-chemistry-utils-0.14.17/debian/rules
--- gnome-chemistry-utils-0.14.17/debian/rules 2018-01-14 01:50:31.000000000 +0200
+++ gnome-chemistry-utils-0.14.17/debian/rules 2018-10-28 01:35:58.000000000 +0300
@@ -17,7 +17,7 @@
override_dh_auto_configure: configure
dh_auto_configure -- \
--libexecdir=\$${libdir}/gchemutils \
- --with-mozilla-libdir=\$${libdir}/mozilla \
+ --disable-mozilla-plugin \
--without-kde-mime-dir \
--disable-update-databases \
--disable-scrollkeeper \
@@ -45,11 +45,3 @@
override_dh_strip:
dh_strip --dbgsym-migration='libgcu-dbg (<< 0.14.14~)'
-
-override_dh_gencontrol:
- dh_gencontrol -Ngcu-plugin
-ifneq (,$(filter Ubuntu,$(DEB_VENDOR)))
- dh_gencontrol -pgcu-plugin -- -Vvendor:Browser='firefox | seamonkey'
-else
- dh_gencontrol -pgcu-plugin -- -Vvendor:Browser='iceweasel | iceape'
-endif
