Package: libgtkdatabox
Version: 1:0.9.3.1-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for libgtkdatabox (versioned as 1:0.9.3.1-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru libgtkdatabox-0.9.3.1/debian/changelog
libgtkdatabox-0.9.3.1/debian/changelog
--- libgtkdatabox-0.9.3.1/debian/changelog 2019-01-13 12:50:01.000000000
+0100
+++ libgtkdatabox-0.9.3.1/debian/changelog 2020-12-12 14:19:46.000000000
+0100
@@ -1,3 +1,18 @@
+libgtkdatabox (1:0.9.3.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop libgtkdatabox0-libglade package and stop using ancient libglade2
+ (Closes: #653827, #967875)
+ * Drop libgtkdatabox0-glade package, there is a mix between GTK+2.0 and
+ GTK+3.0 headers when compiled with the newer version of glade. This fix a
+ FTBFS with glade 3.38 (Closes: #977184)
+ * Remove Ramakrishnan Muthukrishnan from the Uploaders list, thanks to him
+ for his past work on the package (Closes: #859284)
+ * debian/patches/cross.patch: Fix cross-compilation, thanks Helmut Grohne
+ for the patch (Closes: #894046)
+
+ -- Laurent Bigonville <bi...@debian.org> Sat, 12 Dec 2020 14:19:46 +0100
+
libgtkdatabox (1:0.9.3.1-1) unstable; urgency=medium
* New upstream version
diff -Nru libgtkdatabox-0.9.3.1/debian/control
libgtkdatabox-0.9.3.1/debian/control
--- libgtkdatabox-0.9.3.1/debian/control 2019-01-13 12:50:01.000000000
+0100
+++ libgtkdatabox-0.9.3.1/debian/control 2020-12-12 14:19:46.000000000
+0100
@@ -1,7 +1,6 @@
Source: libgtkdatabox
Maintainer: Debian Science Maintainers
<debian-science-maintain...@lists.alioth.debian.org>
-Uploaders: Ramakrishnan Muthukrishnan <rkrish...@debian.org>,
- Andreas Tille <ti...@debian.org>,
+Uploaders: Andreas Tille <ti...@debian.org>,
Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
Section: science
Priority: optional
@@ -10,9 +9,7 @@
libgtk2.0-dev,
libcairo2-dev,
libpango1.0-dev,
- gtk-doc-tools,
- libglade2-dev,
- libgladeui-dev
+ gtk-doc-tools
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/science-team/libgtkdatabox
Vcs-Git: https://salsa.debian.org/science-team/libgtkdatabox.git
@@ -67,56 +64,6 @@
coordinates, thus allowing you to easily create powerful applications for
data analysis.
-Package: libgtkdatabox0-glade
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libgtkdatabox-0.9.2-0-glade,
- libgtkdatabox-0.9.3-0-glade
-Replaces: libgtkdatabox-0.9.2-0-glade,
- libgtkdatabox-0.9.3-0-glade
-Description: Gtk+ library to display large amounts of numerical data (glade
API)
- One or more data sets of thousands of data points (X and Y coordinate) may be
- displayed and updated in split seconds. The widget is therefore used in many
- scientific and private projects that need to show quickly changing data live.
- GtkDatabox offers the ability to zoom into and out of the data and to navigate
- through your data by scrolling.
- .
- In addition to rulers and a simple coordinate cross, GtkDatabox now also
allows
- you to add one (or even more) configurable grids like on an oscilloscope.
- .
- Data may be presented as dots, lines connecting the data, or vertical bars.
- The widget allows you to easily transform pixel coordinates into data
- coordinates, thus allowing you to easily create powerful applications for
- data analysis.
- .
- Modules for GUI development with Glade3
-
-Package: libgtkdatabox0-libglade
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libgtkdatabox-0.9.2-0-libglade,
- libgtkdatabox-0.9.3-0-libglade
-Replaces: libgtkdatabox-0.9.2-0-libglade,
- libgtkdatabox-0.9.3-0-libglade
-Description: Gtk+ library to display large amounts of numerical data (glade
lib)
- One or more data sets of thousands of data points (X and Y coordinate) may be
- displayed and updated in split seconds. The widget is therefore used in many
- scientific and private projects that need to show quickly changing data live.
- GtkDatabox offers the ability to zoom into and out of the data and to navigate
- through your data by scrolling.
- .
- In addition to rulers and a simple coordinate cross, GtkDatabox now also
allows
- you to add one (or even more) configurable grids like on an oscilloscope.
- .
- Data may be presented as dots, lines connecting the data, or vertical bars.
- The widget allows you to easily transform pixel coordinates into data
- coordinates, thus allowing you to easily create powerful applications for
- data analysis.
- .
- Libraries for run-time GUI loading with libglade
-
Package: libgtkdatabox-doc
Architecture: all
Section: doc
diff -Nru libgtkdatabox-0.9.3.1/debian/patches/01_libglage_example.patch
libgtkdatabox-0.9.3.1/debian/patches/01_libglage_example.patch
--- libgtkdatabox-0.9.3.1/debian/patches/01_libglage_example.patch
2019-01-13 12:50:01.000000000 +0100
+++ libgtkdatabox-0.9.3.1/debian/patches/01_libglage_example.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-Description: Enable libglade example to work in any case
-
---- a/examples/basics_libglade.c
-+++ b/examples/basics_libglade.c
-@@ -31,20 +31,14 @@
- #include <gtkdatabox_cross_simple.h>
- #include <math.h>
-
--#include <config.h>
--
--#ifdef USE_LIBGLADE
- #include <glade/glade.h>
- #include "basics_libglade.h"
--#endif
-
- #define POINTS 2000
- #define STEPS 50
- #define BARS 25
- #define MARKER 10
-
--#ifdef USE_LIBGLADE
--
- /*----------------------------------------------------------------
- * databox basics
- *----------------------------------------------------------------*/
-@@ -212,16 +206,3 @@ main (gint argc, char *argv[])
-
- return 0;
- }
--
--#else /* USE_LIBGLADE */
--
--/* Build some dummy program if libglade is not used. */
--gint
--main ()
--{
-- g_printf
-- ("This program does nothing useful unless you call the configure script
with --enable-libglade\n");
-- return 0;
--}
--
--#endif /* USE_LIBGLADE */
diff -Nru libgtkdatabox-0.9.3.1/debian/patches/cross.patch
libgtkdatabox-0.9.3.1/debian/patches/cross.patch
--- libgtkdatabox-0.9.3.1/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ libgtkdatabox-0.9.3.1/debian/patches/cross.patch 2020-12-12
10:52:47.000000000 +0100
@@ -0,0 +1,42 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,7 +65,7 @@ if test x"$ac_cv_enable_libglade" = xyes
+ ac_cv_enable_libglade=yes, ac_cv_enable_libglade=no)
+ if test x"$ac_cv_enable_libglade" = xyes; then
+ AC_DEFINE(USE_LIBGLADE, 1, Define if you want libglade support)
+- libglade_moduledir=`pkg-config libglade-2.0
--variable=moduledir`
++ libglade_moduledir=`$PKG_CONFIG libglade-2.0
--variable=moduledir`
+ AC_DEFINE_UNQUOTED(LIBGLADE_MODULEDIR, [$libglade_moduledir],
[Libglade module directory])
+ else
+ AC_MSG_RESULT(not found)
+@@ -92,9 +92,9 @@ if test x"$ac_cv_enable_glade" = xyes; t
+ ac_cv_enable_glade=yes, ac_cv_enable_glade=no)
+ if test x"$ac_cv_enable_glade" = xyes; then
+ AC_DEFINE(USE_GLADE, 1, Define if you want glade interface
builder support)
+- glade_moduledir=`pkg-config gladeui-2.0 --variable=moduledir`
++ glade_moduledir=`$PKG_CONFIG gladeui-2.0 --variable=moduledir`
+ AC_DEFINE_UNQUOTED(GLADE_MODULEDIR, [$glade_moduledir],
[Glade-3 module directory])
+- glade_catalogdir=`pkg-config gladeui-2.0 --variable=catalogdir`
++ glade_catalogdir=`$PKG_CONFIG gladeui-2.0 --variable=catalogdir`
+ AC_DEFINE_UNQUOTED(GLADE_CATALOGDIR, [$glade_catalogdir],
[Glade-3 catalog directory])
+ else
+ AC_MSG_RESULT(not found)
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -67,7 +67,7 @@ AM_CFLAGS =\
+ -DGSEAL_ENABLED\
+ -DGTK_DISABLE_SINGLE_INCLUDES\
+ @LIBGLADE_CFLAGS@ \
+- `pkg-config gtk+-2.0 --cflags`
++ `@PKG_CONFIG@ gtk+-2.0 --cflags`
+
+
+ LDADD = $(top_builddir)/gtk/libgtkdatabox.la\
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -61,4 +61,4 @@ AM_CFLAGS =\
+ -DGTK_DISABLE_DEPRECATED\
+ -DGTK_MULTIHEAD_SAFE=1\
+ -DGTK_DISABLE_SINGLE_INCLUDES\
+- `pkg-config gtk+-2.0 --cflags`
++ `@PKG_CONFIG@ gtk+-2.0 --cflags`
diff -Nru libgtkdatabox-0.9.3.1/debian/patches/series
libgtkdatabox-0.9.3.1/debian/patches/series
--- libgtkdatabox-0.9.3.1/debian/patches/series 2019-01-13 12:50:01.000000000
+0100
+++ libgtkdatabox-0.9.3.1/debian/patches/series 2020-12-12 14:13:11.000000000
+0100
@@ -1,5 +1,5 @@
-01_libglage_example.patch
04_missing_includes.patch
05_explicit_link_libm.patch
06_gladeui-2.0.patch
proper_soname.patch
+cross.patch
diff -Nru libgtkdatabox-0.9.3.1/debian/rules libgtkdatabox-0.9.3.1/debian/rules
--- libgtkdatabox-0.9.3.1/debian/rules 2019-01-13 12:50:01.000000000 +0100
+++ libgtkdatabox-0.9.3.1/debian/rules 2020-12-12 14:19:46.000000000 +0100
@@ -11,8 +11,6 @@
include /usr/share/dpkg/default.mk
devpkg := $(shell grep -- "-dev" debian/control | sed -n 's/^Package: //p' |
head -n 1)
docpkg := $(shell grep -- "-doc" debian/control | sed -n 's/^Package: //p' |
head -n 1)
-gladepkg := $(shell grep -- "-glade" debian/control | sed -n 's/^Package: //p'
| head -n 1)
-libglade := $(shell grep -- "-libglade" debian/control | sed -n 's/^Package:
//p' | head -n 1)
%:
dh $@
@@ -20,8 +18,6 @@
DEB_INSTALL_DOCS_ALL := AUTHORS README
DEB_CONFIGURE_EXTRA_FLAGS += \
- --enable-libglade \
- --enable-glade \
--enable-gtk-doc
override_dh_auto_configure:
@@ -37,10 +33,6 @@
mkdir -p debian/$(devpkg)/usr/share/doc/$(devpkg)/examples
cp -a examples/*.[ch] examples/*.glade
debian/$(devpkg)/usr/share/doc/$(devpkg)/examples
cp -a debian/Makefile.testdatabox
debian/$(devpkg)/usr/share/doc/$(devpkg)/examples/Makefile
- # Same here for the other binary packages to avoid renaming
- dh_install -p$(gladepkg) usr/share/glade/catalogs/gtkdatabox.xml
- dh_install -p$(gladepkg)
usr/lib/$(DEB_HOST_MULTIARCH)/glade/modules/libgladedatabox.*
- dh_install -p$(libglade) usr/lib/*/libglade/2.0/libdatabox.*
# Call d-shlibmove to comply with library packaging guide
d-shlibmove --commit \
