[mozjs-128] fix packaging

debian/control

@@ -59,7 +59,7 @@ Description: Mozilla-based javascript bindings for the Cinnamon platform
 Package: libcjs-dbg
 Section: debug
 Architecture: any
-Priority: extra
+Priority: optional
 Depends:
  libcjs0 (= ${binary:Version}),
  ${misc:Depends},

debian/copyright

@@ -1,14 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://download.gnome.org/sources/gjs/
-Comment:
- This work was packaged for Debian by:
- .
-    Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> on Mon, 12 Oct 2009 18:38:36 -0300
- .
- Upstream Author:
- .
-         litl, LLC
-Upstream-Name: gjs
+Upstream-Name: cjs
+Upstream-Contact: Clement Lefebvre <clement.lefebvre@linuxmint.com>
+Source: https://github.com/linuxmint/cjs
 
 Files: *
 Copyright:

debian/gbp.conf

@@ -1,17 +1,5 @@
-[DEFAULT]
-pristine-tar = True
-debian-branch = debian/latest
-upstream-branch = upstream/latest
-upstream-vcs-tag = %(version)s
-
 [buildpackage]
 sign-tags = True
 
 [dch]
 multimaint-merge = True
-
-[import-orig]
-postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
-
-[pq]
-patch-numbers = False

debian/libcjs0.symbols

@@ -1,92 +1,92 @@
 libcjs.so.0 libcjs0 #MINVER#
 * Build-Depends-Package: libcjs-dev
- gjs_bindtextdomain@Base 1.63.90
- gjs_cairo_pdf_surface_proto_props@Base 1.70.0
- gjs_clear_terminal@Base 1.70.0
- gjs_console_clear@Base 1.70.0
- gjs_console_is_tty@Base 1.70.0
- gjs_context_define_string_array@Base 1.63.90
- gjs_context_eval@Base 1.63.90
- gjs_context_eval_file@Base 1.63.90
- gjs_context_eval_module@Base 1.67.2
- gjs_context_eval_module_file@Base 1.67.2
- gjs_context_gc@Base 1.63.90
- gjs_context_get_all@Base 1.63.90
- gjs_context_get_current@Base 1.63.90
- gjs_context_get_native_context@Base 1.63.90
- gjs_context_get_profiler@Base 1.63.90
- gjs_context_get_type@Base 1.63.90
- gjs_context_make_current@Base 1.63.90
- gjs_context_maybe_gc@Base 1.63.90
- gjs_context_new@Base 1.63.90
- gjs_context_new_with_search_path@Base 1.63.90
- gjs_context_print_stack_stderr@Base 1.63.90
- gjs_context_register_module@Base 1.67.2
- gjs_context_run_in_realm@Base 1.77.90
- gjs_context_set_argv@Base 1.67.2
- gjs_context_setup_debugger_console@Base 1.63.90
- gjs_coverage_enable@Base 1.65.90
- gjs_coverage_get_type@Base 1.70.0
- gjs_coverage_new@Base 1.63.90
- gjs_coverage_write_statistics@Base 1.63.90
- gjs_dbus_implementation_emit_property_changed@Base 1.63.90
- gjs_dbus_implementation_emit_signal@Base 1.63.90
- gjs_dbus_implementation_get_type@Base 1.63.90
- gjs_dbus_implementation_unexport@Base 1.71.1
- gjs_dbus_implementation_unexport_from_connection@Base 1.71.1
- gjs_dumpstack@Base 1.63.90
- gjs_error_quark@Base 1.63.90
- gjs_format_int_alternative_output@Base 1.63.90
- gjs_g_binding_group_bind_full@Base 1.73.2
- gjs_g_object_bind_property_full@Base 1.70.0
- gjs_get_js_version@Base 1.63.90
- gjs_gobject_class_info@Base 1.70.0
- gjs_gobject_interface_info@Base 1.70.0
- gjs_gtk_container_child_set_property@Base 1.63.90
- gjs_gtk_custom_sorter_new@Base 1.71.1
- gjs_gtk_custom_sorter_set_sort_func@Base 1.71.1
- gjs_importer_class@Base 1.70.0
- gjs_importer_proto_funcs@Base 1.70.0
- gjs_js_error_get_type@Base 1.63.90
- gjs_js_error_quark@Base 1.63.90
- gjs_list_store_insert_sorted@Base 1.70.0
- gjs_list_store_sort@Base 1.70.0
- gjs_locale_category_get_type@Base 1.63.90
- gjs_log_set_writer_default@Base 1.70.0
- gjs_log_set_writer_func@Base 1.70.0
- gjs_match_info_expand_references@Base 1.81.2
- gjs_match_info_fetch@Base 1.81.2
- gjs_match_info_fetch_all@Base 1.81.2
- gjs_match_info_fetch_named@Base 1.81.2
- gjs_match_info_fetch_named_pos@Base 1.81.2
- gjs_match_info_fetch_pos@Base 1.81.2
- gjs_match_info_free@Base 1.81.2
- gjs_match_info_get_match_count@Base 1.81.2
- gjs_match_info_get_regex@Base 1.81.2
- gjs_match_info_get_string@Base 1.81.2
- gjs_match_info_get_type@Base 1.81.2
- gjs_match_info_is_partial_match@Base 1.81.2
- gjs_match_info_matches@Base 1.81.2
- gjs_match_info_next@Base 1.81.2
- gjs_match_info_ref@Base 1.81.2
- gjs_match_info_unref@Base 1.81.2
- gjs_memory_report@Base 1.63.90
- gjs_native_promise_module_funcs@Base 1.71.1
- gjs_param_class@Base 1.70.0
- gjs_param_spec_get_flags@Base 1.63.90
- gjs_param_spec_get_owner_type@Base 1.63.90
- gjs_param_spec_get_value_type@Base 1.63.90
- gjs_profiler_chain_signal@Base 1.63.90
- gjs_profiler_get_type@Base 1.63.90
- gjs_profiler_set_capture_writer@Base 1.67.2
- gjs_profiler_set_fd@Base 1.63.90
- gjs_profiler_set_filename@Base 1.63.90
- gjs_profiler_start@Base 1.63.90
- gjs_profiler_stop@Base 1.63.90
- gjs_regex_match@Base 1.81.2
- gjs_regex_match_all@Base 1.81.2
- gjs_regex_match_all_full@Base 1.81.2
- gjs_regex_match_full@Base 1.81.2
- gjs_repo_class@Base 1.70.0
- gjs_setlocale@Base 1.63.90
- gjs_textdomain@Base 1.63.90
+ gjs_bindtextdomain@Base 2.4.1
+ gjs_cairo_pdf_surface_proto_props@Base 5.4.0
+ gjs_clear_terminal@Base 5.4.0
+ gjs_console_clear@Base 5.4.0
+ gjs_console_is_tty@Base 5.4.0
+ gjs_context_define_string_array@Base 2.0.0
+ gjs_context_eval@Base 2.0.0
+ gjs_context_eval_file@Base 2.0.0
+ gjs_context_eval_module@Base 5.4.0
+ gjs_context_eval_module_file@Base 5.4.0
+ gjs_context_gc@Base 2.0.0
+ gjs_context_get_all@Base 2.0.0
+ gjs_context_get_current@Base 2.4.1
+ gjs_context_get_native_context@Base 2.0.0
+ gjs_context_get_profiler@Base 4.0.0
+ gjs_context_get_type@Base 2.0.0
+ gjs_context_make_current@Base 2.4.1
+ gjs_context_maybe_gc@Base 2.0.0
+ gjs_context_new@Base 2.0.0
+ gjs_context_new_with_search_path@Base 2.0.0
+ gjs_context_print_stack_stderr@Base 2.0.0
+ gjs_context_register_module@Base 5.4.0
+ gjs_context_run_in_realm@Base 6.0.0
+ gjs_context_set_argv@Base 5.4.0
+ gjs_context_setup_debugger_console@Base 4.6.0
+ gjs_coverage_enable@Base 4.6.0
+ gjs_coverage_get_type@Base 5.4.0
+ gjs_coverage_new@Base 2.4.1
+ gjs_coverage_write_statistics@Base 2.4.1
+ gjs_dbus_implementation_emit_property_changed@Base 2.0.0
+ gjs_dbus_implementation_emit_signal@Base 2.0.0
+ gjs_dbus_implementation_get_type@Base 2.0.0
+ gjs_dbus_implementation_unexport@Base 5.7.0
+ gjs_dbus_implementation_unexport_from_connection@Base 5.7.0
+ gjs_dumpstack@Base 2.0.0
+ gjs_error_quark@Base 2.0.0
+ gjs_format_int_alternative_output@Base 2.4.1
+ gjs_g_binding_group_bind_full@Base 5.7.0
+ gjs_g_object_bind_property_full@Base 5.4.0
+ gjs_get_js_version@Base 4.0.0
+ gjs_gobject_class_info@Base 5.4.0
+ gjs_gobject_interface_info@Base 5.4.0
+ gjs_gtk_container_child_set_property@Base 2.4.1
+ gjs_gtk_custom_sorter_new@Base 5.7.0
+ gjs_gtk_custom_sorter_set_sort_func@Base 5.7.0
+ gjs_importer_class@Base 5.4.0
+ gjs_importer_proto_funcs@Base 5.4.0
+ gjs_js_error_get_type@Base 4.0.0
+ gjs_js_error_quark@Base 4.0.0
+ gjs_list_store_insert_sorted@Base 5.4.0
+ gjs_list_store_sort@Base 5.4.0
+ gjs_locale_category_get_type@Base 3.4.4
+ gjs_log_set_writer_default@Base 5.4.0
+ gjs_log_set_writer_func@Base 5.4.0
+ gjs_match_info_expand_references@Base 6.5.0
+ gjs_match_info_fetch@Base 6.5.0
+ gjs_match_info_fetch_all@Base 6.5.0
+ gjs_match_info_fetch_named@Base 6.5.0
+ gjs_match_info_fetch_named_pos@Base 6.5.0
+ gjs_match_info_fetch_pos@Base 6.5.0
+ gjs_match_info_free@Base 6.5.0
+ gjs_match_info_get_match_count@Base 6.5.0
+ gjs_match_info_get_regex@Base 6.5.0
+ gjs_match_info_get_string@Base 6.5.0
+ gjs_match_info_get_type@Base 6.5.0
+ gjs_match_info_is_partial_match@Base 6.5.0
+ gjs_match_info_matches@Base 6.5.0
+ gjs_match_info_next@Base 6.5.0
+ gjs_match_info_ref@Base 6.5.0
+ gjs_match_info_unref@Base 6.5.0
+ gjs_memory_report@Base 2.0.0
+ gjs_native_promise_module_funcs@Base 5.7.0
+ gjs_param_class@Base 5.4.0
+ gjs_param_spec_get_flags@Base 3.4.4
+ gjs_param_spec_get_owner_type@Base 3.4.4
+ gjs_param_spec_get_value_type@Base 3.4.4
+ gjs_profiler_chain_signal@Base 4.0.0
+ gjs_profiler_get_type@Base 4.0.0
+ gjs_profiler_set_capture_writer@Base 5.4.0
+ gjs_profiler_set_fd@Base 4.6.0
+ gjs_profiler_set_filename@Base 4.0.0
+ gjs_profiler_start@Base 4.0.0
+ gjs_profiler_stop@Base 4.0.0
+ gjs_regex_match@Base 6.5.0
+ gjs_regex_match_all@Base 6.5.0
+ gjs_regex_match_all_full@Base 6.5.0
+ gjs_regex_match_full@Base 6.5.0
+ gjs_repo_class@Base 5.4.0
+ gjs_setlocale@Base 3.4.4
+ gjs_textdomain@Base 2.4.1

debian/rules

@@ -4,6 +4,7 @@ built_binaries := $(shell dh_listpackages)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
 
 include /usr/share/dpkg/default.mk
 

debian/shlibs.local

@@ -1 +1 @@
-libgjs 0 libgjs0g (= ${binary:Version})
+libcjs 0 libcjs0 (= ${binary:Version})

debian/tests/build

@@ -16,7 +16,7 @@ else
     CROSS_COMPILE=
 fi
 
-cat <<EOF > gjstest.c
+cat <<EOF > cjstest.c
 #include <cjs/gjs.h>
 
 int main()
@@ -29,8 +29,8 @@ EOF
 
 # Deliberately word-splitting, that's how pkg-config works:
 # shellcheck disable=SC2046
-"${CROSS_COMPILE}gcc" -o gjstest gjstest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs gjs-1.0)
+"${CROSS_COMPILE}gcc" -o cjstest cjstest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs cjs-1.0)
 echo "build: OK"
-[ -x gjstest ]
-./gjstest
+[ -x cjstest ]
+./cjstest
 echo "run: OK"

debian/tests/control

@@ -1,11 +1,11 @@
 Tests: build
 Restrictions: superficial
 Depends: build-essential,
-         libgjs-dev
+         libcjs-dev
 
-Tests: installed-tests
-Depends: dbus-daemon,
-         gjs-tests,
-         gnome-desktop-testing,
-         xauth,
-         xvfb
+#Tests: installed-tests
+#Depends: dbus-daemon,
+#         cjs-tests,
+#         gnome-desktop-testing,
+#         xauth,
+#         xvfb

debian/tests/installed-tests

@@ -9,4 +9,4 @@ export XDG_RUNTIME_DIR=$AUTOPKGTEST_TMP
 export LC_ALL=C.UTF-8
 
 # dbus outputs activation messages to stderr which fails the test
-dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner gjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2
+dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner cjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2