Skip to content

Commit 3bf31d4

Browse files
mtwebstermtwebster
committed
Some debian fixes.
1 parent ca1d557 commit 3bf31d4

9 files changed

Lines changed: 100 additions & 124 deletions

File tree

‎debian/control‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Build-Depends: at-spi2-core <!nocheck>,
1717
libgtk-3-dev (>= 3.24.49-3~) <!nocheck>,
1818
libgtk-4-dev,
1919
libmozjs-140-dev,
20-
libmozjs-140-dev (>= 140.6.0-1.1~) [arm64],
2120
libreadline-dev,
2221
meson (>= 1.4),
2322
libsysprof-capture-4-dev [linux-any],

‎debian/copyright‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2-
Source: https://download.gnome.org/sources/gjs/
3-
Comment:
4-
This work was packaged for Debian by:
5-
.
6-
Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> on Mon, 12 Oct 2009 18:38:36 -0300
7-
.
8-
Upstream Author:
9-
.
10-
litl, LLC
11-
Upstream-Name: gjs
2+
Upstream-Name: cjs
3+
Upstream-Contact: Clement Lefebvre <clement.lefebvre@linuxmint.com>
4+
Source: https://github.com/linuxmint/cjs
125

136
Files: *
147
Copyright:

‎debian/gbp.conf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
[DEFAULT]
2-
pristine-tar = True
3-
debian-branch = debian/latest
4-
upstream-branch = upstream/latest
5-
upstream-vcs-tag = %(version)s
6-
71
[buildpackage]
82
sign-tags = True
93

104
[dch]
115
multimaint-merge = True
12-
13-
[import-orig]
14-
postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
15-
16-
[pq]
17-
patch-numbers = False

‎debian/libcjs0.symbols‎

Lines changed: 89 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,94 @@
11
libcjs.so.0 libcjs0 #MINVER#
2-
gjs_bindtextdomain@Base 140.0
3-
gjs_cairo_pdf_surface_proto_props@Base 140.0
4-
gjs_clear_terminal@Base 140.0
5-
gjs_console_clear@Base 140.0
2+
* Build-Depends-Package: libcjs-dev
3+
gjs_bindtextdomain@Base 2.4.1
4+
gjs_cairo_pdf_surface_proto_props@Base 5.4.0
5+
gjs_clear_terminal@Base 5.4.0
6+
gjs_console_clear@Base 5.4.0
67
gjs_console_get_repl_history_path@Base 140.0
7-
gjs_console_is_tty@Base 140.0
8+
gjs_console_is_tty@Base 5.4.0
89
gjs_console_write_repl_history@Base 140.0
9-
gjs_context_define_string_array@Base 140.0
10-
gjs_context_eval@Base 140.0
11-
gjs_context_eval_file@Base 140.0
12-
gjs_context_eval_module@Base 140.0
13-
gjs_context_eval_module_file@Base 140.0
14-
gjs_context_gc@Base 140.0
15-
gjs_context_get_all@Base 140.0
16-
gjs_context_get_current@Base 140.0
17-
gjs_context_get_native_context@Base 140.0
18-
gjs_context_get_profiler@Base 140.0
10+
gjs_context_define_string_array@Base 2.0.0
11+
gjs_context_eval@Base 2.0.0
12+
gjs_context_eval_file@Base 2.0.0
13+
gjs_context_eval_module@Base 5.4.0
14+
gjs_context_eval_module_file@Base 5.4.0
15+
gjs_context_gc@Base 2.0.0
16+
gjs_context_get_all@Base 2.0.0
17+
gjs_context_get_current@Base 2.4.1
18+
gjs_context_get_native_context@Base 2.0.0
19+
gjs_context_get_profiler@Base 4.0.0
1920
gjs_context_get_repl_history_path@Base 140.0
20-
gjs_context_get_type@Base 140.0
21-
gjs_context_make_current@Base 140.0
22-
gjs_context_maybe_gc@Base 140.0
23-
gjs_context_new@Base 140.0
24-
gjs_context_new_with_search_path@Base 140.0
25-
gjs_context_print_stack_stderr@Base 140.0
26-
gjs_context_register_module@Base 140.0
27-
gjs_context_run_in_realm@Base 140.0
28-
gjs_context_set_argv@Base 140.0
29-
gjs_context_setup_debugger_console@Base 140.0
30-
gjs_coverage_enable@Base 140.0
31-
gjs_coverage_get_type@Base 140.0
32-
gjs_coverage_new@Base 140.0
33-
gjs_coverage_write_statistics@Base 140.0
34-
gjs_dbus_implementation_emit_property_changed@Base 140.0
35-
gjs_dbus_implementation_emit_signal@Base 140.0
36-
gjs_dbus_implementation_get_type@Base 140.0
37-
gjs_dbus_implementation_unexport@Base 140.0
38-
gjs_dbus_implementation_unexport_from_connection@Base 140.0
39-
gjs_dumpstack@Base 140.0
40-
gjs_error_quark@Base 140.0
41-
gjs_g_binding_group_bind_full@Base 140.0
42-
gjs_g_object_bind_property_full@Base 140.0
43-
gjs_get_js_version@Base 140.0
44-
gjs_gobject_class_info@Base 140.0
45-
gjs_gobject_interface_info@Base 140.0
46-
gjs_gtk_container_child_set_property@Base 140.0
47-
gjs_gtk_custom_sorter_new@Base 140.0
48-
gjs_gtk_custom_sorter_set_sort_func@Base 140.0
49-
gjs_importer_class@Base 140.0
50-
gjs_importer_proto_funcs@Base 140.0
51-
gjs_js_error_get_type@Base 140.0
52-
gjs_js_error_quark@Base 140.0
53-
gjs_list_store_insert_sorted@Base 140.0
54-
gjs_list_store_sort@Base 140.0
55-
gjs_locale_category_get_type@Base 140.0
56-
gjs_log_set_writer_default@Base 140.0
57-
gjs_log_set_writer_func@Base 140.0
58-
gjs_match_info_expand_references@Base 140.0
59-
gjs_match_info_fetch@Base 140.0
60-
gjs_match_info_fetch_all@Base 140.0
61-
gjs_match_info_fetch_named@Base 140.0
62-
gjs_match_info_fetch_named_pos@Base 140.0
63-
gjs_match_info_fetch_pos@Base 140.0
64-
gjs_match_info_free@Base 140.0
65-
gjs_match_info_get_match_count@Base 140.0
66-
gjs_match_info_get_regex@Base 140.0
67-
gjs_match_info_get_string@Base 140.0
68-
gjs_match_info_get_type@Base 140.0
69-
gjs_match_info_is_partial_match@Base 140.0
70-
gjs_match_info_matches@Base 140.0
71-
gjs_match_info_next@Base 140.0
72-
gjs_match_info_ref@Base 140.0
73-
gjs_match_info_unref@Base 140.0
74-
gjs_memory_report@Base 140.0
75-
gjs_native_promise_module_funcs@Base 140.0
76-
gjs_param_class@Base 140.0
77-
gjs_param_spec_get_flags@Base 140.0
78-
gjs_param_spec_get_owner_type@Base 140.0
79-
gjs_param_spec_get_value_type@Base 140.0
80-
gjs_profiler_chain_signal@Base 140.0
81-
gjs_profiler_get_type@Base 140.0
82-
gjs_profiler_set_capture_writer@Base 140.0
83-
gjs_profiler_set_fd@Base 140.0
84-
gjs_profiler_set_filename@Base 140.0
85-
gjs_profiler_start@Base 140.0
86-
gjs_profiler_stop@Base 140.0
87-
gjs_regex_match@Base 140.0
88-
gjs_regex_match_all@Base 140.0
89-
gjs_regex_match_all_full@Base 140.0
90-
gjs_regex_match_full@Base 140.0
91-
gjs_repo_class@Base 140.0
21+
gjs_context_get_type@Base 2.0.0
22+
gjs_context_make_current@Base 2.4.1
23+
gjs_context_maybe_gc@Base 2.0.0
24+
gjs_context_new@Base 2.0.0
25+
gjs_context_new_with_search_path@Base 2.0.0
26+
gjs_context_print_stack_stderr@Base 2.0.0
27+
gjs_context_register_module@Base 5.4.0
28+
gjs_context_run_in_realm@Base 6.0.0
29+
gjs_context_set_argv@Base 5.4.0
30+
gjs_context_setup_debugger_console@Base 4.6.0
31+
gjs_coverage_enable@Base 4.6.0
32+
gjs_coverage_get_type@Base 5.4.0
33+
gjs_coverage_new@Base 2.4.1
34+
gjs_coverage_write_statistics@Base 2.4.1
35+
gjs_dbus_implementation_emit_property_changed@Base 2.0.0
36+
gjs_dbus_implementation_emit_signal@Base 2.0.0
37+
gjs_dbus_implementation_get_type@Base 2.0.0
38+
gjs_dbus_implementation_unexport@Base 5.7.0
39+
gjs_dbus_implementation_unexport_from_connection@Base 5.7.0
40+
gjs_dumpstack@Base 2.0.0
41+
gjs_error_quark@Base 2.0.0
42+
gjs_g_binding_group_bind_full@Base 5.7.0
43+
gjs_g_object_bind_property_full@Base 5.4.0
44+
gjs_get_js_version@Base 4.0.0
45+
gjs_gobject_class_info@Base 5.4.0
46+
gjs_gobject_interface_info@Base 5.4.0
47+
gjs_gtk_container_child_set_property@Base 2.4.1
48+
gjs_gtk_custom_sorter_new@Base 5.7.0
49+
gjs_gtk_custom_sorter_set_sort_func@Base 5.7.0
50+
gjs_importer_class@Base 5.4.0
51+
gjs_importer_proto_funcs@Base 5.4.0
52+
gjs_js_error_get_type@Base 4.0.0
53+
gjs_js_error_quark@Base 4.0.0
54+
gjs_list_store_insert_sorted@Base 5.4.0
55+
gjs_list_store_sort@Base 5.4.0
56+
gjs_locale_category_get_type@Base 3.4.4
57+
gjs_log_set_writer_default@Base 5.4.0
58+
gjs_log_set_writer_func@Base 5.4.0
59+
gjs_match_info_expand_references@Base 6.5.0
60+
gjs_match_info_fetch@Base 6.5.0
61+
gjs_match_info_fetch_all@Base 6.5.0
62+
gjs_match_info_fetch_named@Base 6.5.0
63+
gjs_match_info_fetch_named_pos@Base 6.5.0
64+
gjs_match_info_fetch_pos@Base 6.5.0
65+
gjs_match_info_free@Base 6.5.0
66+
gjs_match_info_get_match_count@Base 6.5.0
67+
gjs_match_info_get_regex@Base 6.5.0
68+
gjs_match_info_get_string@Base 6.5.0
69+
gjs_match_info_get_type@Base 6.5.0
70+
gjs_match_info_is_partial_match@Base 6.5.0
71+
gjs_match_info_matches@Base 6.5.0
72+
gjs_match_info_next@Base 6.5.0
73+
gjs_match_info_ref@Base 6.5.0
74+
gjs_match_info_unref@Base 6.5.0
75+
gjs_memory_report@Base 2.0.0
76+
gjs_native_promise_module_funcs@Base 5.7.0
77+
gjs_param_class@Base 5.4.0
78+
gjs_param_spec_get_flags@Base 3.4.4
79+
gjs_param_spec_get_owner_type@Base 3.4.4
80+
gjs_param_spec_get_value_type@Base 3.4.4
81+
gjs_profiler_chain_signal@Base 4.0.0
82+
gjs_profiler_get_type@Base 4.0.0
83+
gjs_profiler_set_capture_writer@Base 5.4.0
84+
gjs_profiler_set_fd@Base 4.6.0
85+
gjs_profiler_set_filename@Base 4.0.0
86+
gjs_profiler_start@Base 4.0.0
87+
gjs_profiler_stop@Base 4.0.0
88+
gjs_regex_match@Base 6.5.0
89+
gjs_regex_match_all@Base 6.5.0
90+
gjs_regex_match_all_full@Base 6.5.0
91+
gjs_regex_match_full@Base 6.5.0
92+
gjs_repo_class@Base 5.4.0
9293
gjs_set_thread_locale@Base 140.0
93-
gjs_textdomain@Base 140.0
94+
gjs_textdomain@Base 2.4.1

‎debian/rules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ built_binaries := $(shell dh_listpackages)
44

55
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
66
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs
7+
export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
78

89
include /usr/share/dpkg/default.mk
910

‎debian/shlibs.local‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libcjs 0 libcjs0 (= ${binary:Version})

‎debian/tests/build‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ else
1616
CROSS_COMPILE=
1717
fi
1818

19-
cat <<EOF > gjstest.c
19+
cat <<EOF > cjstest.c
2020
#include <cjs/gjs.h>
2121
2222
int main()
@@ -29,8 +29,8 @@ EOF
2929

3030
# Deliberately word-splitting, that's how pkg-config works:
3131
# shellcheck disable=SC2046
32-
"${CROSS_COMPILE}gcc" -o gjstest gjstest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs gjs-1.0)
32+
"${CROSS_COMPILE}gcc" -o cjstest cjstest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs cjs-1.0)
3333
echo "build: OK"
34-
[ -x gjstest ]
35-
./gjstest
34+
[ -x cjstest ]
35+
./cjstest
3636
echo "run: OK"

‎debian/tests/control‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
Tests: build
22
Restrictions: superficial
33
Depends: build-essential,
4-
libgjs-dev
5-
6-
Tests: installed-tests
7-
Depends: dbus-daemon,
8-
gjs-tests,
9-
gnome-desktop-testing,
10-
xauth,
11-
xvfb
4+
libcjs-dev

‎debian/tests/installed-tests‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ export XDG_RUNTIME_DIR=$AUTOPKGTEST_TMP
99
export LC_ALL=C.UTF-8
1010

1111
# dbus outputs activation messages to stderr which fails the test
12-
dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner gjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2
12+
dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner cjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2

0 commit comments

Comments
 (0)