New upstream snapshot.debian/4.0.0+20160726+6783d29-1

17 files changed, 60 insertions, 129 deletions

diff --git a/debian/changelog b/debian/changelog
index 779e212..d680b48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+seed-webkit2 (4.0.0+20160726+6783d29-1) unstable; urgency=medium
+
+  [ Gustavo Noronha Silva ]
+  * New upstream snapshot.
+  * Drop old patches.
+  * Rename package to seed-webkit2.
+
+  [ Andrew Shadura ]
+  * Add myself to Uploaders.
+
+ -- Andrew Shadura <andrewsh@debian.org>  Wed, 21 Sep 2016 13:45:32 +0200
+
 seed (3.8.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..55188e8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+jsextensions/Seed.js
+jsextensions/libseed-resources.c
diff --git a/debian/control b/debian/control
index c9165ba..c364ddd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
-Source: seed
+Source: seed-webkit2
 Section: interpreters
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
@@ -14,7 +13,7 @@ Build-Depends: debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libffi-dev (>= 3.0),
-               libwebkitgtk-3.0-dev (>= 1.5.2),
+               libwebkit2gtk-4.0-dev,
                libgirepository1.0-dev (>= 0.10.0),
                gir1.2-glib-2.0,
                gnome-js-common,
@@ -29,17 +28,18 @@ Build-Depends: debhelper (>= 8),
                libxml2-dev,
                libmpfr-dev,
                gtk-doc-tools (>= 1.9)
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Andrew Shadura <andrewsh@debian.org>
 Standards-Version: 3.9.4
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/seed
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seed
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/seed.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/seed.git
 Homepage: https://wiki.gnome.org/Seed
 
-Package: seed
+Package: seed-webkit2
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libseed-gtk3-0 (= ${binary:Version})
+         libseed-gtk4-0 (= ${binary:Version})
+Conflicts: seed
 Description: GObject JavaScript bindings for the webkit engine - Interpreter
  Seed is a library and interpreter, dynamically bridging (through
  GObjectIntrospection) the WebKit JavaScriptCore engine, with the GNOME
@@ -50,7 +50,7 @@ Description: GObject JavaScript bindings for the webkit engine - Interpreter
  This package contains the interpreter itself, for use by the scripts
  using seed as a shebang.
 
-Package: libseed-gtk3-0
+Package: libseed-gtk4-0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -58,7 +58,7 @@ Depends: ${shlibs:Depends},
          gnome-js-common,
          gir1.2-glib-2.0,
          gir1.2-clutter-1.0,
-         gir1.2-gstreamer-0.10,
+         gir1.2-gstreamer-1.0,
          gir1.2-gtk-3.0
 Description: GObject JavaScript bindings for the webkit engine - Runtime
  Seed is a library and interpreter, dynamically bridging (through
@@ -71,16 +71,16 @@ Description: GObject JavaScript bindings for the webkit engine - Runtime
  programs embedding the Seed interpreter.
 
 
-Package: libseed-gtk3-dev
+Package: libseed-gtk4-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libseed-gtk3-0 (= ${binary:Version}),
-         libwebkitgtk-3.0-dev,
+         libseed-gtk4-0 (= ${binary:Version}),
+         libwebkit2gtk-4.0-dev,
          libgirepository1.0-dev (>= 0.10.0),
          libglib2.0-dev
 Recommends: python
-Suggests: seed-doc
+Suggests: seed-webkit2-doc
 Conflicts: libseed-dev
 Description: GObject JavaScript bindings for the webkit engine - Development
  Seed is a library and interpreter, dynamically bridging (through
@@ -92,10 +92,11 @@ Description: GObject JavaScript bindings for the webkit engine - Development
  This package contains the static libraries and development headers,
  needed to build programs using the Seed interpreter.
 
-Package: seed-doc
+Package: seed-webkit2-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: seed-doc
 Description: GObject JavaScript bindings for the webkit engine - Documentation
  Seed is a library and interpreter, dynamically bridging (through
  GObjectIntrospection) the WebKit JavaScriptCore engine, with the GNOME
diff --git a/debian/control.in b/debian/control.in
index 25b621a..6b13d99 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: seed
+Source: seed-webkit2
 Section: interpreters
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libffi-dev (>= 3.0),
-               libwebkitgtk-3.0-dev (>= 1.5.2),
+               libwebkit2gtk-4.0-dev,
                libgirepository1.0-dev (>= 0.10.0),
                gir1.2-glib-2.0,
                gnome-js-common,
@@ -24,17 +24,18 @@ Build-Depends: debhelper (>= 8),
                libxml2-dev,
                libmpfr-dev,
                gtk-doc-tools (>= 1.9)
-Uploaders: @GNOME_TEAM@
+Uploaders: @GNOME_TEAM@, Andrew Shadura <andrewsh@debian.org>
 Standards-Version: 3.9.4
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/seed
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seed
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/seed.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/seed.git
 Homepage: https://wiki.gnome.org/Seed
 
-Package: seed
+Package: seed-webkit2
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libseed-gtk3-0 (= ${binary:Version})
+         libseed-gtk4-0 (= ${binary:Version})
+Conflicts: seed
 Description: GObject JavaScript bindings for the webkit engine - Interpreter
  Seed is a library and interpreter, dynamically bridging (through
  GObjectIntrospection) the WebKit JavaScriptCore engine, with the GNOME
@@ -45,7 +46,7 @@ Description: GObject JavaScript bindings for the webkit engine - Interpreter
  This package contains the interpreter itself, for use by the scripts
  using seed as a shebang.
 
-Package: libseed-gtk3-0
+Package: libseed-gtk4-0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -53,7 +54,7 @@ Depends: ${shlibs:Depends},
          gnome-js-common,
          gir1.2-glib-2.0,
          gir1.2-clutter-1.0,
-         gir1.2-gstreamer-0.10,
+         gir1.2-gstreamer-1.0,
          gir1.2-gtk-3.0
 Description: GObject JavaScript bindings for the webkit engine - Runtime
  Seed is a library and interpreter, dynamically bridging (through
@@ -66,16 +67,16 @@ Description: GObject JavaScript bindings for the webkit engine - Runtime
  programs embedding the Seed interpreter.
 
 
-Package: libseed-gtk3-dev
+Package: libseed-gtk4-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libseed-gtk3-0 (= ${binary:Version}),
-         libwebkitgtk-3.0-dev,
+         libseed-gtk4-0 (= ${binary:Version}),
+         libwebkit2gtk-4.0-dev,
          libgirepository1.0-dev (>= 0.10.0),
          libglib2.0-dev
 Recommends: python
-Suggests: seed-doc
+Suggests: seed-webkit2-doc
 Conflicts: libseed-dev
 Description: GObject JavaScript bindings for the webkit engine - Development
  Seed is a library and interpreter, dynamically bridging (through
@@ -87,10 +88,11 @@ Description: GObject JavaScript bindings for the webkit engine - Development
  This package contains the static libraries and development headers,
  needed to build programs using the Seed interpreter.
 
-Package: seed-doc
+Package: seed-webkit2-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: seed-doc
 Description: GObject JavaScript bindings for the webkit engine - Documentation
  Seed is a library and interpreter, dynamically bridging (through
  GObjectIntrospection) the WebKit JavaScriptCore engine, with the GNOME
diff --git a/debian/libseed-gtk3-0.install b/debian/libseed-gtk3-0.install
deleted file mode 100644
index 22d291c..0000000
--- a/debian/libseed-gtk3-0.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/seed-gtk3/*.so
-usr/lib/lib*.so.*
-usr/share/seed-gtk3
diff --git a/debian/libseed-gtk4-0.install b/debian/libseed-gtk4-0.install
new file mode 100644
index 0000000..71df752
--- /dev/null
+++ b/debian/libseed-gtk4-0.install
@@ -0,0 +1,10 @@
+usr/lib/seed-gtk*/*.so
+usr/lib/lib*.so.*
+usr/share/seed-gtk*
+
+usr/lib/seed-gtk*/girepository-1.0
+usr/lib/seed-gtk*/girepository-1.0/GjsPrivate-1.0.typelib
+
+usr/lib/libseed_gjsprivate.so
+usr/lib/seed-gtk*/gjs/*.so
+
diff --git a/debian/libseed-gtk3-dev.install b/debian/libseed-gtk4-dev.install
index ffd00b6..e8274c0 100644
--- a/debian/libseed-gtk3-dev.install
+++ b/debian/libseed-gtk4-dev.install
@@ -1,5 +1,5 @@
 usr/lib/pkgconfig
 usr/include
-usr/lib/lib*.so
+usr/lib/libseed-gtk*.so
 usr/lib/lib*.a
 modules/dbus/dbus2js.py usr/share/seed-gtk3
diff --git a/debian/patches/fix_autogen_and_configure.patch b/debian/patches/fix_autogen_and_configure.patch
deleted file mode 100644
index 393c88e..0000000
--- a/debian/patches/fix_autogen_and_configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 24c5968e2ae3bdc49811329fa722035dba76db01 Mon Sep 17 00:00:00 2001
-From: Seán de Búrca <leftmostcat@gmail.com>
-Date: Mon, 26 Aug 2013 21:16:45 +0000
-Subject: Fix autogen and configure
-
-https://bugzilla.gnome.org/show_bug.cgi?id=706833
----
-diff --git a/configure.ac b/configure.ac
-index f741f24..ddcab40 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,6 +4,7 @@ AC_INIT(seed, 3.8.2)
- AM_INIT_AUTOMAKE([1.7 -Wno-portability])
- AM_MAINTAINER_MODE([enable])
- AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CANONICAL_HOST
- 
---
-cgit v0.9.2
diff --git a/debian/patches/fix_format.patch b/debian/patches/fix_format.patch
deleted file mode 100644
index aa009a4..0000000
--- a/debian/patches/fix_format.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS when compiled -Werror=format-security flag
-Author: Laurent Bigonville <bigon@debian.org>
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710658
-
---- a/libseed/seed-types.c
-+++ b/libseed/seed-types.c
-@@ -1211,10 +1211,8 @@ seed_value_from_gi_argument_full (JSCont
-         if ((key_type_tag != GI_TYPE_TAG_UTF8) &&
-             (key_type_tag != GI_TYPE_TAG_FILENAME))
-           {
--            char *error_message = g_strdup_printf ("Unable to make object from hash table indexed with values of type %s", g_type_tag_to_string (key_type_tag));
-             seed_make_exception (ctx, exception, "ArgumentError",
--                                 error_message);
--            g_free (error_message);
-+                                 "Unable to make object from hash table indexed with values of type %s", g_type_tag_to_string (key_type_tag));
-             return JSValueMakeNull (ctx);
-           }
- 
diff --git a/debian/patches/link_gmodule.patch b/debian/patches/link_gmodule.patch
deleted file mode 100644
index 6d41dee..0000000
--- a/debian/patches/link_gmodule.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Explicitly link against libgmodule-2.0
-Author: Laurent Bigonville <bigon@debian.org>
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710670
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -128,6 +128,9 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
- dnl ========================GIO================================================
- PKG_CHECK_MODULES(GIO, gio-2.0)
- 
-+dnl ========================GModule================================================
-+PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
-+
- dnl =============================Modules=======================================
- dnl ==== canvas ====
- AC_ARG_ENABLE(canvas-module,
---- a/libseed/Makefile.am
-+++ b/libseed/Makefile.am
-@@ -44,6 +44,7 @@ libseed@SEED_GTK_VERSION@_la_LIBADD = \
- 	$(SEED_PROFILE_LIBS) \
- 	$(SEED_OSX_LIBS) \
- 	$(GIO_LIBS) \
-+	$(GMODULE_LIBS) \
- 	$(FFI_LIBS) -ldl
- 
- seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a302b12..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-fix_format.patch
-link_gmodule.patch
-fix_autogen_and_configure.patch
-typedef_int_Function_readline.patch
diff --git a/debian/patches/typedef_int_Function_readline.patch b/debian/patches/typedef_int_Function_readline.patch
deleted file mode 100644
index a345758..0000000
--- a/debian/patches/typedef_int_Function_readline.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cf772e792fd64f70ee2c714e0b5eaf527ce35467 Mon Sep 17 00:00:00 2001
-From: Alan Knowles <alan@roojs.com>
-Date: Tue, 25 Mar 2014 18:14:03 +0800
-Subject: Fix Bug 725602 - typedef int Function () is removed in readline 6.3
-
-as per readline documents use rl_command_func_t
-
-diff --git a/modules/readline/seed-readline.c b/modules/readline/seed-readline.c
-index cd5ecfe..49d1faa 100644
---- a/modules/readline/seed-readline.c
-+++ b/modules/readline/seed-readline.c
-@@ -77,7 +77,7 @@ seed_readline_bind(SeedContext ctx,
-   key = seed_value_to_string(ctx, arguments[0], exception);
-   c = seed_make_rl_closure((SeedObject) arguments[1]);
- 
--  rl_bind_key(*key, (Function *) c);
-+  rl_bind_key(*key, (rl_command_func_t *) c);
- 
-   g_free(key);
- 
--- 
-cgit v0.10.1
-
diff --git a/debian/rules b/debian/rules
index ee1bb9b..c27ddd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@ include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_COMPRESS_EXCLUDE += js ui
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-webkit=3.0
+DEB_CONFIGURE_EXTRA_FLAGS = --with-webkit=4.0
 
-DEB_INSTALL_EXAMPLES_seed-doc += -XCOPYING
+DEB_INSTALL_EXAMPLES_seed-webkit2-doc += -XCOPYING
 
-DEB_DH_MAKESHLIBS_ARGS += -V 'libseed-gtk3-0'
+DEB_DH_MAKESHLIBS_ARGS += -V 'libseed-gtk4-0'
diff --git a/debian/seed-doc.install b/debian/seed-doc.install
deleted file mode 100644
index 95af827..0000000
--- a/debian/seed-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/gtk-doc
diff --git a/debian/seed-doc.docs b/debian/seed-webkit2-doc.docs
index 28a4415..28a4415 100644
--- a/debian/seed-doc.docs
+++ b/debian/seed-webkit2-doc.docs
diff --git a/debian/seed-doc.examples b/debian/seed-webkit2-doc.examples
index 22a3bc5..22a3bc5 100644
--- a/debian/seed-doc.examples
+++ b/debian/seed-webkit2-doc.examples
diff --git a/debian/seed.install b/debian/seed-webkit2.install
index a65408f..a65408f 100644
--- a/debian/seed.install
+++ b/debian/seed-webkit2.install