Bug#988112: unblock: gfsview/20121130+dfsg-7
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Dear release team,
please unblock package gfsview
Upload gfsview/20121130+dfsg-7 fixes RC-bug #987935.
I have enabled ci-pipelines to ensure the package functionality,
and now all tests are green [1]. Diff is attached.
[1] https://salsa.debian.org/science-team/gfsview/-/pipelines
unblock gfsview/20121130+dfsg-7
Best regards
Anton
-----BEGIN PGP SIGNATURE-----
iQJFBAEBCgAvFiEEu71F6oGKuG/2fnKF0+Fzg8+n/wYFAmCTAXcRHGdsYWRrQGRl
Ymlhbi5vcmcACgkQ0+Fzg8+n/wZocA/+O/2XDkjko0feJZzyA3WKmh3qymptclOi
jQU3RacssdCCvxlmQ0fusea6LJ0uC/779rZ8ps3dZ87+7zE5ZBeS6V/oo8rExgmO
uPE9Mjnt5sttzKCECpFD19O4DvGZF03JTFRvU2QpGJT4NPAgldmmwk8C2DJU+AM8
GWz9UTq2qIZ36znMNbgoKixqcPYklxgbD4ruAkaT9AGlv9+eEnzJL5RIuxb6YSBU
mn6np/tg/iXog7ZWgHgtYGkvzXpxctdDOYlxZ++UzcIL4Ro2vpdRnOXw1gn8ZJbP
0b5vK0I4HGrZuhlHOIdayGKjfTjNXlDM86UMjtlXTFzbMBBJTAdieBBlFEvfCfF3
EOBRLh1YMwk8n39oonxQuxs0svI2BywXO9u/eIlXU2PyMkfNKaVB3vCojV18ei/D
Ny7e+w6Jn7mkS5sQyELMy5cISA3G85Wg/lIL1HPr1WUioTvXYGv3XNfJivSoCT+v
vMwY2WC+wtYLE669gxeNIIw+K1H1z/8UYfOg9Pr3OvI+LxKcyUtGeTxx5ZPE0WUy
EgWNCezdFhqQWsD7rLw030n7Fbp4UlifTEtSCbX9Q0bZ4fcCq7tvPKMs4fFswugz
HEB6Y5y4lJy+MI72xO/ATzKCZgECqtQ3mGg7t9SisYrUZyC4id83XIKUZpjYUqAe
8vF0qAoKW14=
=Kv+6
-----END PGP SIGNATURE-----
diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
new file mode 100644
index 0000000..26871b9
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,2 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
diff --git a/debian/changelog b/debian/changelog
index 74725fa..1f11cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gfsview (20121130+dfsg-7) unstable; urgency=medium
+
+ * Team upload.
+ * [9fb3053] Add .gitlab-ci.yml
+ * [634d5c0] Link against X11. (Closes: #987935)
+
+ -- Anton Gladky <gladk@debian.org> Wed, 05 May 2021 22:03:32 +0200
+
gfsview (20121130+dfsg-6) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/02_use_system_gl2ps.patch b/debian/patches/02_use_system_gl2ps.patch
index 02c99c4..3f384f1 100644
--- a/debian/patches/02_use_system_gl2ps.patch
+++ b/debian/patches/02_use_system_gl2ps.patch
@@ -2,10 +2,10 @@ Description: use packaged gl2ps instead of embedded.
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2014-05-08
-Index: gfsview-snapshot-121130/Makefile.am
+Index: gfsview-20121130+dfsg/Makefile.am
===================================================================
---- gfsview-snapshot-121130.orig/Makefile.am
-+++ gfsview-snapshot-121130/Makefile.am
+--- gfsview-20121130+dfsg.orig/Makefile.am
++++ gfsview-20121130+dfsg/Makefile.am
@@ -26,12 +26,10 @@ if HAVE_GTK
INTERACTIVE = view
endif
@@ -20,10 +20,10 @@ Index: gfsview-snapshot-121130/Makefile.am
m4
if DARCS_CONTROLLED
-Index: gfsview-snapshot-121130/batch/Makefile.am
+Index: gfsview-20121130+dfsg/batch/Makefile.am
===================================================================
---- gfsview-snapshot-121130.orig/batch/Makefile.am
-+++ gfsview-snapshot-121130/batch/Makefile.am
+--- gfsview-20121130+dfsg.orig/batch/Makefile.am
++++ gfsview-20121130+dfsg/batch/Makefile.am
@@ -10,17 +10,15 @@ noinst_LTLIBRARIES = librender2D.la libr
librender2D_la_SOURCES = render.c render.h
@@ -44,10 +44,10 @@ Index: gfsview-snapshot-121130/batch/Makefile.am
bin_PROGRAMS = gfsview-batch2D gfsview-batch3D
-Index: gfsview-snapshot-121130/gl/gfsgl.h
+Index: gfsview-20121130+dfsg/gl/gfsgl.h
===================================================================
---- gfsview-snapshot-121130.orig/gl/gfsgl.h
-+++ gfsview-snapshot-121130/gl/gfsgl.h
+--- gfsview-20121130+dfsg.orig/gl/gfsgl.h
++++ gfsview-20121130+dfsg/gl/gfsgl.h
@@ -23,7 +23,7 @@
#include <gfs.h>
@@ -57,10 +57,10 @@ Index: gfsview-snapshot-121130/gl/gfsgl.h
#ifdef __cplusplus
extern "C" {
-Index: gfsview-snapshot-121130/view/Makefile.am
+Index: gfsview-20121130+dfsg/view/Makefile.am
===================================================================
---- gfsview-snapshot-121130.orig/view/Makefile.am
-+++ gfsview-snapshot-121130/view/Makefile.am
+--- gfsview-20121130+dfsg.orig/view/Makefile.am
++++ gfsview-20121130+dfsg/view/Makefile.am
@@ -26,23 +26,20 @@ SRC = \
glade/mangled_interface.c glade/interface.h \
glade/callbacks.c glade/callbacks.h \
@@ -72,7 +72,7 @@ Index: gfsview-snapshot-121130/view/Makefile.am
gfsview2D_SOURCES = $(SRC) gfkgl2D.h
gfsview2D_CFLAGS = @SN_CFLAGS@ @GTK_CFLAGS@ @GERRIS2D_CFLAGS@
-gfsview2D_LDADD = -L$(top_builddir)/gl2ps -lgl2ps \
-+gfsview2D_LDADD = -lgl2ps \
++gfsview2D_LDADD = -lgl2ps -lX11 \
-L$(top_builddir)/gl -lgfsgl2D \
@SN_LIBS@ @GTK_LIBS@ @GERRIS2D_LIBS@
-gfsview2D_DEPENDENCIES = $(top_builddir)/gl2ps/libgl2ps.la $(top_builddir)/gl/libgfsgl2D.la
@@ -80,17 +80,17 @@ Index: gfsview-snapshot-121130/view/Makefile.am
gfsview3D_SOURCES = $(SRC) gfkgl3D.h
gfsview3D_CFLAGS = @SN_CFLAGS@ @GTK_CFLAGS@ @GERRIS3D_CFLAGS@
-gfsview3D_LDADD = -L$(top_builddir)/gl2ps -lgl2ps \
-+gfsview3D_LDADD = -lgl2ps \
++gfsview3D_LDADD = -lgl2ps -lX11 \
-L$(top_builddir)/gl -lgfsgl3D \
@SN_LIBS@ @GTK_LIBS@ @GERRIS3D_LIBS@
-gfsview3D_DEPENDENCIES = $(top_builddir)/gl2ps/libgl2ps.la $(top_builddir)/gl/libgfsgl3D.la
glade/mangled_interface.c: $(srcdir)/glade/interface.c $(srcdir)/glade/interface.h
sh $(srcdir)/mangle < $(srcdir)/glade/interface.c > $(srcdir)/glade/mangled_interface.c
-Index: gfsview-snapshot-121130/configure.ac
+Index: gfsview-20121130+dfsg/configure.ac
===================================================================
---- gfsview-snapshot-121130.orig/configure.ac
-+++ gfsview-snapshot-121130/configure.ac
+--- gfsview-20121130+dfsg.orig/configure.ac
++++ gfsview-20121130+dfsg/configure.ac
@@ -138,7 +138,6 @@ AC_OUTPUT([
Makefile
view/Makefile
Reply to: