From 1cab53cfe51941b1bdcbb398539f3f721f19752e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Thu, 4 Apr 2024 21:46:57 +0000 Subject: [PATCH 001/341] firefox: set widget.gtk.libadwaita-colors.enabled to false. --- helpers/DATA/firefox/settings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js index 64393d4..3babcd7 100644 --- a/helpers/DATA/firefox/settings.js +++ b/helpers/DATA/firefox/settings.js @@ -284,3 +284,6 @@ pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", ""); // Disable Normandy (remote settings changer for AB testing) pref("app.normandy.enabled", false); pref("app.normandy.api_url", ""); + +// Disable Adwaita theme by default. +pref("widget.gtk.libadwaita-colors.enabled", false); From 751192b898f74bf9b8075f70c680cafe9540d2e0 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sat, 6 Apr 2024 19:55:07 -0600 Subject: [PATCH 002/341] misc: initial removal of previous BUILD_UNTIL release. --- .../fix_volume_change_notification.patch | 214 ---- .../0002-Fix-cwidget-and-aptitude-FTBFS.patch | 16 - ...drop_gnome-shell-overrides-migration.patch | 127 -- helpers/DATA/ibus/denylist.txt | 27 - .../ibus/fix_latam_spanish_blacklist.patch | 28 - helpers/DATA/ibus/simple.xml.in_1.5.27.patch | 1093 ----------------- ...7f7e5163870bcc2fb7281c28e8e39c9cbc54.patch | 22 - ...42ffc2d3807dbc3163d1727cc5d8c2118838.patch | 42 - .../DATA/pygame/01_update_surface_test.patch | 22 - ...540bb10df5d29a101f593f2a3801c1fa0799.patch | 26 - helpers/make-0ad | 30 - helpers/make-0ad-data | 30 - helpers/make-aptly | 28 - helpers/make-ayatana-indicator-sound | 32 - helpers/make-cups | 28 - helpers/make-cwidget | 30 - helpers/make-cython | 31 - helpers/make-deluge | 31 - helpers/make-enblend-enfuse | 28 - helpers/make-gajim | 30 - helpers/make-gajim-omemo | 29 - helpers/make-gajim-openpgp | 29 - helpers/make-gajim-pgp | 29 - helpers/make-gajim-triggers | 29 - helpers/make-gnome-shell | 31 - helpers/make-group-service | 30 - helpers/make-hugin | 28 - helpers/make-ibus | 35 - helpers/make-ifupdown | 27 - helpers/make-libmateweather | 35 - helpers/make-libsdl2 | 30 - helpers/make-libsrtp2 | 31 - helpers/make-libstrophe | 31 - helpers/make-libvigraimpex | 29 - helpers/make-mate-system-monitor | 56 - helpers/make-ncurses | 8 - helpers/make-nodejs | 30 - helpers/make-opendht | 36 - helpers/make-pkg-kde-tools | 34 - helpers/make-profanity | 32 - helpers/make-pupnp | 29 - helpers/make-pygame | 35 - helpers/make-python-nbxmpp | 29 - helpers/make-restinio | 29 - helpers/make-tre | 28 - helpers/make-unknown-horizons | 32 - 46 files changed, 2716 deletions(-) delete mode 100644 helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch delete mode 100644 helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch delete mode 100644 helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch delete mode 100644 helpers/DATA/ibus/denylist.txt delete mode 100644 helpers/DATA/ibus/fix_latam_spanish_blacklist.patch delete mode 100644 helpers/DATA/ibus/simple.xml.in_1.5.27.patch delete mode 100644 helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch delete mode 100644 helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch delete mode 100644 helpers/DATA/pygame/01_update_surface_test.patch delete mode 100644 helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch delete mode 100644 helpers/make-0ad delete mode 100644 helpers/make-0ad-data delete mode 100644 helpers/make-aptly delete mode 100644 helpers/make-ayatana-indicator-sound delete mode 100644 helpers/make-cups delete mode 100644 helpers/make-cwidget delete mode 100644 helpers/make-cython delete mode 100644 helpers/make-deluge delete mode 100644 helpers/make-enblend-enfuse delete mode 100644 helpers/make-gajim delete mode 100644 helpers/make-gajim-omemo delete mode 100644 helpers/make-gajim-openpgp delete mode 100644 helpers/make-gajim-pgp delete mode 100644 helpers/make-gajim-triggers delete mode 100644 helpers/make-gnome-shell delete mode 100644 helpers/make-group-service delete mode 100644 helpers/make-hugin delete mode 100644 helpers/make-ibus delete mode 100644 helpers/make-ifupdown delete mode 100644 helpers/make-libmateweather delete mode 100644 helpers/make-libsdl2 delete mode 100644 helpers/make-libsrtp2 delete mode 100644 helpers/make-libstrophe delete mode 100644 helpers/make-libvigraimpex delete mode 100644 helpers/make-mate-system-monitor delete mode 100644 helpers/make-nodejs delete mode 100644 helpers/make-opendht delete mode 100644 helpers/make-pkg-kde-tools delete mode 100644 helpers/make-profanity delete mode 100644 helpers/make-pupnp delete mode 100644 helpers/make-pygame delete mode 100644 helpers/make-python-nbxmpp delete mode 100644 helpers/make-restinio delete mode 100644 helpers/make-tre delete mode 100644 helpers/make-unknown-horizons diff --git a/helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch b/helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch deleted file mode 100644 index 92b6259..0000000 --- a/helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch +++ /dev/null @@ -1,214 +0,0 @@ -Patch based on https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/92 -For Trisquel 11.0, Aramo - ayatana-indicator-sound - 22.2.0-2 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac370b2..095c953 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ --project(ayatana-indicator-sound C CXX) --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required (VERSION 3.13) -+project (ayatana-indicator-sound VERSION 22.2.0 LANGUAGES C CXX) - - if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) -@@ -7,8 +7,6 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") - --set(PACKAGE ${CMAKE_PROJECT_NAME}) --set(PROJECT_VERSION 22.2.0) - find_package(PkgConfig REQUIRED) - include(GNUInstallDirs) - include(UseVala) -diff --git a/src/info-notification.vala b/src/info-notification.vala -index ce92a2a..3a36e52 100644 ---- a/src/info-notification.vala -+++ b/src/info-notification.vala -@@ -1,6 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -30,22 +30,26 @@ public class IndicatorSound.InfoNotification: Notification - public void show (VolumeControl.ActiveOutput active_output, - double volume, - bool is_high_volume) { -- if (!notify_server_supports ("x-canonical-private-synchronous")) -- return; - - /* Determine Label */ -- unowned string volume_label = get_notification_label (active_output); -+ string volume_label = get_notification_label (active_output); - - /* Choose an icon */ - unowned string icon = get_volume_notification_icon (active_output, volume, is_high_volume); - - /* Reset the notification */ - var n = _notification; -+ -+ uint nChars = ((int32)((volume * 20) + 0.5)).clamp(0, 20); -+ volume_label += "\n"; -+ -+ for (uint nChar = 0; nChar < nChars; nChar++) -+ { -+ volume_label += "◼"; -+ } -+ - n.update (_("Volume"), volume_label, icon); - n.clear_hints(); -- n.set_hint ("x-lomiri-non-shaped-icon", "true"); -- n.set_hint ("x-canonical-private-synchronous", "true"); -- n.set_hint ("x-lomiri-value-bar-tint", is_high_volume ? "true" : "false"); - n.set_hint ("value", ((int32)((volume * 100.0) + 0.5)).clamp(0, 100)); - show_notification (); - } -diff --git a/src/warn-notification.vala b/src/warn-notification.vala -index 6a08431..203758e 100644 ---- a/src/warn-notification.vala -+++ b/src/warn-notification.vala -@@ -1,5 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -15,6 +16,7 @@ - * - * Authors: - * Charles Kerr -+ * Robert Tari - */ - - public class IndicatorSound.WarnNotification: Notification -@@ -31,9 +33,6 @@ public class IndicatorSound.WarnNotification: Notification - _("Volume"), - _("Allow volume above safe level?\nHigh volume can damage your hearing."), - "audio-volume-high"); -- n.set_hint ("x-lomiri-non-shaped-icon", "true"); -- n.set_hint ("x-lomiri-snap-decisions", "true"); -- n.set_hint ("x-lomiri-private-affirmative-tint", "true"); - n.closed.connect ((n) => { - n.clear_actions (); - }); -diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp -index 3ecd856..eb4ee8c 100644 ---- a/tests/integration/indicator-sound-test-base.cpp -+++ b/tests/integration/indicator-sound-test-base.cpp -@@ -1,6 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published -@@ -72,7 +72,7 @@ void IndicatorSoundTestBase::SetUp() - "GetCapabilities", - "", - "as", -- "ret = ['actions', 'body', 'body-markup', 'icon-static', 'image/svg+xml', 'x-canonical-private-synchronous', 'x-canonical-append', 'x-canonical-private-icon-only', 'x-canonical-truncation', 'private-synchronous', 'append', 'private-icon-only', 'truncation']" -+ "ret = ['actions', 'body', 'body-markup', 'icon-static', 'image/svg+xml', 'private-synchronous', 'append', 'private-icon-only', 'truncation']" - ).waitForFinished(); - - int waitedTime = 0; -@@ -647,14 +647,8 @@ void IndicatorSoundTestBase::checkVolumeNotification(double volume, QString cons - QVariantMap hints; - ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); - ASSERT_TRUE(hints.contains("value")); -- ASSERT_TRUE(hints.contains("x-lomiri-non-shaped-icon")); -- ASSERT_TRUE(hints.contains("x-lomiri-value-bar-tint")); -- ASSERT_TRUE(hints.contains("x-canonical-private-synchronous")); - - EXPECT_EQ(volume*100, hints["value"]); -- EXPECT_EQ(true, hints["x-lomiri-non-shaped-icon"]); -- EXPECT_EQ(isLoud, hints["x-lomiri-value-bar-tint"]); -- EXPECT_EQ(true, hints["x-canonical-private-synchronous"]); - } - - void IndicatorSoundTestBase::checkHighVolumeNotification(QVariantList call) -diff --git a/tests/notifications-mock.h b/tests/notifications-mock.h -index 49b2e66..3ae8da5 100644 ---- a/tests/notifications-mock.h -+++ b/tests/notifications-mock.h -@@ -1,6 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -31,7 +31,7 @@ class NotificationsMock - DbusTestDbusMockObject * baseobj = nullptr; - - public: -- NotificationsMock (const std::vector& capabilities = {"actions", "body", "body-markup", "icon-static", "image/svg+xml", "x-canonical-private-synchronous", "x-canonical-append", "x-canonical-private-icon-only", "x-canonical-truncation", "private-synchronous", "append", "private-icon-only", "truncation"}) { -+ NotificationsMock (const std::vector& capabilities = {"actions", "body", "body-markup", "icon-static", "image/svg+xml", "private-synchronous", "append", "private-icon-only", "truncation"}) { - mock = dbus_test_dbus_mock_new("org.freedesktop.Notifications"); - dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SESSION); - dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Notify"); -diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc -index a9fa55d..92f4672 100644 ---- a/tests/notifications-test.cc -+++ b/tests/notifications-test.cc -@@ -1,6 +1,6 @@ - /* - * Copyright 2015-2016 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -259,7 +259,6 @@ TEST_F(NotificationsTest, VolumeChanges) { - EXPECT_EQ("ayatana-indicator-sound", notev[0].app_name); - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ(0, notev[0].actions.size()); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); - EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]); - - /* Set a different volume */ -@@ -432,7 +431,6 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { - ASSERT_EQ(1, notev.size()); - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); -- EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-lomiri-value-bar-tint"]); - - /* Set high volume with volume change */ - notifications->clearNotifications(); -@@ -443,7 +441,6 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { - ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */ - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-value-bar-tint"]); - - /* Move it back */ - volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false); -@@ -513,7 +510,6 @@ TEST_F(NotificationsTest, DISABLED_ExtendendVolumeNotification) { - EXPECT_EQ("ayatana-indicator-sound", notev[0].app_name); - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ(0, notev[0].actions.size()); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); - EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]); - - /* Allow an amplified volume */ -@@ -628,14 +624,10 @@ TEST_F(NotificationsTest, DISABLED_TriggerWarning) { - if (warning_expected) { - EXPECT_TRUE(volume_warning_get_active(volumeWarning.get())); - ASSERT_EQ(1, notev.size()); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-snap-decisions"]); -- EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-private-synchronous"]); - } - else { - EXPECT_FALSE(volume_warning_get_active(volumeWarning.get())); - ASSERT_EQ(1, notev.size()); -- EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-lomiri-snap-decisions"]); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); - } - - } // multimedia_active diff --git a/helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch b/helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch deleted file mode 100644 index 7614cb8..0000000 --- a/helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix FTBFS in cwidget as well as in aptitude due to missing #include -Author: Paul Wise -Reviewed-By: Axel Beckert -Bug-Debian: https://bugs.debian.org/1015925 -Bug: https://bugs.debian.org/1015925 - ---- a/src/cwidget/generic/threads/threads.h -+++ b/src/cwidget/generic/threads/threads.h -@@ -26,6 +26,7 @@ - #define THREADS_H - - #include -+#include - #include - - namespace cwidget diff --git a/helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch b/helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch deleted file mode 100644 index 7188f72..0000000 --- a/helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch +++ /dev/null @@ -1,127 +0,0 @@ -From a9e6e44ef898671229388938cc3ed511fa394dfc Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Mon, 23 Jan 2023 16:38:36 +0000 -Subject: [PATCH] tools: Drop gnome-shell-overrides-migration.sh -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The tool was added in 2018 to migrate to per-desktop overrides from the -old overrides system. - -5 years later, everyone who’s going to migrate probably has migrated, so -we can delete the script and remove a process running on every login. - -Signed-off-by: Philip Withnall -Part-of: ---- - ...gnome-shell-overrides-migration.desktop.in | 5 --- - data/meson.build | 9 ----- - meson.build | 1 - - tools/gnome-shell-overrides-migration.sh | 38 ------------------- - tools/meson.build | 4 -- - 5 files changed, 57 deletions(-) - delete mode 100644 data/gnome-shell-overrides-migration.desktop.in - delete mode 100755 tools/gnome-shell-overrides-migration.sh - delete mode 100644 tools/meson.build - -diff --git a/data/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in -deleted file mode 100644 -index 99452e6ec1..0000000000 ---- a/data/gnome-shell-overrides-migration.desktop.in -+++ /dev/null -@@ -1,5 +0,0 @@ --[Desktop Entry] --Type=Application --Name=GNOME settings overrides migration --NoDisplay=true --Exec=@libexecdir@/gnome-shell-overrides-migration.sh -diff --git a/data/meson.build b/data/meson.build -index 7fa7f15ffb..a31efcc794 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -99,15 +99,6 @@ schema = configure_file( - ) - install_data('00_org.gnome.shell.gschema.override', install_dir: schemadir) - --overrides_migration_conf = configuration_data() --overrides_migration_conf.set('libexecdir', libexecdir) --overrides_migration = configure_file( -- input: 'gnome-shell-overrides-migration.desktop.in', -- output: 'gnome-shell-overrides-migration.desktop', -- configuration: overrides_migration_conf, -- install_dir: autostartdir --) -- - if have_systemd - unitconf = configuration_data() - unitconf.set('bindir', bindir) -diff --git a/meson.build b/meson.build -index 791ec2e64e..6cd40cefa8 100644 ---- a/meson.build -+++ b/meson.build -@@ -283,7 +283,6 @@ subdir('js') - subdir('src') - subdir('po') - subdir('data') --subdir('tools') - - if get_option('tests') - subdir('tests') -diff --git a/tools/gnome-shell-overrides-migration.sh b/tools/gnome-shell-overrides-migration.sh -deleted file mode 100755 -index a1b4cb6331..0000000000 ---- a/tools/gnome-shell-overrides-migration.sh -+++ /dev/null -@@ -1,38 +0,0 @@ --#!/bin/sh -- --PKG_DATA_DIR=${XDG_DATA_HOME:-$HOME/.local/share}/gnome-shell -- --MIGRATION_GUARD=$PKG_DATA_DIR/gnome-overrides-migrated --OVERRIDE_SCHEMA= -- --if [ -f $MIGRATION_GUARD ]; then -- exit # already migrated --fi -- --# Find the right session --if echo $XDG_CURRENT_DESKTOP | grep -q -v GNOME; then -- exit # not a GNOME session --fi -- --if echo $XDG_CURRENT_DESKTOP | grep -q Classic; then -- OVERRIDE_SCHEMA=org.gnome.shell.extensions.classic-overrides --else -- OVERRIDE_SCHEMA=org.gnome.shell.overrides --fi -- --mkdir -p $PKG_DATA_DIR -- --for k in `gsettings list-keys $OVERRIDE_SCHEMA` --do -- if [ $k = button-layout ]; then -- orig_schema=org.gnome.desktop.wm.preferences -- else -- orig_schema=org.gnome.mutter -- fi -- -- oldValue=`gsettings get $OVERRIDE_SCHEMA $k` -- curValue=`gsettings get $orig_schema $k` -- if [ $oldValue != $curValue ]; then -- gsettings set $orig_schema $k $oldValue -- fi --done && touch $MIGRATION_GUARD -diff --git a/tools/meson.build b/tools/meson.build -deleted file mode 100644 -index d8e217cc44..0000000000 ---- a/tools/meson.build -+++ /dev/null -@@ -1,4 +0,0 @@ --install_data('gnome-shell-overrides-migration.sh', -- install_dir: libexecdir, -- install_mode: 'rwxr-xr-x' --) --- -GitLab - diff --git a/helpers/DATA/ibus/denylist.txt b/helpers/DATA/ibus/denylist.txt deleted file mode 100644 index 00b7d77..0000000 --- a/helpers/DATA/ibus/denylist.txt +++ /dev/null @@ -1,27 +0,0 @@ -# vim:set fileencoding=utf-8 et sts=4 sw=4: -# -# ibus - Intelligent Input Bus for Linux / Unix OS -# -# Copyright © 2020-2022 Takao Fujiwara -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see . - -# This file is a deny list (black list) and used by gensimple.py. -# gensimple.py generates the engine list with evdev.xml and if an engine name -# is matched with any entries in this file, the engine is excluded from the -# engine list. -# Asterisk(*) character can be used to match any engines. -# E.g. xkb:cn:*:* excludes xkb:cn::zho and xkb:cn:mon_trad:mvf -xkb:cn:*:* -xkb:nec_vndr/jp:*:* diff --git a/helpers/DATA/ibus/fix_latam_spanish_blacklist.patch b/helpers/DATA/ibus/fix_latam_spanish_blacklist.patch deleted file mode 100644 index d9c7ff5..0000000 --- a/helpers/DATA/ibus/fix_latam_spanish_blacklist.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 82e38d9e1c06e7fdc0816fe08f4021b8c1cdff10 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Wed, 20 Jul 2022 11:25:26 +0900 -Subject: [PATCH] engine: Delete xkb:latam:*:* in denylist.txt - -BUG=https://github.com/ibus/ibus/issues/2412 - -diff --git a/engine/Makefile.am b/engine/Makefile.am -index 03867f52f..7256fbc82 100644 ---- a/engine/Makefile.am -+++ b/engine/Makefile.am -@@ -4,7 +4,7 @@ - # - # Copyright (c) 2010-2016, Google Inc. All rights reserved. - # Copyright (c) 2007-2016 Peng Huang --# Copyright (c) 2013-2020 Takao Fujiwara -+# Copyright (c) 2013-2021 Takao Fujiwara - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -88,6 +88,7 @@ CLEANFILES = \ - $(NULL) - - EXTRA_DIST = \ -+ denylist.txt \ - gensimple.py \ - iso639converter.py \ - simple.xml.in \ diff --git a/helpers/DATA/ibus/simple.xml.in_1.5.27.patch b/helpers/DATA/ibus/simple.xml.in_1.5.27.patch deleted file mode 100644 index ee0cf78..0000000 --- a/helpers/DATA/ibus/simple.xml.in_1.5.27.patch +++ /dev/null @@ -1,1093 +0,0 @@ -From ef9bd3b1c8e2ed122b064abb59fc6e121e23bb59 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Tue, 23 Aug 2022 00:26:57 +0900 -Subject: [PATCH] engine: Update simple.xml with xkeyboard-config 2.36 - ---- - engine/simple.xml.in | 875 ++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 780 insertions(+), 95 deletions(-) - -diff --git a/engine/simple.xml.in b/engine/simple.xml.in -index 1152b5934..914895e76 100644 ---- a/engine/simple.xml.in -+++ b/engine/simple.xml.in -@@ -3,7 +3,7 @@ - org.freedesktop.IBus.Simple - A table based simple engine - @libexecdir@/ibus-engine-simple -- 1.5.26.20220314 -+ 1.5.27.20220823 - Peng Huang <shawn.p.huang@gmail.com> - GPL - https://github.com/ibus/ibus/wiki -@@ -781,8 +781,8 @@ - 1 - - -- xkb:by:ru:bel -- be -+ xkb:by:ru:rus -+ ru - GPL - Peng Huang <shawn.p.huang@gmail.com> - by -@@ -4289,14 +4289,14 @@ - 1 - - -- xkb:fr:bre:fra -- fr -+ xkb:fr:bre:bre -+ br - GPL - Peng Huang <shawn.p.huang@gmail.com> - fr - bre -- French (Breton) -- French (Breton) -+ Breton (France) -+ Breton (France) - ibus-keyboard - 1 - -@@ -5570,6 +5570,77 @@ - ibus-keyboard - 1 - -+ -+ xkb:latam::spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ Spanish (Latin American) -+ Spanish (Latin American) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:latam:nodeadkeys:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ nodeadkeys -+ Spanish (Latin American, no dead keys) -+ Spanish (Latin American, no dead keys) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:deadtilde:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ deadtilde -+ Spanish (Latin American, dead tilde) -+ Spanish (Latin American, dead tilde) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:dvorak:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ dvorak -+ Spanish (Latin American, Dvorak) -+ Spanish (Latin American, Dvorak) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:colemak:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ colemak -+ Spanish (Latin American, Colemak) -+ Spanish (Latin American, Colemak) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:colemak-gaming:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ colemak-gaming -+ Spanish (Latin American, Colemak for gaming) -+ Spanish (Latin American, Colemak for gaming) -+ ibus-keyboard -+ 1 -+ - - xkb:lt::lit - lt -@@ -6744,6 +6815,18 @@ - ibus-keyboard - 1 - -+ -+ xkb:ru:ab:abk -+ ab -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ ru -+ ab -+ Abkhazian (Russia) -+ Abkhazian (Russia) -+ ibus-keyboard -+ 1 -+ - - xkb:rs::srp - sr -@@ -7488,6 +7571,18 @@ - ibus-keyboard - 1 - -+ -+ xkb:tr:e:tur -+ tr -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ tr -+ e -+ Turkish (E) -+ Turkish (E) -+ ibus-keyboard -+ 1 -+ - - xkb:tr:alt:tur - tr -@@ -7895,8 +7990,8 @@ - 1 - - -- xkb:ua:rstu_ru:ukr -- uk -+ xkb:ua:rstu_ru:rus -+ ru - GPL - Peng Huang <shawn.p.huang@gmail.com> - ua -@@ -8150,8 +8245,8 @@ - Peng Huang <shawn.p.huang@gmail.com> - vn - fr -- Vietnamese (French) -- Vietnamese (French) -+ Vietnamese (France) -+ Vietnamese (France) - ibus-keyboard - 1 - -@@ -10029,8 +10124,8 @@ - 50 - - -- xkb:id::msa -- ms -+ xkb:id::ace -+ ace - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10040,8 +10135,8 @@ - 50 - - -- xkb:id::min -- min -+ xkb:id::ban -+ ban - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10051,8 +10146,19 @@ - 50 - - -- xkb:id::ace -- ace -+ xkb:id::bbc -+ bbc -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::bew -+ bew - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10073,8 +10179,8 @@ - 50 - - -- xkb:id::tsg -- tsg -+ xkb:id::btm -+ btm - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10084,8 +10190,8 @@ - 50 - - -- xkb:id::mfa -- mfa -+ xkb:id::bts -+ bts - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10095,183 +10201,762 @@ - 50 - - -- xkb:id:phonetic:ind -+ xkb:id::bug -+ bug -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::gor -+ gor -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::jav -+ jv -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::jax -+ jax -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::mad -+ mad -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::mak -+ mak -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::min -+ min -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::mui -+ mui -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id:javanese:ind - id - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:msa -- ms -+ xkb:id:javanese:ace -+ ace - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:min -- min -+ xkb:id:javanese:ban -+ ban - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:ace -- ace -+ xkb:id:javanese:bbc -+ bbc - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:bjn -+ xkb:id:javanese:bew -+ bew -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ javanese -+ Javanese -+ Javanese -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:javanese:bjn - bjn - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:tsg -- tsg -+ xkb:id:javanese:btm -+ btm - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:mfa -- mfa -+ xkb:id:javanese:bts -+ bts - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:ind -- id -+ xkb:id:javanese:bug -+ bug - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:msa -- ms -+ xkb:id:javanese:gor -+ gor - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:min -- min -+ xkb:id:javanese:jav -+ jv - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:ace -- ace -+ xkb:id:javanese:jax -+ jax - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:bjn -- bjn -+ xkb:id:javanese:mad -+ mad - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:tsg -- tsg -+ xkb:id:javanese:mak -+ mak - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:mfa -- mfa -+ xkb:id:javanese:min -+ min - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:jv::jav -- jv -+ xkb:id:javanese:mui -+ mui - GPL - Peng Huang <shawn.p.huang@gmail.com> -- jv -- Indonesian (Javanese) -- Indonesian (Javanese) -+ id -+ javanese -+ Javanese -+ Javanese - ibus-keyboard -- 50 -+ 1 -+ -+ -+ xkb:id:javanese:sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ javanese -+ Javanese -+ Javanese -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:javanese:sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ javanese -+ Javanese -+ Javanese -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:ind -+ id -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:ace -+ ace -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:ban -+ ban -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bbc -+ bbc -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bew -+ bew -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bjn -+ bjn -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:btm -+ btm -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bts -+ bts -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bug -+ bug -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:gor -+ gor -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:jav -+ jv -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:jax -+ jax -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:mad -+ mad -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:mak -+ mak -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:min -+ min -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:mui -+ mui -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:ind -+ id -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:ace -+ ace -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:ban -+ ban -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bbc -+ bbc -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bew -+ bew -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bjn -+ bjn -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:btm -+ btm -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bts -+ bts -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bug -+ bug -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:gor -+ gor -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:jav -+ jv -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:jax -+ jax -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:mad -+ mad -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:mak -+ mak -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:min -+ min -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:mui -+ mui -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 - - - xkb:my::ind diff --git a/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch b/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch deleted file mode 100644 index 8596e63..0000000 --- a/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54 Mon Sep 17 00:00:00 2001 -From: Mike Ovchinnikov -Date: Wed, 18 Oct 2023 14:59:53 +0400 -Subject: [PATCH] Dataserver url changed - ---- - libmateweather/weather-metar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmateweather/weather-metar.c b/libmateweather/weather-metar.c -index a9f3c84d..0ae2cbb9 100644 ---- a/libmateweather/weather-metar.c -+++ b/libmateweather/weather-metar.c -@@ -550,7 +550,7 @@ metar_start_open (WeatherInfo *info) - } - - msg = soup_form_request_new ( -- "GET", "https://www.aviationweather.gov/adds/dataserver_current/httpparam", -+ "GET", "https://www.aviationweather.gov/cgi-bin/data/dataserver.php", - "dataSource", "metars", - "requestType", "retrieve", - "format", "xml", diff --git a/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch b/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch deleted file mode 100644 index 5da2035..0000000 --- a/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a61542ffc2d3807dbc3163d1727cc5d8c2118838 Mon Sep 17 00:00:00 2001 -From: mbkma -Date: Wed, 11 Jan 2023 20:53:29 +0100 -Subject: [PATCH] rename Europe/Kiev to Europe/Kyiv - ---- - data/Locations.xml.in | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/data/Locations.xml.in b/data/Locations.xml.in -index 8bf9bad..ea75673 100644 ---- a/data/Locations.xml.in -+++ b/data/Locations.xml.in -@@ -20627,13 +20627,12 @@ - UA - UP - -- -- Europe/Simferopol -+ - Europe/Uzhgorod - Europe/Zaporozhye - - -- Europe/Kiev -+ Europe/Kyiv - - - Boryspil' -@@ -20706,10 +20705,10 @@ - - - -- Kiev -+ Kyiv - 50.433333 30.516667 - - Kyiv diff --git a/helpers/DATA/pygame/01_update_surface_test.patch b/helpers/DATA/pygame/01_update_surface_test.patch deleted file mode 100644 index a587991..0000000 --- a/helpers/DATA/pygame/01_update_surface_test.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/test/surface_test.py b/test/surface_test.py -index 4323503..1c161ad 100644 ---- a/test/surface_test.py -+++ b/test/surface_test.py -#@@ -1481,7 +1481,7 @@ class GeneralSurfaceTests(AssertRaisesRegexMixin, unittest.TestCase): -# self.assertEqual(results, results_expected) -# -# @unittest.skipIf( -#- "arm" in platform.machine() or "aarch64" in platform.machine() or "mips" in platform.machine() or "ppc64le" in platform.machine() or "s390x" in platform.machine(), -#+ "arm" in platform.machine() or "aarch64" in platform.machine() or "mips" in platform.machine() or "ppc64le" in platform.machine() or "s390x" in platform.machine() or "riscv64" in platform.machine(), -# "sdl2 blitter produces different results on arm", -# ) -# def test_src_alpha_sdl2_blitter(self): -@@ -2013,7 +2013,7 @@ class GeneralSurfaceTests(AssertRaisesRegexMixin, unittest.TestCase): - mask8 = (224, 28, 3, 0) - mask15 = (31744, 992, 31, 0) - mask16 = (63488, 2016, 31, 0) -- mask24 = (4278190080, 16711680, 65280, 0) -+ mask24 = (16711680, 65280, 255, 0) - mask32 = (4278190080, 16711680, 65280, 255) - - # Surfaces with standard depths and masks diff --git a/helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch b/helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch deleted file mode 100644 index 1c47b70..0000000 --- a/helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c105540bb10df5d29a101f593f2a3801c1fa0799 Mon Sep 17 00:00:00 2001 -From: gernot steinegger -Date: Sun, 9 Jan 2022 13:01:25 +0100 -Subject: [PATCH] "SDL_CreateWindowFrom" in "display" module - -if the environment variable "SDL_WINDOWID" is set, use "SDL_CreateWindowFrom" to create the window in "display.set_mode" ---- - src_c/display.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src_c/display.c b/src_c/display.c -index d37c29765a..26f07f77e9 100644 ---- a/src_c/display.c -+++ b/src_c/display.c -@@ -1096,7 +1096,10 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds) - - if (!win) { - /*open window*/ -- win = SDL_CreateWindow(title, x, y, w_1, h_1, sdl_flags); -+ const char *window_handle = SDL_getenv("SDL_WINDOWID"); -+ win = window_handle -+ ? SDL_CreateWindowFrom((const void*)atoll(window_handle)) -+ : SDL_CreateWindow(title, x, y, w_1, h_1, sdl_flags); - if (!win) - return RAISE(pgExc_SDLError, SDL_GetError()); - init_flip = 1; diff --git a/helpers/make-0ad b/helpers/make-0ad deleted file mode 100644 index 0db8f25..0000000 --- a/helpers/make-0ad +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpadcontent.net/wfg/0ad/ubuntu $UPSTREAM main' -REPOKEY="8CA7A6E8E4FA953A" -BACKPORTS=true -BUILD_UNTIL=11.0 - -. ./config - -changelog "Backported to get latest version into Trisquel" - -package diff --git a/helpers/make-0ad-data b/helpers/make-0ad-data deleted file mode 100644 index 6452270..0000000 --- a/helpers/make-0ad-data +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpadcontent.net/wfg/0ad/ubuntu $UPSTREAM main' -REPOKEY="8CA7A6E8E4FA953A" -BACKPORTS=true -BUILD_UNTIL=11.0 - -. ./config - -changelog "Backported as companion package for 0ad" - -package diff --git a/helpers/make-aptly b/helpers/make-aptly deleted file mode 100644 index 433e892..0000000 --- a/helpers/make-aptly +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport to get zstd compression support from debian bullseye." -package diff --git a/helpers/make-ayatana-indicator-sound b/helpers/make-ayatana-indicator-sound deleted file mode 100644 index 25d8b6b..0000000 --- a/helpers/make-ayatana-indicator-sound +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Remove helper once upstream version is 1.5.27 or later. - -# Apply patch to fix volume change notification -patch --no-backup-if-mismatch -p1 < $DATA/fix_volume_change_notification.patch - -changelog "Fix volume change notification on MATE and XFCE." - -package diff --git a/helpers/make-cups b/helpers/make-cups deleted file mode 100644 index 891e3fa..0000000 --- a/helpers/make-cups +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Add helper to force rebuild and reindex on i386 repo." - -package diff --git a/helpers/make-cwidget b/helpers/make-cwidget deleted file mode 100644 index 773f80d..0000000 --- a/helpers/make-cwidget +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -BUILD_UNTIL=11.0 - -. ./config - -#Apply patch to fix Debian's #1714264 -patch --no-backup-if-mismatch -p1 < $DATA/0002-Fix-cwidget-and-aptitude-FTBFS.patch - -changelog "Apply patch to fix Debian's #1015925 affecting aramo." - -package diff --git a/helpers/make-cython b/helpers/make-cython deleted file mode 100644 index 4c4a468..0000000 --- a/helpers/make-cython +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=0E98404D386FA1D9 -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bookworm as dependency of opendht 3.0." - -package diff --git a/helpers/make-deluge b/helpers/make-deluge deleted file mode 100644 index 137fc38..0000000 --- a/helpers/make-deluge +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu $UPSTREAM main' -REPOKEY="C5E6A5ED249AD24C" -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - -changelog "Imported to Trisquel from oficial PPA" - -package - diff --git a/helpers/make-enblend-enfuse b/helpers/make-enblend-enfuse deleted file mode 100644 index 9790bb2..0000000 --- a/helpers/make-enblend-enfuse +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Build as dependency of hugin." -package diff --git a/helpers/make-gajim b/helpers/make-gajim deleted file mode 100644 index f1b6eab..0000000 --- a/helpers/make-gajim +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -DEPENDS=python-nbxmpp -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-omemo b/helpers/make-gajim-omemo deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-omemo +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-openpgp b/helpers/make-gajim-openpgp deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-openpgp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-pgp b/helpers/make-gajim-pgp deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-pgp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-triggers b/helpers/make-gajim-triggers deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-triggers +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gnome-shell b/helpers/make-gnome-shell deleted file mode 100644 index ba020ab..0000000 --- a/helpers/make-gnome-shell +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Apply patch to drop deprecated scripts running on trisquel-mini -patch --no-backup-if-mismatch -p1 < $DATA/drop_gnome-shell-overrides-migration.patch -sed -i "/gnome-shell-overrides-migration.desktop/d" debian/gnome-shell.install - -changelog "Drop deprecated scripts running on trisquel-mini." - -package diff --git a/helpers/make-group-service b/helpers/make-group-service deleted file mode 100644 index 4d40903..0000000 --- a/helpers/make-group-service +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Imported as dependency of mate-user-admin." - -package diff --git a/helpers/make-hugin b/helpers/make-hugin deleted file mode 100644 index cc70247..0000000 --- a/helpers/make-hugin +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Build to reintroduce package in aramo repository." -package diff --git a/helpers/make-ibus b/helpers/make-ibus deleted file mode 100644 index 0bde4c7..0000000 --- a/helpers/make-ibus +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Remove helper once upstream version is 1.5.27 or later. - -# Add missing file on tarball (1.5.26) -cp $DATA/denylist.txt engine/ -# Apply patch to fix removal of Latin American Spanish -patch --no-backup-if-mismatch -p1 < $DATA/fix_latam_spanish_blacklist.patch -patch --no-backup-if-mismatch -p1 < $DATA/simple.xml.in_1.5.27.patch - -changelog "Fix missing latam keyboard layout." - -package diff --git a/helpers/make-ifupdown b/helpers/make-ifupdown deleted file mode 100644 index 7f1e725..0000000 --- a/helpers/make-ifupdown +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 -. ./config - -# Previously fixed LP: #1907878 - -changelog "Clean helper from manually patching previous bugs." -package diff --git a/helpers/make-libmateweather b/helpers/make-libmateweather deleted file mode 100644 index 7274cf7..0000000 --- a/helpers/make-libmateweather +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Apply patches from upstream for URL weather change and FTBFS on current -# aramo release. -for i in $DATA/*.patch; do - echo Applying patch $i -patch --no-backup-if-mismatch -p1 < $i -done - -changelog "Fix dataserver weather url change." - -package - diff --git a/helpers/make-libsdl2 b/helpers/make-libsdl2 deleted file mode 100644 index 00d3b76..0000000 --- a/helpers/make-libsdl2 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2024 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backport latest fixes from bookworm to improve/fix SDL support on aramo." - -package diff --git a/helpers/make-libsrtp2 b/helpers/make-libsrtp2 deleted file mode 100644 index 2f4a909..0000000 --- a/helpers/make-libsrtp2 +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=0E98404D386FA1D9 -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bookworm as dependency of libtgwot for openssl 3.0 support." - -package diff --git a/helpers/make-libstrophe b/helpers/make-libstrophe deleted file mode 100644 index 78adb26..0000000 --- a/helpers/make-libstrophe +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bullseye as dependency of profanity." - -package diff --git a/helpers/make-libvigraimpex b/helpers/make-libvigraimpex deleted file mode 100644 index 091e39a..0000000 --- a/helpers/make-libvigraimpex +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Build as dependency of hugin." - -package diff --git a/helpers/make-mate-system-monitor b/helpers/make-mate-system-monitor deleted file mode 100644 index b5fe0d1..0000000 --- a/helpers/make-mate-system-monitor +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Fix Information Fields not being saved - https://github.com/mate-desktop/mate-system-monitor/pull/224 -cat << PATCH | patch --no-backup-if-mismatch -p1 -From ddeb66b5af61a5367c8b72a5e5845317e82b62a4 Mon Sep 17 00:00:00 2001 -From: mbkma -Date: Wed, 8 Sep 2021 21:28:55 +0200 -Subject: [PATCH] Fix Information Fields not being saved - ---- - src/procman.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/procman.cpp b/src/procman.cpp -index b8a084dc..12d3d347 100644 ---- a/src/procman.cpp -+++ b/src/procman.cpp -@@ -97,10 +97,6 @@ procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *child - visible = g_settings_get_boolean (pt_settings, key); - g_free (key); - -- column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), id); -- if (column == NULL) -- continue; -- - gtk_tree_view_column_set_visible (column, visible); - if (visible) { - /* ensure column is really visible */ -PATCH - -changelog "Fix mate-system-monitor bug(s) for Trisquel" - -package - diff --git a/helpers/make-ncurses b/helpers/make-ncurses index 7f494e0..7f5e5e4 100644 --- a/helpers/make-ncurses +++ b/helpers/make-ncurses @@ -25,17 +25,9 @@ VERSION=2 NETINST=true -BUILD_UNTIL=11.0 . ./config -#FIXME:T12 -# Set version number due to source origin change -export FULLVERSION="$(sed 's|ubuntu0.1||' <<< $FULLVERSION)" - -# Apply Debian#1035621: ncurses: FTBFS: dh_autoreconf error on various architectures -patch --no-backup-if-mismatch -p1 < $DATA/bbd46b3955647bf401325951d9f31db054e8d889.patch changelog "Rebuild as udeb dependency for debian-installer and patch dh_autoreconf." -head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit package diff --git a/helpers/make-nodejs b/helpers/make-nodejs deleted file mode 100644 index 20e012c..0000000 --- a/helpers/make-nodejs +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - - -VERSION=0 -EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/build-support/ubuntu $UPSTREAM main' -REPOKEY=9BDB3D89CE49EC21 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Import as dependency of newer abrowser (deb) dependencies." -package diff --git a/helpers/make-opendht b/helpers/make-opendht deleted file mode 100644 index a5f0957..0000000 --- a/helpers/make-opendht +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 -. ./config - -#Remove symbols missing at trisquel -sed -i '/ZNSt12_Vector_baseIhSaIhEED1Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt12_Vector_baseIhSaIhEED2Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt14_Function_baseD1Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt14_Function_baseD2Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M/d' debian/libopendht-c2.symbols -sed -i '/ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M/d' debian/libopendht-c2.symbols - -changelog "Imported into trisquel backports as part of jami dependency." - -package diff --git a/helpers/make-pkg-kde-tools b/helpers/make-pkg-kde-tools deleted file mode 100644 index b361a7c..0000000 --- a/helpers/make-pkg-kde-tools +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe' -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - -# Fix version number due to early release. -export FULLVERSION="$(sed 's|ubuntu1||' <<< $FULLVERSION)" - - -changelog "Backported from noble as dependency of libsrtp2 for openssl 3.0 support. || Route backport to upstream ubuntu." -head -n1 debian/changelog | grep -q ubuntu && echo "error: update FULLVERSION value" && exit - -package diff --git a/helpers/make-profanity b/helpers/make-profanity deleted file mode 100644 index 7a9b389..0000000 --- a/helpers/make-profanity +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -DEPENDS=libstrophe -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bullseye fixing logs issues." - -package diff --git a/helpers/make-pupnp b/helpers/make-pupnp deleted file mode 100644 index 7330308..0000000 --- a/helpers/make-pupnp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' -REPOKEY=6ED0E7B82643E131 -BACKPORT=true -BUILD_UNTIL=11.0 -. ./config - -changelog "Imported into trisquel backports as part of jami dependency." - -package diff --git a/helpers/make-pygame b/helpers/make-pygame deleted file mode 100644 index 015dc37..0000000 --- a/helpers/make-pygame +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2024 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# 01_Rebuild to use the latest SDL support on aramo. -# 02_SDL_CreateWindowFrom in "display" module -for patch in $(ls -v ${DATA}/*.patch) -do - echo "Applying $patch" - patch --no-backup-if-mismatch -Np1 < $patch -done - -changelog "Rebuild to use the latest SDL support on aramo. | Fix 'SDL_CreateWindowFrom' in 'display' module" - -package diff --git a/helpers/make-python-nbxmpp b/helpers/make-python-nbxmpp deleted file mode 100644 index 99a8f56..0000000 --- a/helpers/make-python-nbxmpp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -BACKPORTS=true -. ./config - - -changelog "Backport as a dependency for gajim backport from debian." -package diff --git a/helpers/make-restinio b/helpers/make-restinio deleted file mode 100644 index 7330308..0000000 --- a/helpers/make-restinio +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' -REPOKEY=6ED0E7B82643E131 -BACKPORT=true -BUILD_UNTIL=11.0 -. ./config - -changelog "Imported into trisquel backports as part of jami dependency." - -package diff --git a/helpers/make-tre b/helpers/make-tre deleted file mode 100644 index 2328928..0000000 --- a/helpers/make-tre +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Add helper to force re-index on i386 repo." - -package diff --git a/helpers/make-unknown-horizons b/helpers/make-unknown-horizons deleted file mode 100644 index e3200dc..0000000 --- a/helpers/make-unknown-horizons +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2024 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 - -. ./config - -# Restore unifont.ttf usage for T11.0 only. -sed -i 's|/usr/share/fonts/opentype/unifont/unifont.otf|/usr/share/fonts/truetype/unifont/unifont.ttf|' debian/links - -changelog "Backport latest fixes from bookworm, while still using unifont.ttf on aramo." - -package From 88b3f96c4521de3f4a05ee1fa1b9f28cb089d0af Mon Sep 17 00:00:00 2001 From: Ark74 Date: Sat, 6 Apr 2024 19:02:00 -0600 Subject: [PATCH 003/341] config: update data and version schema for ecne. --- helpers/config | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/helpers/config b/helpers/config index 9fe67e4..22d27c5 100755 --- a/helpers/config +++ b/helpers/config @@ -39,12 +39,12 @@ fi export DEBIAN_FRONTEND=noninteractive export DEBEMAIL=trisquel-devel@listas.trisquel.info export DEBFULLNAME="Trisquel GNU/Linux developers" -export CODENAME=aramo -export REVISION=11.0 +export CODENAME=ecne +export REVISION=12.0 export RELEASE=trisquel export DOMAIN=trisquel.info -export UPSTREAM=jammy -export UPSTREAMRELEASE=22.04 +export UPSTREAM=noble +export UPSTREAMRELEASE=24.04 MIRROR=http://archive.ubuntu.com/ubuntu LOCALMIRROR=http://archive.trisquel.org/trisquel LOCAL_APT=`mktemp -d` @@ -169,17 +169,7 @@ cd source UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version) -# This needs to be enabled (and reviewed) as first step of t12 release. Making it break here to force review -[ "$REVISION" == 12.0 ] && echo Review version string generation before building t12 packages! && exit 1 -export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION} -[ "$PACKAGE" == "console-setup" ] && export FULLVERSION=$(dpkg-parsechangelog --show-field Version)-${REVISION}trisquel${VERSION} -# This is the proposed method: -#if echo $UPSTREAMVERSION | grep -q '-'; then -# export FULLVERSION=$(dpkg-parsechangelog --show-field Version)+${REVISION}trisquel${VERSION} -#else -# export FULLVERSION=$(dpkg-parsechangelog --show-field Version)-${REVISION}trisquel${VERSION} -#fi -# IMPORTANT: the build watchdog would need to be modified to match any changes done here +export FULLVERSION=$(dpkg-parsechangelog --show-field Version)trisquel${VERSION} # Use 3.0 (native) deb source format [ -f debian/source/format ] && echo "3 (native)" > debian/source/format From df6774d1fe0cc179373d277471e8a9d6b4f39c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Tue, 30 Apr 2024 16:55:41 +0000 Subject: [PATCH 004/341] misc: update changes from aramo to ecne --- helpers/DATA/linux-hwe-6.5/udeb/d-i.patch | 23 +- helpers/DATA/linux/kernel-wedge-arch.pl | 26 -- helpers/DATA/linux/{ => udeb}/5-udebs.mk | 2 +- helpers/DATA/linux/{ => udeb}/d-i.patch | 12 +- .../linux/{ => udeb}/d-i/firmware/README.txt | 0 .../{ => udeb}/d-i/firmware/amd64/README.txt | 0 .../{ => udeb}/d-i/firmware/amd64/nic-modules | 0 .../d-i/firmware/amd64/scsi-modules | 0 .../{ => udeb}/d-i/firmware/arm64/README.txt | 0 .../{ => udeb}/d-i/firmware/arm64/nic-modules | 0 .../d-i/firmware/arm64/scsi-modules | 0 .../{ => udeb}/d-i/firmware/armhf/README.txt | 0 .../{ => udeb}/d-i/firmware/i386/README.txt | 0 .../{ => udeb}/d-i/firmware/i386/nic-modules | 0 .../{ => udeb}/d-i/firmware/i386/scsi-modules | 0 .../linux/{ => udeb}/d-i/firmware/nic-modules | 0 .../d-i/firmware/powerpc/README.txt | 0 .../d-i/firmware/powerpc/nic-modules | 0 .../d-i/firmware/powerpc/scsi-modules | 0 .../d-i/firmware/ppc64el/README.txt | 0 .../d-i/firmware/ppc64el/nic-modules | 0 .../d-i/firmware/ppc64el/scsi-modules | 0 .../{ => udeb}/d-i/firmware/s390x/README.txt | 0 .../{ => udeb}/d-i/firmware/s390x/nic-modules | 0 .../d-i/firmware/s390x/scsi-modules | 0 .../{ => udeb}/d-i/firmware/scsi-modules | 0 .../DATA/linux/{ => udeb}/d-i/kernel-versions | 0 .../d-i/modules/amd64-virtual/block-modules | 0 .../d-i/modules/amd64-virtual/crc-modules | 0 .../d-i/modules/amd64-virtual/crypto-modules | 0 .../d-i/modules/amd64-virtual/fat-modules | 0 .../d-i/modules/amd64-virtual/fb-modules | 0 .../d-i/modules/amd64-virtual/floppy-modules | 0 .../d-i/modules/amd64-virtual/fs-core-modules | 0 .../amd64-virtual/fs-secondary-modules | 0 .../d-i/modules/amd64-virtual/isofs-modules | 0 .../d-i/modules/amd64-virtual/kernel-image | 0 .../d-i/modules/amd64-virtual/md-modules | 0 .../d-i/modules/amd64-virtual/message-modules | 0 .../d-i/modules/amd64-virtual/mouse-modules | 0 .../modules/amd64-virtual/multipath-modules | 0 .../d-i/modules/amd64-virtual/nic-modules | 0 .../modules/amd64-virtual/nic-shared-modules | 0 .../amd64-virtual/nic-wireless-modules | 0 .../d-i/modules/amd64-virtual/parport-modules | 0 .../modules/amd64-virtual/scsi-core-modules | 0 .../d-i/modules/amd64-virtual/scsi-modules | 0 .../d-i/modules/amd64-virtual/serial-modules | 0 .../amd64-virtual/storage-core-modules | 0 .../modules/amd64-virtual/usb-storage-modules | 0 .../d-i/modules/amd64-virtual/virtio-modules | 0 .../d-i/modules/amd64-virtual/vlan-modules | 0 .../d-i/modules/amd64/block-modules | 0 .../{ => udeb}/d-i/modules/amd64/crc-modules | 0 .../d-i/modules/amd64/crypto-modules | 0 .../{ => udeb}/d-i/modules/amd64/fat-modules | 0 .../{ => udeb}/d-i/modules/amd64/fb-modules | 0 .../d-i/modules/amd64/firewire-core-modules | 0 .../d-i/modules/amd64/floppy-modules | 0 .../d-i/modules/amd64/fs-core-modules | 0 .../d-i/modules/amd64/fs-secondary-modules | 0 .../{ => udeb}/d-i/modules/amd64/i2c-modules | 0 .../d-i/modules/amd64/input-modules | 0 .../{ => udeb}/d-i/modules/amd64/ipmi-modules | 0 .../d-i/modules/amd64/isofs-modules | 0 .../{ => udeb}/d-i/modules/amd64/kernel-image | 0 .../{ => udeb}/d-i/modules/amd64/md-modules | 0 .../d-i/modules/amd64/message-modules | 0 .../d-i/modules/amd64/mouse-modules | 0 .../d-i/modules/amd64/mtd-core-modules | 0 .../d-i/modules/amd64/multipath-modules | 0 .../{ => udeb}/d-i/modules/amd64/nfs-modules | 0 .../{ => udeb}/d-i/modules/amd64/nic-modules | 0 .../d-i/modules/amd64/nic-pcmcia-modules | 0 .../d-i/modules/amd64/nic-shared-modules | 0 .../d-i/modules/amd64/nic-usb-modules | 0 .../d-i/modules/amd64/nic-wireless-modules | 0 .../d-i/modules/amd64/parport-modules | 0 .../{ => udeb}/d-i/modules/amd64/pata-modules | 0 .../d-i/modules/amd64/pcmcia-modules | 0 .../d-i/modules/amd64/pcmcia-storage-modules | 0 .../{ => udeb}/d-i/modules/amd64/plip-modules | 0 .../{ => udeb}/d-i/modules/amd64/ppp-modules | 0 .../{ => udeb}/d-i/modules/amd64/sata-modules | 0 .../d-i/modules/amd64/scsi-core-modules | 0 .../{ => udeb}/d-i/modules/amd64/scsi-modules | 0 .../d-i/modules/amd64/serial-modules | 0 .../d-i/modules/amd64/speakup-modules | 0 .../d-i/modules/amd64/storage-core-modules | 0 .../{ => udeb}/d-i/modules/amd64/usb-modules | 0 .../d-i/modules/amd64/usb-storage-modules | 0 .../d-i/modules/amd64/virtio-modules | 0 .../{ => udeb}/d-i/modules/amd64/vlan-modules | 0 .../d-i/modules/arm64/block-modules | 0 .../{ => udeb}/d-i/modules/arm64/crc-modules | 0 .../d-i/modules/arm64/crypto-modules | 0 .../{ => udeb}/d-i/modules/arm64/fat-modules | 0 .../{ => udeb}/d-i/modules/arm64/fb-modules | 0 .../d-i/modules/arm64/fs-core-modules | 0 .../d-i/modules/arm64/fs-secondary-modules | 0 .../{ => udeb}/d-i/modules/arm64/i2c-modules | 0 .../d-i/modules/arm64/input-modules | 0 .../{ => udeb}/d-i/modules/arm64/ipmi-modules | 0 .../d-i/modules/arm64/isofs-modules | 0 .../{ => udeb}/d-i/modules/arm64/kernel-image | 0 .../{ => udeb}/d-i/modules/arm64/md-modules | 0 .../d-i/modules/arm64/message-modules | 0 .../d-i/modules/arm64/mouse-modules | 0 .../d-i/modules/arm64/mtd-core-modules | 0 .../d-i/modules/arm64/multipath-modules | 0 .../{ => udeb}/d-i/modules/arm64/nfs-modules | 0 .../{ => udeb}/d-i/modules/arm64/nic-modules | 0 .../d-i/modules/arm64/nic-shared-modules | 0 .../d-i/modules/arm64/nic-usb-modules | 0 .../d-i/modules/arm64/nic-wireless-modules | 0 .../d-i/modules/arm64/parport-modules | 0 .../{ => udeb}/d-i/modules/arm64/plip-modules | 0 .../{ => udeb}/d-i/modules/arm64/ppp-modules | 0 .../{ => udeb}/d-i/modules/arm64/sata-modules | 0 .../d-i/modules/arm64/scsi-core-modules | 0 .../{ => udeb}/d-i/modules/arm64/scsi-modules | 0 .../d-i/modules/arm64/speakup-modules | 0 .../d-i/modules/arm64/storage-core-modules | 0 .../{ => udeb}/d-i/modules/arm64/usb-modules | 0 .../d-i/modules/arm64/usb-storage-modules | 0 .../d-i/modules/arm64/virtio-modules | 0 .../{ => udeb}/d-i/modules/arm64/vlan-modules | 0 .../d-i/modules/armhf/block-modules | 0 .../{ => udeb}/d-i/modules/armhf/crc-modules | 0 .../d-i/modules/armhf/crypto-modules | 0 .../{ => udeb}/d-i/modules/armhf/fat-modules | 0 .../d-i/modules/armhf/fs-core-modules | 0 .../d-i/modules/armhf/fs-secondary-modules | 0 .../{ => udeb}/d-i/modules/armhf/i2c-modules | 0 .../d-i/modules/armhf/input-modules | 0 .../{ => udeb}/d-i/modules/armhf/ipmi-modules | 0 .../d-i/modules/armhf/isofs-modules | 0 .../{ => udeb}/d-i/modules/armhf/kernel-image | 0 .../{ => udeb}/d-i/modules/armhf/md-modules | 0 .../d-i/modules/armhf/mouse-modules | 0 .../{ => udeb}/d-i/modules/armhf/mtd-modules | 0 .../d-i/modules/armhf/multipath-modules | 0 .../{ => udeb}/d-i/modules/armhf/nfs-modules | 0 .../{ => udeb}/d-i/modules/armhf/nic-modules | 0 .../d-i/modules/armhf/nic-shared-modules | 0 .../d-i/modules/armhf/nic-usb-modules | 0 .../d-i/modules/armhf/nic-wireless-modules | 0 .../d-i/modules/armhf/parport-modules | 0 .../{ => udeb}/d-i/modules/armhf/plip-modules | 0 .../{ => udeb}/d-i/modules/armhf/ppp-modules | 0 .../{ => udeb}/d-i/modules/armhf/sata-modules | 0 .../d-i/modules/armhf/scsi-core-modules | 0 .../{ => udeb}/d-i/modules/armhf/scsi-modules | 0 .../d-i/modules/armhf/speakup-modules | 0 .../d-i/modules/armhf/storage-core-modules | 0 .../{ => udeb}/d-i/modules/armhf/usb-modules | 0 .../d-i/modules/armhf/usb-storage-modules | 0 .../{ => udeb}/d-i/modules/armhf/vlan-modules | 0 .../{ => udeb}/d-i/modules/block-modules | 0 .../d-i/modules/block-modules.powerpc | 0 .../linux/{ => udeb}/d-i/modules/crc-modules | 0 .../{ => udeb}/d-i/modules/crypto-modules | 0 .../d-i/modules/dasd-extra-modules.s390x | 0 .../{ => udeb}/d-i/modules/dasd-modules.s390x | 0 .../linux/{ => udeb}/d-i/modules/fat-modules | 0 .../linux/{ => udeb}/d-i/modules/fb-modules | 0 .../d-i/modules/firewire-core-modules | 0 .../{ => udeb}/d-i/modules/floppy-modules | 0 .../{ => udeb}/d-i/modules/fs-core-modules | 0 .../d-i/modules/fs-secondary-modules | 0 .../linux/{ => udeb}/d-i/modules/i2c-modules | 0 .../d-i/modules/i386-virtual/block-modules | 0 .../d-i/modules/i386-virtual/crc-modules | 0 .../d-i/modules/i386-virtual/crypto-modules | 0 .../d-i/modules/i386-virtual/fat-modules | 0 .../d-i/modules/i386-virtual/fb-modules | 0 .../d-i/modules/i386-virtual/floppy-modules | 0 .../d-i/modules/i386-virtual/fs-core-modules | 0 .../modules/i386-virtual/fs-secondary-modules | 0 .../d-i/modules/i386-virtual/isofs-modules | 0 .../d-i/modules/i386-virtual/kernel-image | 0 .../d-i/modules/i386-virtual/md-modules | 0 .../d-i/modules/i386-virtual/message-modules | 0 .../d-i/modules/i386-virtual/mouse-modules | 0 .../modules/i386-virtual/multipath-modules | 0 .../d-i/modules/i386-virtual/nic-modules | 0 .../modules/i386-virtual/nic-shared-modules | 0 .../modules/i386-virtual/nic-wireless-modules | 0 .../d-i/modules/i386-virtual/parport-modules | 0 .../modules/i386-virtual/scsi-core-modules | 0 .../d-i/modules/i386-virtual/scsi-modules | 0 .../d-i/modules/i386-virtual/serial-modules | 0 .../modules/i386-virtual/storage-core-modules | 0 .../modules/i386-virtual/usb-storage-modules | 0 .../d-i/modules/i386-virtual/virtio-modules | 0 .../d-i/modules/i386-virtual/vlan-modules | 0 .../{ => udeb}/d-i/modules/i386/block-modules | 0 .../{ => udeb}/d-i/modules/i386/crc-modules | 0 .../d-i/modules/i386/crypto-modules | 0 .../{ => udeb}/d-i/modules/i386/fat-modules | 0 .../{ => udeb}/d-i/modules/i386/fb-modules | 0 .../d-i/modules/i386/firewire-core-modules | 0 .../d-i/modules/i386/floppy-modules | 0 .../d-i/modules/i386/fs-core-modules | 0 .../d-i/modules/i386/fs-secondary-modules | 0 .../{ => udeb}/d-i/modules/i386/i2c-modules | 0 .../{ => udeb}/d-i/modules/i386/input-modules | 0 .../{ => udeb}/d-i/modules/i386/ipmi-modules | 0 .../{ => udeb}/d-i/modules/i386/isofs-modules | 0 .../{ => udeb}/d-i/modules/i386/kernel-image | 0 .../{ => udeb}/d-i/modules/i386/md-modules | 0 .../d-i/modules/i386/message-modules | 0 .../{ => udeb}/d-i/modules/i386/mouse-modules | 0 .../d-i/modules/i386/mtd-core-modules | 0 .../d-i/modules/i386/multipath-modules | 0 .../{ => udeb}/d-i/modules/i386/nfs-modules | 0 .../{ => udeb}/d-i/modules/i386/nic-modules | 0 .../d-i/modules/i386/nic-pcmcia-modules | 0 .../d-i/modules/i386/nic-shared-modules | 0 .../d-i/modules/i386/nic-usb-modules | 0 .../d-i/modules/i386/nic-wireless-modules | 0 .../d-i/modules/i386/parport-modules | 0 .../{ => udeb}/d-i/modules/i386/pata-modules | 0 .../d-i/modules/i386/pcmcia-modules | 0 .../d-i/modules/i386/pcmcia-storage-modules | 0 .../{ => udeb}/d-i/modules/i386/plip-modules | 0 .../{ => udeb}/d-i/modules/i386/ppp-modules | 0 .../{ => udeb}/d-i/modules/i386/sata-modules | 0 .../d-i/modules/i386/scsi-core-modules | 0 .../{ => udeb}/d-i/modules/i386/scsi-modules | 0 .../d-i/modules/i386/serial-modules | 0 .../d-i/modules/i386/speakup-modules | 0 .../d-i/modules/i386/storage-core-modules | 0 .../{ => udeb}/d-i/modules/i386/usb-modules | 0 .../d-i/modules/i386/usb-storage-modules | 0 .../d-i/modules/i386/virtio-modules | 0 .../{ => udeb}/d-i/modules/i386/vlan-modules | 0 .../{ => udeb}/d-i/modules/input-modules | 0 .../linux/{ => udeb}/d-i/modules/ipmi-modules | 0 .../{ => udeb}/d-i/modules/isofs-modules | 0 .../linux/{ => udeb}/d-i/modules/kernel-image | 0 .../linux/{ => udeb}/d-i/modules/md-modules | 0 .../{ => udeb}/d-i/modules/message-modules | 0 .../d-i/modules/message-modules.powerpc | 0 .../{ => udeb}/d-i/modules/mouse-modules | 0 .../{ => udeb}/d-i/modules/mtd-core-modules | 0 .../linux/{ => udeb}/d-i/modules/mtd-modules | 0 .../{ => udeb}/d-i/modules/multipath-modules | 0 .../linux/{ => udeb}/d-i/modules/nfs-modules | 0 .../linux/{ => udeb}/d-i/modules/nic-modules | 0 .../d-i/modules/nic-modules.powerpc | 0 .../{ => udeb}/d-i/modules/nic-pcmcia-modules | 0 .../{ => udeb}/d-i/modules/nic-shared-modules | 0 .../{ => udeb}/d-i/modules/nic-usb-modules | 0 .../d-i/modules/nic-wireless-modules | 0 .../{ => udeb}/d-i/modules/parport-modules | 0 .../linux/{ => udeb}/d-i/modules/pata-modules | 0 .../{ => udeb}/d-i/modules/pcmcia-modules | 0 .../d-i/modules/pcmcia-storage-modules | 0 .../linux/{ => udeb}/d-i/modules/plip-modules | 0 .../d-i/modules/ppc64el/block-modules | 0 .../d-i/modules/ppc64el/crc-modules | 0 .../d-i/modules/ppc64el/crypto-modules | 0 .../d-i/modules/ppc64el/fat-modules | 0 .../{ => udeb}/d-i/modules/ppc64el/fb-modules | 0 .../d-i/modules/ppc64el/floppy-modules | 0 .../d-i/modules/ppc64el/fs-core-modules | 0 .../d-i/modules/ppc64el/fs-secondary-modules | 0 .../d-i/modules/ppc64el/i2c-modules | 0 .../d-i/modules/ppc64el/input-modules | 0 .../d-i/modules/ppc64el/ipmi-modules | 0 .../d-i/modules/ppc64el/isofs-modules | 0 .../d-i/modules/ppc64el/kernel-image | 0 .../{ => udeb}/d-i/modules/ppc64el/md-modules | 0 .../d-i/modules/ppc64el/message-modules | 0 .../d-i/modules/ppc64el/mtd-core-modules | 0 .../d-i/modules/ppc64el/multipath-modules | 0 .../d-i/modules/ppc64el/nfs-modules | 0 .../d-i/modules/ppc64el/nic-modules | 0 .../d-i/modules/ppc64el/nic-shared-modules | 0 .../d-i/modules/ppc64el/nic-usb-modules | 0 .../d-i/modules/ppc64el/nic-wireless-modules | 0 .../d-i/modules/ppc64el/parport-modules | 0 .../d-i/modules/ppc64el/plip-modules | 0 .../d-i/modules/ppc64el/ppp-modules | 0 .../d-i/modules/ppc64el/sata-modules | 0 .../d-i/modules/ppc64el/scsi-core-modules | 0 .../d-i/modules/ppc64el/scsi-modules | 0 .../d-i/modules/ppc64el/serial-modules | 0 .../d-i/modules/ppc64el/storage-core-modules | 0 .../d-i/modules/ppc64el/usb-modules | 0 .../d-i/modules/ppc64el/usb-storage-modules | 0 .../d-i/modules/ppc64el/virtio-modules | 0 .../d-i/modules/ppc64el/vlan-modules | 0 .../linux/{ => udeb}/d-i/modules/ppp-modules | 0 .../d-i/modules/s390x/block-modules | 0 .../{ => udeb}/d-i/modules/s390x/crc-modules | 0 .../d-i/modules/s390x/crypto-modules | 0 .../d-i/modules/s390x/dasd-extra-modules | 0 .../{ => udeb}/d-i/modules/s390x/dasd-modules | 0 .../{ => udeb}/d-i/modules/s390x/fat-modules | 0 .../d-i/modules/s390x/fs-core-modules | 0 .../d-i/modules/s390x/fs-secondary-modules | 0 .../d-i/modules/s390x/isofs-modules | 0 .../{ => udeb}/d-i/modules/s390x/kernel-image | 0 .../{ => udeb}/d-i/modules/s390x/md-modules | 0 .../d-i/modules/s390x/multipath-modules | 0 .../{ => udeb}/d-i/modules/s390x/nfs-modules | 0 .../{ => udeb}/d-i/modules/s390x/nic-modules | 0 .../d-i/modules/s390x/nic-shared-modules | 0 .../d-i/modules/s390x/scsi-core-modules | 0 .../{ => udeb}/d-i/modules/s390x/scsi-modules | 0 .../d-i/modules/s390x/storage-core-modules | 0 .../d-i/modules/s390x/virtio-modules | 0 .../{ => udeb}/d-i/modules/s390x/vlan-modules | 0 .../linux/{ => udeb}/d-i/modules/sata-modules | 0 .../{ => udeb}/d-i/modules/scsi-core-modules | 0 .../linux/{ => udeb}/d-i/modules/scsi-modules | 0 .../d-i/modules/scsi-modules.powerpc | 0 .../{ => udeb}/d-i/modules/serial-modules | 0 .../{ => udeb}/d-i/modules/speakup-modules | 0 .../d-i/modules/storage-core-modules | 0 .../d-i/modules/storage-core-modules.powerpc | 0 .../linux/{ => udeb}/d-i/modules/usb-modules | 0 .../d-i/modules/usb-storage-modules | 0 .../{ => udeb}/d-i/modules/virtio-modules | 0 .../linux/{ => udeb}/d-i/modules/vlan-modules | 0 .../DATA/linux/{ => udeb}/d-i/package-list | 0 ...client.api.u.pro.packages.updates.v1.patch | 107 ++++++++ helpers/make-firefox | 4 +- helpers/make-libreoffice | 5 +- helpers/make-linux | 244 ++++++++++++------ helpers/make-linux-hwe-6.5 | 2 +- helpers/make-linux-meta | 4 +- helpers/make-nvidia-settings | 29 +++ helpers/make-ubuntu-release-upgrader | 3 +- helpers/make-update-manager | 5 +- 337 files changed, 341 insertions(+), 125 deletions(-) delete mode 100755 helpers/DATA/linux/kernel-wedge-arch.pl rename helpers/DATA/linux/{ => udeb}/5-udebs.mk (96%) rename helpers/DATA/linux/{ => udeb}/d-i.patch (89%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/amd64/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/amd64/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/amd64/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/arm64/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/arm64/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/arm64/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/armhf/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/i386/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/i386/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/i386/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/powerpc/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/powerpc/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/powerpc/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/ppc64el/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/ppc64el/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/ppc64el/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/s390x/README.txt (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/s390x/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/s390x/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/firmware/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/kernel-versions (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/floppy-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/serial-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64-virtual/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/firewire-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/floppy-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/i2c-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/input-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/ipmi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/mtd-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-pcmcia-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/pata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/pcmcia-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/pcmcia-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/plip-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/ppp-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/sata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/serial-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/speakup-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/amd64/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/i2c-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/input-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/ipmi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/mtd-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/plip-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/ppp-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/sata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/speakup-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/arm64/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/i2c-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/input-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/ipmi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/mtd-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/plip-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/ppp-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/sata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/speakup-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/armhf/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/block-modules.powerpc (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/dasd-extra-modules.s390x (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/dasd-modules.s390x (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/firewire-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/floppy-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i2c-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/floppy-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/serial-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386-virtual/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/firewire-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/floppy-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/i2c-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/input-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/ipmi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/mtd-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-pcmcia-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/pata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/pcmcia-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/pcmcia-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/plip-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/ppp-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/sata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/serial-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/speakup-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/i386/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/input-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ipmi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/message-modules.powerpc (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/mouse-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/mtd-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/mtd-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-modules.powerpc (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-pcmcia-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/pata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/pcmcia-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/pcmcia-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/plip-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/floppy-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/i2c-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/input-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/ipmi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/message-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/mtd-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/nic-wireless-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/parport-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/plip-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/ppp-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/sata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/serial-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppc64el/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/ppp-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/block-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/crc-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/crypto-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/dasd-extra-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/dasd-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/fat-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/fs-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/fs-secondary-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/isofs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/kernel-image (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/md-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/multipath-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/nfs-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/nic-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/nic-shared-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/s390x/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/sata-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/scsi-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/scsi-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/scsi-modules.powerpc (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/serial-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/speakup-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/storage-core-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/storage-core-modules.powerpc (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/usb-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/usb-storage-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/virtio-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/modules/vlan-modules (100%) rename helpers/DATA/linux/{ => udeb}/d-i/package-list (100%) create mode 100644 helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch create mode 100644 helpers/make-nvidia-settings diff --git a/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch b/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch index 624ff53..4d0a27a 100644 --- a/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch +++ b/helpers/DATA/linux-hwe-6.5/udeb/d-i.patch @@ -1,8 +1,8 @@ diff --git a/debian/rules b/debian/rules -index fe52711..b2d1921 100755 +index 661286bd..e828a0ac 100755 --- a/debian/rules +++ b/debian/rules -@@ -134,12 +134,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. +@@ -128,12 +128,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. dh_testroot dh_clean @@ -12,7 +12,7 @@ index fe52711..b2d1921 100755 + rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image + # normal build junk - rm -rf $(DEBIAN)/abi/$(release)-$(revision) + rm -rf $(DEBIAN)/abi rm -rf $(builddir) rm -f $(stampdir)/stamp-* rm -rf debian/linux-*/ @@ -22,14 +22,15 @@ index fe52711..b2d1921 100755 cp $(DEBIAN)/changelog debian/changelog # Install the copyright information. -@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: \ - $(DROOT)/scripts/control-create \ - $(control_files) \ - debian/canonical-revoked-certs.pem \ -- $(DROOT)/control.d/flavour-module.stub \ - $(DEBIAN)/changelog \ - $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars) - for i in $(control_files); do \ +#removed at 6.5.0-27.28~22.04.1 +#@@ -184,7 +191,6 @@ $(DEBIAN)/control.stub: \ +# $(DROOT)/scripts/control-create \ +# $(control_files) \ +# debian/canonical-revoked-certs.pem \ +#- $(DROOT)/control.d/flavour-module.stub \ +# $(DEBIAN)/changelog \ +# $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars) +# for i in $(control_files); do \ @@ -211,7 +217,14 @@ $(DEBIAN)/control.stub: \ .PHONY: debian/control diff --git a/helpers/DATA/linux/kernel-wedge-arch.pl b/helpers/DATA/linux/kernel-wedge-arch.pl deleted file mode 100755 index 4b4fefe..0000000 --- a/helpers/DATA/linux/kernel-wedge-arch.pl +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/perl -# -# kernel-wedge-arch.pl -- select only specifiers for the supplied arch. -# -use strict; - -require Dpkg::Control; -require Dpkg::Deps; - -my $fh = \*STDIN; - -my @entries; - -my $wanted = $ARGV[0]; - -my $entry; -while (!eof($fh)) { - $entry = Dpkg::Control->new(); - $entry->parse($fh, '???'); - - if ($entry->{'Architecture'} eq $wanted) { - print("\n" . $entry); - } -} - -close($fh); diff --git a/helpers/DATA/linux/5-udebs.mk b/helpers/DATA/linux/udeb/5-udebs.mk similarity index 96% rename from helpers/DATA/linux/5-udebs.mk rename to helpers/DATA/linux/udeb/5-udebs.mk index f48c0d6..e642fe6 100644 --- a/helpers/DATA/linux/5-udebs.mk +++ b/helpers/DATA/linux/udeb/5-udebs.mk @@ -6,7 +6,7 @@ ifeq ($(disable_d_i),) do-binary-udebs endif -do-binary-udebs: linux_udeb_name=$(shell if echo $(src_pkg_name)|egrep -q '(linux-lts|linux-hwe)'; then echo $(src_pkg_name); else echo linux; fi) +do-binary-udebs: linux_udeb_name=$(shell if echo $(src_pkg_name)|egrep -q '(linux-lts|linux-hwe|linux-[0-9]+\.[0-9]+)'; then echo $(src_pkg_name); else echo linux; fi) do-binary-udebs: debian/control @echo Debug: $@ dh_testdir diff --git a/helpers/DATA/linux/d-i.patch b/helpers/DATA/linux/udeb/d-i.patch similarity index 89% rename from helpers/DATA/linux/d-i.patch rename to helpers/DATA/linux/udeb/d-i.patch index 2c6d6bd..9c8d495 100644 --- a/helpers/DATA/linux/d-i.patch +++ b/helpers/DATA/linux/udeb/d-i.patch @@ -1,6 +1,8 @@ ---- a/debian/rules 2023-02-10 11:40:38.000000000 -0600 -+++ b/debian/rules 2023-02-10 11:53:56.313708852 -0600 -@@ -128,12 +128,19 @@ +diff --git a/debian/rules b/debian/rules +index 0f238b32..d96c732e 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -122,12 +122,19 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. dh_testroot dh_clean @@ -10,7 +12,7 @@ + rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image + # normal build junk - rm -rf $(DEBIAN)/abi/$(release)-$(revision) + rm -rf $(DEBIAN)/abi rm -rf $(builddir) rm -f $(stampdir)/stamp-* rm -rf $(DEBIAN)/linux-* @@ -37,7 +39,7 @@ + export KW_DEFCONFIG_DIR=$(DEBIAN)/d-i && \ + export KW_CONFIG_DIR=$(DEBIAN)/d-i && \ + LANG=C kernel-wedge gen-control $(release)-$(abinum) | \ -+ perl -f $(DROOT)/scripts/misc/kernel-wedge-arch.pl $(arch) \ ++ grep-dctrl -FArchitecture $(arch) \ + >>$(CURDIR)/debian/control debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DROOT)/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem) diff --git a/helpers/DATA/linux/d-i/firmware/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/amd64/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/amd64/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/amd64/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/amd64/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/amd64/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/amd64/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/amd64/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/amd64/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/amd64/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/amd64/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/amd64/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/amd64/scsi-modules diff --git a/helpers/DATA/linux/d-i/firmware/arm64/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/arm64/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/arm64/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/arm64/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/arm64/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/arm64/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/arm64/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/arm64/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/arm64/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/arm64/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/arm64/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/arm64/scsi-modules diff --git a/helpers/DATA/linux/d-i/firmware/armhf/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/armhf/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/armhf/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/armhf/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/i386/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/i386/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/i386/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/i386/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/i386/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/i386/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/i386/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/i386/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/i386/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/i386/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/i386/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/i386/scsi-modules diff --git a/helpers/DATA/linux/d-i/firmware/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/powerpc/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/powerpc/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/powerpc/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/powerpc/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/powerpc/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/powerpc/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/powerpc/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/powerpc/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/powerpc/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/powerpc/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/powerpc/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/powerpc/scsi-modules diff --git a/helpers/DATA/linux/d-i/firmware/ppc64el/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/ppc64el/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/ppc64el/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/ppc64el/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/ppc64el/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/ppc64el/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/ppc64el/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/ppc64el/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/ppc64el/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/ppc64el/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/ppc64el/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/ppc64el/scsi-modules diff --git a/helpers/DATA/linux/d-i/firmware/s390x/README.txt b/helpers/DATA/linux/udeb/d-i/firmware/s390x/README.txt similarity index 100% rename from helpers/DATA/linux/d-i/firmware/s390x/README.txt rename to helpers/DATA/linux/udeb/d-i/firmware/s390x/README.txt diff --git a/helpers/DATA/linux/d-i/firmware/s390x/nic-modules b/helpers/DATA/linux/udeb/d-i/firmware/s390x/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/s390x/nic-modules rename to helpers/DATA/linux/udeb/d-i/firmware/s390x/nic-modules diff --git a/helpers/DATA/linux/d-i/firmware/s390x/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/s390x/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/s390x/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/s390x/scsi-modules diff --git a/helpers/DATA/linux/d-i/firmware/scsi-modules b/helpers/DATA/linux/udeb/d-i/firmware/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/firmware/scsi-modules rename to helpers/DATA/linux/udeb/d-i/firmware/scsi-modules diff --git a/helpers/DATA/linux/d-i/kernel-versions b/helpers/DATA/linux/udeb/d-i/kernel-versions similarity index 100% rename from helpers/DATA/linux/d-i/kernel-versions rename to helpers/DATA/linux/udeb/d-i/kernel-versions diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/block-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/block-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/floppy-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/floppy-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/floppy-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/md-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/md-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/message-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/message-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/serial-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/serial-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/serial-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64-virtual/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64-virtual/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64-virtual/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/block-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/block-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/firewire-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/firewire-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/firewire-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/firewire-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/floppy-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/floppy-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/floppy-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/i2c-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/i2c-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/i2c-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/input-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/input-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/input-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/input-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/ipmi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/ipmi-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/ipmi-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/amd64/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/amd64/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/amd64/md-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/md-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/message-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/message-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/mtd-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/mtd-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/mtd-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-pcmcia-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/nic-pcmcia-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-pcmcia-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/nic-usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-usb-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/pata-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/pata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/pata-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/pata-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/pcmcia-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/pcmcia-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/pcmcia-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/pcmcia-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/plip-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/plip-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/plip-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/ppp-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/ppp-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/ppp-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/sata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/sata-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/sata-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/serial-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/serial-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/serial-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/speakup-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/speakup-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/speakup-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/usb-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/amd64/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/amd64/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/amd64/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/amd64/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/block-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/block-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/i2c-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/i2c-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/i2c-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/input-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/input-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/input-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/input-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/ipmi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/ipmi-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/ipmi-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/arm64/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/arm64/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/arm64/md-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/md-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/message-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/message-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/mtd-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/mtd-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/mtd-core-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/nic-usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-usb-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/plip-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/plip-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/plip-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/ppp-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/ppp-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/ppp-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/sata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/sata-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/sata-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/speakup-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/speakup-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/speakup-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/usb-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/arm64/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/arm64/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/arm64/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/arm64/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/block-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/block-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/i2c-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/i2c-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/i2c-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/input-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/input-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/input-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/input-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/ipmi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/ipmi-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/ipmi-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/armhf/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/armhf/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/armhf/md-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/md-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/mtd-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/mtd-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/mtd-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/mtd-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/nic-usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-usb-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/plip-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/plip-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/plip-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/ppp-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/ppp-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/ppp-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/sata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/sata-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/sata-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/speakup-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/speakup-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/speakup-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/usb-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/armhf/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/armhf/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/armhf/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/armhf/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/block-modules b/helpers/DATA/linux/udeb/d-i/modules/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/block-modules diff --git a/helpers/DATA/linux/d-i/modules/block-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/block-modules.powerpc similarity index 100% rename from helpers/DATA/linux/d-i/modules/block-modules.powerpc rename to helpers/DATA/linux/udeb/d-i/modules/block-modules.powerpc diff --git a/helpers/DATA/linux/d-i/modules/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/dasd-extra-modules.s390x b/helpers/DATA/linux/udeb/d-i/modules/dasd-extra-modules.s390x similarity index 100% rename from helpers/DATA/linux/d-i/modules/dasd-extra-modules.s390x rename to helpers/DATA/linux/udeb/d-i/modules/dasd-extra-modules.s390x diff --git a/helpers/DATA/linux/d-i/modules/dasd-modules.s390x b/helpers/DATA/linux/udeb/d-i/modules/dasd-modules.s390x similarity index 100% rename from helpers/DATA/linux/d-i/modules/dasd-modules.s390x rename to helpers/DATA/linux/udeb/d-i/modules/dasd-modules.s390x diff --git a/helpers/DATA/linux/d-i/modules/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/firewire-core-modules b/helpers/DATA/linux/udeb/d-i/modules/firewire-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/firewire-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/firewire-core-modules diff --git a/helpers/DATA/linux/d-i/modules/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/floppy-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/floppy-modules rename to helpers/DATA/linux/udeb/d-i/modules/floppy-modules diff --git a/helpers/DATA/linux/d-i/modules/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/i2c-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i2c-modules rename to helpers/DATA/linux/udeb/d-i/modules/i2c-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/block-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/block-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/floppy-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/floppy-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/floppy-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/md-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/md-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/message-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/message-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/serial-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/serial-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/serial-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/i386-virtual/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/i386-virtual/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386-virtual/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386-virtual/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/block-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/block-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/firewire-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/firewire-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/firewire-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/firewire-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/floppy-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/floppy-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/floppy-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/i2c-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/i2c-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/i2c-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/input-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/input-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/input-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/input-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/ipmi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/ipmi-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/ipmi-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/i386/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/i386/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/i386/md-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/md-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/message-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/message-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/mtd-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/mtd-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/mtd-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-pcmcia-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/nic-pcmcia-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-pcmcia-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/nic-usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-usb-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/pata-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/pata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/pata-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/pata-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/pcmcia-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/pcmcia-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/pcmcia-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/pcmcia-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/plip-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/plip-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/plip-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/ppp-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/ppp-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/ppp-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/sata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/sata-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/sata-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/serial-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/serial-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/serial-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/speakup-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/speakup-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/speakup-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/usb-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/i386/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/i386/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/i386/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/i386/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/input-modules b/helpers/DATA/linux/udeb/d-i/modules/input-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/input-modules rename to helpers/DATA/linux/udeb/d-i/modules/input-modules diff --git a/helpers/DATA/linux/d-i/modules/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/ipmi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ipmi-modules rename to helpers/DATA/linux/udeb/d-i/modules/ipmi-modules diff --git a/helpers/DATA/linux/d-i/modules/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/md-modules b/helpers/DATA/linux/udeb/d-i/modules/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/md-modules diff --git a/helpers/DATA/linux/d-i/modules/message-modules b/helpers/DATA/linux/udeb/d-i/modules/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/message-modules diff --git a/helpers/DATA/linux/d-i/modules/message-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/message-modules.powerpc similarity index 100% rename from helpers/DATA/linux/d-i/modules/message-modules.powerpc rename to helpers/DATA/linux/udeb/d-i/modules/message-modules.powerpc diff --git a/helpers/DATA/linux/d-i/modules/mouse-modules b/helpers/DATA/linux/udeb/d-i/modules/mouse-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/mouse-modules rename to helpers/DATA/linux/udeb/d-i/modules/mouse-modules diff --git a/helpers/DATA/linux/d-i/modules/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/mtd-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/mtd-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/mtd-core-modules diff --git a/helpers/DATA/linux/d-i/modules/mtd-modules b/helpers/DATA/linux/udeb/d-i/modules/mtd-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/mtd-modules rename to helpers/DATA/linux/udeb/d-i/modules/mtd-modules diff --git a/helpers/DATA/linux/d-i/modules/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/nic-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/nic-modules.powerpc similarity index 100% rename from helpers/DATA/linux/d-i/modules/nic-modules.powerpc rename to helpers/DATA/linux/udeb/d-i/modules/nic-modules.powerpc diff --git a/helpers/DATA/linux/d-i/modules/nic-pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-pcmcia-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/nic-pcmcia-modules rename to helpers/DATA/linux/udeb/d-i/modules/nic-pcmcia-modules diff --git a/helpers/DATA/linux/d-i/modules/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/nic-usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/nic-usb-modules diff --git a/helpers/DATA/linux/d-i/modules/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/pata-modules b/helpers/DATA/linux/udeb/d-i/modules/pata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/pata-modules rename to helpers/DATA/linux/udeb/d-i/modules/pata-modules diff --git a/helpers/DATA/linux/d-i/modules/pcmcia-modules b/helpers/DATA/linux/udeb/d-i/modules/pcmcia-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/pcmcia-modules rename to helpers/DATA/linux/udeb/d-i/modules/pcmcia-modules diff --git a/helpers/DATA/linux/d-i/modules/pcmcia-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/pcmcia-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/pcmcia-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/pcmcia-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/plip-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/plip-modules rename to helpers/DATA/linux/udeb/d-i/modules/plip-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/block-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/block-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fb-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/fb-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fb-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/floppy-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/floppy-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/floppy-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/floppy-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/i2c-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/i2c-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/i2c-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/i2c-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/input-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/input-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/input-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/input-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/ipmi-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/ipmi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/ipmi-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/ipmi-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/md-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/md-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/message-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/message-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/message-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/message-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/mtd-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/mtd-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/mtd-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/mtd-core-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-usb-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-usb-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-wireless-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/nic-wireless-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/nic-wireless-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/parport-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/parport-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/parport-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/parport-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/plip-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/plip-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/plip-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/plip-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/ppp-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/ppp-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/ppp-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/sata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/sata-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/sata-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/serial-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/serial-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/serial-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/ppc64el/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/ppc64el/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppc64el/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppc64el/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/ppp-modules b/helpers/DATA/linux/udeb/d-i/modules/ppp-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/ppp-modules rename to helpers/DATA/linux/udeb/d-i/modules/ppp-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/block-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/block-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/block-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/block-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/crc-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/crc-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/crc-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/crc-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/crypto-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/crypto-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/crypto-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/crypto-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/dasd-extra-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-extra-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/dasd-extra-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-extra-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/dasd-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/dasd-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/dasd-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/fat-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/fat-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/fat-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/fat-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/fs-core-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/fs-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/fs-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/fs-core-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/fs-secondary-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/fs-secondary-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/fs-secondary-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/fs-secondary-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/isofs-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/isofs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/isofs-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/isofs-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/kernel-image b/helpers/DATA/linux/udeb/d-i/modules/s390x/kernel-image similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/kernel-image rename to helpers/DATA/linux/udeb/d-i/modules/s390x/kernel-image diff --git a/helpers/DATA/linux/d-i/modules/s390x/md-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/md-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/md-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/md-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/multipath-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/multipath-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/multipath-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/multipath-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/nfs-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/nfs-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/nfs-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/nfs-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/nic-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/nic-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/nic-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/nic-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/nic-shared-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/nic-shared-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/nic-shared-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/nic-shared-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/s390x/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/s390x/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/s390x/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/s390x/vlan-modules diff --git a/helpers/DATA/linux/d-i/modules/sata-modules b/helpers/DATA/linux/udeb/d-i/modules/sata-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/sata-modules rename to helpers/DATA/linux/udeb/d-i/modules/sata-modules diff --git a/helpers/DATA/linux/d-i/modules/scsi-core-modules b/helpers/DATA/linux/udeb/d-i/modules/scsi-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/scsi-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/scsi-core-modules diff --git a/helpers/DATA/linux/d-i/modules/scsi-modules b/helpers/DATA/linux/udeb/d-i/modules/scsi-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/scsi-modules rename to helpers/DATA/linux/udeb/d-i/modules/scsi-modules diff --git a/helpers/DATA/linux/d-i/modules/scsi-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/scsi-modules.powerpc similarity index 100% rename from helpers/DATA/linux/d-i/modules/scsi-modules.powerpc rename to helpers/DATA/linux/udeb/d-i/modules/scsi-modules.powerpc diff --git a/helpers/DATA/linux/d-i/modules/serial-modules b/helpers/DATA/linux/udeb/d-i/modules/serial-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/serial-modules rename to helpers/DATA/linux/udeb/d-i/modules/serial-modules diff --git a/helpers/DATA/linux/d-i/modules/speakup-modules b/helpers/DATA/linux/udeb/d-i/modules/speakup-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/speakup-modules rename to helpers/DATA/linux/udeb/d-i/modules/speakup-modules diff --git a/helpers/DATA/linux/d-i/modules/storage-core-modules b/helpers/DATA/linux/udeb/d-i/modules/storage-core-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/storage-core-modules rename to helpers/DATA/linux/udeb/d-i/modules/storage-core-modules diff --git a/helpers/DATA/linux/d-i/modules/storage-core-modules.powerpc b/helpers/DATA/linux/udeb/d-i/modules/storage-core-modules.powerpc similarity index 100% rename from helpers/DATA/linux/d-i/modules/storage-core-modules.powerpc rename to helpers/DATA/linux/udeb/d-i/modules/storage-core-modules.powerpc diff --git a/helpers/DATA/linux/d-i/modules/usb-modules b/helpers/DATA/linux/udeb/d-i/modules/usb-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/usb-modules rename to helpers/DATA/linux/udeb/d-i/modules/usb-modules diff --git a/helpers/DATA/linux/d-i/modules/usb-storage-modules b/helpers/DATA/linux/udeb/d-i/modules/usb-storage-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/usb-storage-modules rename to helpers/DATA/linux/udeb/d-i/modules/usb-storage-modules diff --git a/helpers/DATA/linux/d-i/modules/virtio-modules b/helpers/DATA/linux/udeb/d-i/modules/virtio-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/virtio-modules rename to helpers/DATA/linux/udeb/d-i/modules/virtio-modules diff --git a/helpers/DATA/linux/d-i/modules/vlan-modules b/helpers/DATA/linux/udeb/d-i/modules/vlan-modules similarity index 100% rename from helpers/DATA/linux/d-i/modules/vlan-modules rename to helpers/DATA/linux/udeb/d-i/modules/vlan-modules diff --git a/helpers/DATA/linux/d-i/package-list b/helpers/DATA/linux/udeb/d-i/package-list similarity index 100% rename from helpers/DATA/linux/d-i/package-list rename to helpers/DATA/linux/udeb/d-i/package-list diff --git a/helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch b/helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch new file mode 100644 index 0000000..2c7fc76 --- /dev/null +++ b/helpers/DATA/update-manager/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch @@ -0,0 +1,107 @@ +From 79b3c51dac13c1b2689d139bb0667fa27e8a02a9 Mon Sep 17 00:00:00 2001 +From: Nathan Pratta Teodosio +Date: Fri, 22 Mar 2024 08:24:04 +0100 +Subject: 1:22.04.20 (patches unapplied) + +# Changelog portion removed to avoid version conflict --ark74 + +Imported using git-ubuntu import. +--- + UpdateManager/UpdateManager.py | 60 ++++++++++++++++++++++-------------------- + debian/changelog | 10 +++++++ + 2 files changed, 41 insertions(+), 29 deletions(-) + +diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py +index 5882e0a0..03b11aa3 100644 +--- a/UpdateManager/UpdateManager.py ++++ b/UpdateManager/UpdateManager.py +@@ -27,6 +27,7 @@ from gi.repository import Gdk, GdkX11 + from gi.repository import Gio + from gi.repository import GLib + from gi.repository import GObject ++import uaclient.api.u.pro.packages.updates.v1 as ua + + GdkX11 # pyflakes + +@@ -36,11 +37,11 @@ warnings.filterwarnings("ignore", "Accessed deprecated property", + + import distro_info + import fnmatch +-import json + import os + import subprocess + import sys + import time ++import threading + from gettext import gettext as _ + + import dbus +@@ -270,36 +271,37 @@ class UpdateManager(Gtk.Window): + and pkg.installed: + self.oem_metapackages.add(pkg) + ++ def _fetch_ua_updates(self): ++ self.ua_updates = ua.updates().updates ++ + def _get_ua_security_status(self): + self.ua_security_packages = [] +- try: +- p = subprocess.Popen(['pro', 'security-status', '--format=json'], +- stdout=subprocess.PIPE) +- except OSError: +- pass +- else: +- while p.poll() is None: +- while Gtk.events_pending(): +- Gtk.main_iteration() +- time.sleep(0.05) +- s = json.load(p.stdout) +- for package in s.get('packages', []): +- if package.get('service_name', '') == 'standard-security': +- continue +- status = package.get('status', '') +- if ( +- status == 'pending_attach' +- or status == 'pending_enable' +- or status == 'upgrade_available' +- ): +- name = package.get('package', '') +- version = package.get('version', '') +- size = package.get('download_size', 0) +- downloadable = status == 'upgrade_available' +- self.ua_security_packages.append( +- (name, version, size, downloadable) +- ) +- self.cache.create_pro_cache(self.ua_security_packages) ++ t = threading.Thread(target=self._fetch_ua_updates, daemon=True) ++ t.start() ++ while t.is_alive(): ++ while Gtk.events_pending(): ++ Gtk.main_iteration() ++ time.sleep(0.05) ++ for package in self.ua_updates: ++ if ( ++ package.provided_by == 'standard-security' ++ or package.provided_by == 'standard-updates' ++ ): ++ continue ++ status = package.status ++ if ( ++ status == 'pending_attach' ++ or status == 'pending_enable' ++ or status == 'upgrade_available' ++ ): ++ name = package.package ++ version = package.version ++ size = package.download_size ++ downloadable = status == 'upgrade_available' ++ self.ua_security_packages.append( ++ (name, version, size, downloadable) ++ ) ++ self.cache.create_pro_cache(self.ua_security_packages) + + def _make_available_pane(self, install_count, need_reboot=False, + cancelled_update=False, error_occurred=False): +-- +cgit v1.2.3 + diff --git a/helpers/make-firefox b/helpers/make-firefox index 13b1d97..73260c1 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -105,8 +105,8 @@ echo 'pref("dom.security.unexpected_system_load_telemetry_enabled", false);' | t echo 'pref("toolkit.telemetry.hybridContent.enabled", false);' | tee -a browser/app/profile/firefox.js # GPC opt-out entry added on 120 (not enabled yet). echo '//pref("privacy.globalprivacycontrol.enabled", true);' | tee -a browser/app/profile/firefox.js -sed_csum 186b9d92e48f2f34f1ea51023ad83c9d7abec97bcb0b862641bcb79a93c97d9e \ - d4f87d174da21573a610f6cd206a910ad5204b65459405159269293f99f2cff5 +sed_csum 82b3a7933d913e1e2a4f328a76621db2d2e618d209d9785086d64c5c78c2a2d6 \ + 9fa741bfc583d1bee03d88c266acab1334c1cf6654d588bddd608056ab2e0275 \ # Remove Google API key and calls sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index 49234bb..dfa401b 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu $UPSTREAM main' REPOKEY="83FBA1751378B444" BACKPORT=true @@ -26,6 +26,9 @@ BACKPORT=true patch --no-backup-if-mismatch -p1 < $DATA/debian-rules_7.3.patch +# Increase CPU usage for amd64 build. +sed -i "/NUM_CPUS=/s|3|7|" debian/rules + changelog "Backport libreoffice fresh into Trisquel" package diff --git a/helpers/make-linux b/helpers/make-linux index 7c2e0b0..99ebf60 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -19,7 +19,20 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=26 +VERSION=28 +HWEKR=5.15 + +# DI_ENABLED = 1 enables udeb build, 0 or any other value disables them. +DI_ENABLED=1 +# HWE_ENABLED = 1 enables HWE stack build, 0 or any other value disables it. +HWE_ENABLED=0 + +[ $HWE_ENABLED != 1 ] && \ +DEBIAN_PATH=debian.master && \ +CONTROL_PACKAGE=linux +[ $HWE_ENABLED = 1 ] && \ +DEBIAN_PATH=debian.hwe-$HWEKR && \ +CONTROL_PACKAGE=linux-hwe-$HWEKR . ./config @@ -28,7 +41,6 @@ drivers/bluetooth drivers/gpu/drm/i915 drivers/gpu/drm/amd/amdgpu drivers/gpu/drm/amd/pm/powerplay -drivers/gpu/drm/r128 drivers/gpu/drm/radeon drivers/net/wireless/intel/ipw2x00 drivers/net/wireless/intel/iwlegacy @@ -46,6 +58,10 @@ drivers/net/wireless/realtek/rtlwifi/rtl8723be drivers/net/wireless/realtek/rtlwifi/rtl8821ae drivers/net/wireless/broadcom/brcm80211 ' +# HWEKR - 5.15 +[ $HWE_ENABLED != 1 ] && \ +PRESERVEDIRS="$PRESERVEDIRS +drivers/gpu/drm/r128" TMPDIR=$(mktemp -d preserve-XXXX) PRESERVE=$(grep '^+++' $DATA/silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u ) @@ -56,7 +72,7 @@ for DIR in $PRESERVEDIRS; do cp $DIR $TMPDIR --parents -a done -sh $DATA/deblob-5.15 +sh $DATA/deblob-$HWEKR echo "Reverting deblobbing for files patched by silent-accept-firmware" cp $TMPDIR/* . -av @@ -67,20 +83,27 @@ for PATCH in $DATA/*.patch ; do patch --no-backup-if-mismatch -p1 < $PATCH done -# Simple test for finding missing cases of silent_accept_firmware method +## Simple test for finding missing cases of silent_accept_firmware method #for dir in $PRESERVEDIRS; do -# grep -i "load.*firmware.*%" $PRESERVEDIRS -r -# grep -i "load.*ucode.*%" $PRESERVEDIRS -r +# grep -i "load.*firmware.*%" $PRESERVEDIRS -r|grep -vi info +# grep -i "load.*ucode.*%" $PRESERVEDIRS -r|grep -vi info #done # Re-enable udebs -cp $DATA/5-udebs.mk debian/rules.d -cp -a $DATA/d-i debian.master -cp $DATA/kernel-wedge-arch.pl debian/scripts/misc/ +enable_udebs() { + +#Apply udeb/d-i related patches. +for PATCH in $DATA/udeb/*.patch ; do + echo $PATCH + patch --no-backup-if-mismatch -p1 < $PATCH +done + +cp $DATA/udeb/5-udebs.mk debian/rules.d +cp -a $DATA/udeb/d-i $DEBIAN_PATH cat << EOF >> debian/control -Package: linux-udebs-generic -Build-Profiles: +Package: $CONTROL_PACKAGE-udebs-generic +Build-Profiles: XC-Package-Type: udeb Section: debian-installer Architecture: amd64 armhf arm64 ppc64el s390x @@ -89,8 +112,8 @@ Description: Metapackage depending on kernel udebs This package depends on the all udebs that the kernel build generated, for easier version and migration tracking. -Package: linux-udebs-generic-lpae -Build-Profiles: +Package: $CONTROL_PACKAGE-udebs-generic-lpae +Build-Profiles: XC-Package-Type: udeb Section: debian-installer Architecture: armhf @@ -99,8 +122,8 @@ Description: Metapackage depending on kernel udebs This package depends on the all udebs that the kernel build generated, for easier version and migration tracking. -Package: linux-udebs-lowlatency -Build-Profiles: +Package: $CONTROL_PACKAGE-udebs-lowlatency +Build-Profiles: XC-Package-Type: udeb Section: debian-installer Architecture: amd64 @@ -110,9 +133,9 @@ Description: Metapackage depending on kernel udebs for easier version and migration tracking. EOF -cat << EOF >> debian.master/control.d/flavour-control.stub -Package: linux-udebs-FLAVOUR -Build-Profiles: +cat << EOF >> $DEBIAN_PATH/control.d/flavour-control.stub +Package: SRCPKGNAME-udebs-FLAVOUR +Build-Profiles: XC-Package-Type: udeb Section: debian-installer Architecture: ARCH @@ -124,105 +147,180 @@ EOF sed '/include.*2-binary-arch.mk/a\\n# Rules for building the udebs ($(DEBIAN)-installer)\ninclude $(DROOT)/rules.d/5-udebs.mk' -i debian/rules sed 's/+= binary-debs/+= binary-udebs/' -i debian/rules.d/2-binary-arch.mk -sed '/Build-Depends:/a\ kernel-wedge ,' -i debian/control \ - debian.master/control.stub.in + +for i in dctrl-tools kernel-wedge +do + sed "/Build-Depends:/a\ $i <\!stage1> <\!noudeb> <\!cross> <\!autopkgtest>," -i debian/control \ + $DEBIAN_PATH/control.stub.in +done +} + +[ "$DI_ENABLED" = "1" ] && enable_udebs # Wipe dkms-versions # lists zfs / v4l2loopback versions echo > debian/dkms-versions -# Remove ZFS -rm zfs spl debian/scripts/misc/update-zfs.sh -rf -/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \ - debian.master/control.d/vars.generic \ - debian.master/control.d/vars.* +# Remove ZFS - adjusting to each release +rm debian/scripts/dkms-build-configure--zfs -/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules -/bin/sed -i '/zfs/d' debian.master/abi/*/*.modules \ - debian/rules.d/2-binary-arch.mk \ - debian.master/rules.d/* \ - debian/rules -# debian.master/d-i/modules/fs-core-modules \ -# debian.master/control.d/generic.inclusion-list \ -# debian.master/control.d/vars.* +for i in $(grep -lr zfs $DEBIAN_PATH/reconstruct \ + $DEBIAN_PATH/abi/*/*.modules \ + debian/rules.d/2-binary-arch.mk \ + $DEBIAN_PATH/rules.d/ \ + debian/rules \ + $DEBIAN_PATH/control.d/) +do + sed -i '/zfs/d' $i +done + +[ "$DI_ENABLED" = "1" ] && \ +for i in $(grep -lr zfs $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \ +do \ + sed -i '/zfs/d' $i ; \ +done + +#/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \ +# $DEBIAN_PATH/control.d/vars.generic \ +# $DEBIAN_PATH/control.d/vars.* + +#/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules # Remove VBox -#sed -i '/vbox/s|true|false|' debian.master/rules.d/amd64.mk +#sed -i '/vbox/s|true|false|' $DEBIAN_PATH/rules.d/amd64.mk # Remove v4l2loopback -/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules -/bin/sed -i '/v4l2loopback/d' debian/rules.d/2-binary-arch.mk \ - debian/rules -/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/* +for i in $(grep -lr v4l2loopback $DEBIAN_PATH/reconstruct \ + $DEBIAN_PATH/abi/*/*.modules \ + debian/rules.d/2-binary-arch.mk \ + $DEBIAN_PATH/rules.d/ \ + debian/rules \ + $DEBIAN_PATH/control.d/) +do + sed -i '/v4l2loopback/d' $i +done -# Remove nvidia +[ "$DI_ENABLED" = "1" ] && \ +for i in $(grep -lr v4l2loopback $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \ +do \ + sed -i '/v4l2loopback/d' ; \ +done +#/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules +#/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/* + +# Remove nvidia driver rm -rf debian/scripts/dkms-build--nvidia-N -sed -i '/dkms-build--nvidia-N/d' debian.master/reconstruct - -#/bin/sed '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules \ -# debian/rules \ -# debian.master/control.d/vars.* +for i in $(grep -l dkms-build--nvidia-N $DEBIAN_PATH/reconstruct) +do + sed -i '/dkms-build--nvidia-N/d' $i +done # Remove wireguard -/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules +for i in $(grep -lr wireguard $DEBIAN_PATH/reconstruct \ + $DEBIAN_PATH/abi/*/*.modules \ + debian/rules.d/2-binary-arch.mk \ + $DEBIAN_PATH/rules.d/ \ + $DEBIAN_PATH/control.d/) +do + sed -i '/wireguard/d' $i +done +[ "$DI_ENABLED" = "1" ] && \ +for i in $(grep -lr wireguard $DEBIAN_PATH/d-i/modules/fs-core-modules) ; \ +do \ + sed -i '/wireguard/d' $i ; \ +done + +#/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules #sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk -#/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/* +#/bin/sed '/do_dkms_wireguard/d' -i $DEBIAN_PATH/rules.d/* # Compile with less modules and avoid abi check -echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk -echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk -echo 'skipmodule = true' >> debian/rules.d/0-common-vars.mk -echo 'skipabi = true' >> debian/rules.d/0-common-vars.mk +echo -e 'skipmodule = true\nskipabi = true' | tee -a $DEBIAN_PATH/rules.d/0-common-vars.mk \ + debian/rules.d/0-common-vars.mk -# Skip the retpoline check as there is no last release to chaeck against -echo 'skipretpoline = true' >> debian.master/rules.d/0-common-vars.mk -echo 'skipretpoline = true' >> debian/rules.d/0-common-vars.mk +# Skip the retpoline check as there is no last release to check against +echo 'skipretpoline = true' | tee -a $DEBIAN_PATH/rules.d/0-common-vars.mk \ + debian/rules.d/0-common-vars.mk # Do not label packages as unsigned sed '/bin_pkg_name_unsigned/s/linux-image-unsigned/linux-image/' -i debian/rules.d/0-common-vars.mk sed 's/.unsigned//' -i debian/scripts/control-create +sed '/Package:/s/.unsigned//;/This package /s/.unsigned//' -i debian/control line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1) sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i -sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk -cat << EOF > debian.master/etc/kernelconfig -archs="amd64 i386 armhf arm64 ppc64el" +for i in $(grep -rl family=ubuntu debian/rules.d/) +do + sed -i s/family=ubuntu/family=trisquel/ $i +done +cat << EOF > $DEBIAN_PATH/etc/kernelconfig +archs="i386 amd64 armhf arm64 ppc64el" family='trisquel' EOF rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu -grep -lr config.common.ubuntu debian*/ | xargs -r sed -i 's|config.common.ubuntu|config.common.trisquel|g' +for i in $(grep -lr config.common.ubuntu debian*/) +do + sed -i 's|config.common.ubuntu|config.common.trisquel|g' $i +done find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \; # Descriptions should not change based on the build arch sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i -sed '/^firmware/d' ./debian*/abi/fwinfo -i +#sed '/^firmware/d' ./debian*/abi/fwinfo -i #echo > ./debian.master/d-i/firmware/nic-modules #echo > ./debian.master/d-i/firmware/scsi-modules # Disable using udev as a fallback for firmware loading -replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" debian.master/config +replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" $DEBIAN_PATH/config -# Fix ports build -sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations -sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations -sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations -sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations -sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations -sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations +# Disable aaeon & ubuntu odm drivers, remove on both paths to match annotations. +for i in AAEON CONFIG_UBUNTU_ODM_DRIVERS +do + grep -rl "$i" debian.*/config/annotations | \ + xargs -r sed -i "/$i/d" +done -# Disable aaeon. -sed -i "/AAEON/d" debian.master/config/annotations -# Disable ubuntu ODM drivers -sed -i "/CONFIG_UBUNTU_ODM_DRIVERS/d" debian.master/config/annotations -# Tweak 5.15.0-94.104 -sed -i "/CONFIG_GPIO_M058SSAN/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations -sed -i "/CONFIG_RTC_DRV_PCF85263/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations +# Custom changes for linux and linux-hwe. +if [ $HWE_ENABLED != 1 ]; then +## HWEKR - 5.15 + ## Removal wireguard 5.15 specific. + sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules + ## Fix ports build + sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations + sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations + sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'ppc64el': 'y',|'ppc64el': 'n',|g" debian.master/config/annotations + sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations + sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations + sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'ppc64el': 'n',|'ppc64el': '-',|g" debian.master/config/annotations + ## Tweak 5.15.0-94.104 + sed -i "/CONFIG_GPIO_M058SSAN/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations + sed -i "/CONFIG_RTC_DRV_PCF85263/s|'amd64': 'm'|'amd64': '-'|" debian.master/config/annotations +else +# HWEKR - 6.5+ + ## Disable ppc64el Werroron amdgpu + for i in $(grep -rl CONFIG_DRM_AMDGPU_WERROR debian.*/config/annotations) + do + sed -i "/CONFIG_DRM_AMDGPU_WERROR/s|'ppc64el': 'y'|'ppc64el': 'n'|" $i + done + ## Remove disabled modules from generic list (starting at 6.2) + for module in gpio-aaeon hwmon-aaeon leds-aaeon mfd-aaeon spl + do + for i in $(grep -rl "^$module$" $DEBIAN_PATH/abi/*/) + do + sed -i "/^$module$/d" $i + done + done +fi + +grep -rl '^Vcs-Git:' | \ + xargs sed -i "s|^Vcs-Git:.*|Vcs-Git: https://gitlab.trisquel.org/trisquel/package-helpers|" changelog "Removed non-free bits" cp debian/changelog debian.master/changelog +cp debian/changelog $DEBIAN_PATH/changelog package diff --git a/helpers/make-linux-hwe-6.5 b/helpers/make-linux-hwe-6.5 index 65d0256..41183c3 100644 --- a/helpers/make-linux-hwe-6.5 +++ b/helpers/make-linux-hwe-6.5 @@ -269,7 +269,7 @@ find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linu # Descriptions should not change based on the build arch sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i -sed '/^firmware/d' ./debian*/abi/fwinfo -i +#sed '/^firmware/d' ./debian*/abi/fwinfo -i #echo > ./debian.master/d-i/firmware/nic-modules #echo > ./debian.master/d-i/firmware/scsi-modules diff --git a/helpers/make-linux-meta b/helpers/make-linux-meta index 7f368e1..0739c7c 100644 --- a/helpers/make-linux-meta +++ b/helpers/make-linux-meta @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=6 +VERSION=7 . ./config sed 's/22.04/11.0/g' -i debian/control @@ -27,7 +27,7 @@ sed 's/linux-firmware/firmware-linux-free/' -i debian/control ./debian/control.d sed 's/Ubuntu/upstream/' -i debian/control sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic* sed 's/, intel-microcode \[amd64\]//; s/, amd64-microcode \[amd64\]//;' -i debian/control debian/control.d/generic - +sed '/dkms_wireguard_version/d' -i debian/rules changelog "Removed linux-firmware dependency, renamed release for Trisquel" diff --git a/helpers/make-nvidia-settings b/helpers/make-nvidia-settings new file mode 100644 index 0000000..f05b5a5 --- /dev/null +++ b/helpers/make-nvidia-settings @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2024 Luis Guzmán +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=0 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM main' + +. ./config + +sed -i "/HTTPURL_PREFIX/s|https.*||" debian/rules.defs + +changelog "Remove nvidia-settings external repository pointers." + +package diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 58f935f..bf9d451 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -24,7 +24,7 @@ # Also, don't forget to update the meta-release files at archive and packages.t.i # The "obsoletes" list from ubuntu has been removed -VERSION=14 +VERSION=15 . ./config @@ -239,7 +239,6 @@ https://mirror.csclub.uwaterloo.ca/trisquel/packages/ https://ftpmirror1.infania.net/mirror/trisquel/packages/ https://mirrors.nju.edu.cn/trisquel/ https://mirror.math.princeton.edu/pub/trisquel-packages/ -https://mirror.operationtulip.com/trisquel/packages/ https://mirrors.dotsrc.org/trisquel/ EOF diff --git a/helpers/make-update-manager b/helpers/make-update-manager index 53ee4a4..b9d540a 100644 --- a/helpers/make-update-manager +++ b/helpers/make-update-manager @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=21 +VERSION=22 . ./config @@ -38,6 +38,9 @@ cp $DATA/index.docbook help/C/index.docbook patch --no-backup-if-mismatch -p1 < $DATA/prevent-autoconnection.patch # NOTE: prevent-autoconnection.patch l10n is now part of the DATA/l10n/ patches. +# Roll back the usage of uaclient.api.u.pro.packages.updates.v1 +patch --no-backup-if-mismatch -p1 -R < $DATA/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch + replace internet Internet . replace Ubuntu Trisquel . replace TrisquelDistroInfo UbuntuDistroInfo . From 372a379e8abdc586319e746bf2d6082a3634dfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 1 May 2024 18:52:05 +0000 Subject: [PATCH 005/341] misc: 2nd general review of helpers. --- .../DATA/casper/set_liveuser_uid_1000.patch | 53 - .../add-cracklib-runtime-as-dependency.patch | 14 - .../pidgin/cve/001_fix_CVE-2022-26491.patch | 77 - .../DATA/psensor/fix-ftbfs-debian-patch.patch | 32 - .../DATA/ring/ffmpeg_time_base_frame.patch | 27 - .../sugar-toolkit-gtk3/git-20201017.patch | 5017 ----------------- helpers/make-app-install-data-ubuntu | 2 +- helpers/make-casper | 3 - helpers/make-cdrkit | 2 +- helpers/make-conky | 29 - helpers/make-expat | 4 - helpers/make-fai-server | 1 + helpers/make-hwloc | 28 - helpers/make-indicator-sensors | 28 - helpers/make-libtgowt | 17 +- helpers/make-mate-sensors-applet | 30 - helpers/make-mate-user-admin | 30 - helpers/make-mtpaint | 2 +- helpers/make-neofetch | 1 - helpers/make-openssh | 5 - helpers/make-p7zip | 2 +- helpers/make-pidgin | 7 - helpers/make-plymouth | 1 - helpers/make-psensor | 31 - helpers/make-python-apt | 4 - helpers/make-qtwebengine-opensource-src | 1 - helpers/make-ring | 71 - helpers/make-sugar-artwork | 27 - helpers/make-sugar-datastore | 27 - helpers/make-sugar-toolkit-gtk3 | 27 - helpers/make-telegram-desktop | 8 +- helpers/make-umbrello | 1 + helpers/make-virtnbdbackup | 4 +- .../{make-vokoscreen => make-vokoscreen-ng} | 0 helpers/make-xfce4-sensors-plugin | 29 - helpers/make-youtube-dl | 36 - 36 files changed, 16 insertions(+), 5662 deletions(-) delete mode 100644 helpers/DATA/casper/set_liveuser_uid_1000.patch delete mode 100644 helpers/DATA/mate-user-admin/add-cracklib-runtime-as-dependency.patch delete mode 100644 helpers/DATA/pidgin/cve/001_fix_CVE-2022-26491.patch delete mode 100644 helpers/DATA/psensor/fix-ftbfs-debian-patch.patch delete mode 100644 helpers/DATA/ring/ffmpeg_time_base_frame.patch delete mode 100644 helpers/DATA/sugar-toolkit-gtk3/git-20201017.patch delete mode 100644 helpers/make-conky delete mode 100644 helpers/make-hwloc delete mode 100644 helpers/make-indicator-sensors delete mode 100644 helpers/make-mate-sensors-applet delete mode 100644 helpers/make-mate-user-admin delete mode 100644 helpers/make-psensor delete mode 100644 helpers/make-ring delete mode 100644 helpers/make-sugar-artwork delete mode 100644 helpers/make-sugar-datastore delete mode 100644 helpers/make-sugar-toolkit-gtk3 rename helpers/{make-vokoscreen => make-vokoscreen-ng} (100%) delete mode 100644 helpers/make-xfce4-sensors-plugin delete mode 100644 helpers/make-youtube-dl diff --git a/helpers/DATA/casper/set_liveuser_uid_1000.patch b/helpers/DATA/casper/set_liveuser_uid_1000.patch deleted file mode 100644 index 511fe5c..0000000 --- a/helpers/DATA/casper/set_liveuser_uid_1000.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/bin/casper-snapshot b/bin/casper-snapshot -index ab075292..33243f63 100755 ---- a/bin/casper-snapshot -+++ b/bin/casper-snapshot -@@ -33,7 +33,7 @@ VERSION=0.0.1 - if [ -e /etc/casper.conf ]; then - . /etc/casper.conf - else -- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':') -+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':') - HOSTNAME=$(hostname) - BUILD_SYSTEM="Debian" - fi -diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin -index d6c75e66..c80e2058 100755 ---- a/scripts/casper-bottom/15autologin -+++ b/scripts/casper-bottom/15autologin -@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then - sddm_session=QLubuntu.desktop - fi - cat >>/root/etc/sddm.conf < /dev/null - if [ ! -f /root/usr/bin/sddm ]; then -@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde - fi - done - --# GDM --if [ -d /root/etc/gdm3 ]; then -- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs --fi -- - # Kubuntu - if [ -f "/root/usr/bin/plasma-desktop" ]; then - if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then diff --git a/helpers/DATA/mate-user-admin/add-cracklib-runtime-as-dependency.patch b/helpers/DATA/mate-user-admin/add-cracklib-runtime-as-dependency.patch deleted file mode 100644 index bbf54ee..0000000 --- a/helpers/DATA/mate-user-admin/add-cracklib-runtime-as-dependency.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Fixes https://gitlab.trisquel.org/trisquel/package-helpers/-/issues/148 - -diff --git a/debian/control b/debian/control -index 3297b1c..37ff49a 100644 ---- a/debian/control -+++ b/debian/control -@@ -28,6 +28,7 @@ Depends: ${shlibs:Depends}, - accountsservice, - group-service, - mate-desktop-common, -+ cracklib-runtime, - Description: MATE User Manager - User and group management utility suitable for lightweight desktop - environments such as MATE or Xfce. diff --git a/helpers/DATA/pidgin/cve/001_fix_CVE-2022-26491.patch b/helpers/DATA/pidgin/cve/001_fix_CVE-2022-26491.patch deleted file mode 100644 index 5d39537..0000000 --- a/helpers/DATA/pidgin/cve/001_fix_CVE-2022-26491.patch +++ /dev/null @@ -1,77 +0,0 @@ -Remove _xmppconnect support - -It has always been vulnerable to MITM attacks when it is not used with DNSSEC, -and has been removed from XEP-0156 because of that. We have been issued -CVE-2022-26491 for this issue. - -More discussion can be found at -https://mail.jabber.org/pipermail/standards/2022-February/038759.html. - -Testing Done: -Compiled - -Reviewed at https://reviews.imfreedom.org/r/1357/ - ---- a/libpurple/protocols/jabber/jabber.c Sat Apr 23 05:05:54 2022 -0500 -+++ b/libpurple/protocols/jabber/jabber.c Wed Apr 27 23:41:06 2022 -0500 -@@ -798,48 +798,6 @@ - } - - static void --txt_resolved_cb(GList *responses, gpointer data) --{ -- JabberStream *js = data; -- gboolean found = FALSE; -- -- js->srv_query_data = NULL; -- -- while (responses) { -- PurpleTxtResponse *resp = responses->data; -- gchar **token; -- token = g_strsplit(purple_txt_response_get_content(resp), "=", 2); -- if (purple_strequal(token[0], "_xmpp-client-xbosh")) { -- purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]); -- js->bosh = jabber_bosh_connection_init(js, token[1]); -- g_strfreev(token); -- break; -- } -- g_strfreev(token); -- purple_txt_response_destroy(resp); -- responses = g_list_delete_link(responses, responses); -- } -- -- if (js->bosh) { -- found = TRUE; -- jabber_bosh_connection_connect(js->bosh); -- } -- -- if (!found) { -- purple_debug_warning("jabber", "Unable to find alternative XMPP connection " -- "methods after failing to connect directly.\n"); -- purple_connection_error_reason(js->gc, -- PURPLE_CONNECTION_ERROR_NETWORK_ERROR, -- _("Unable to connect")); -- return; -- } -- -- if (responses) { -- g_list_free_full(responses, (GDestroyNotify)purple_txt_response_destroy); -- } --} -- --static void - jabber_login_callback(gpointer data, gint source, const gchar *error) - { - PurpleConnection *gc = data; -@@ -849,11 +807,6 @@ - if (js->srv_rec != NULL) { - purple_debug_error("jabber", "Unable to connect to server: %s. Trying next SRV record or connecting directly.\n", error); - try_srv_connect(js); -- } else { -- purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain); -- js->srv_query_data = purple_txt_resolve_account( -- purple_connection_get_account(gc), "_xmppconnect", -- js->user->domain, txt_resolved_cb, js); - } - return; - } diff --git a/helpers/DATA/psensor/fix-ftbfs-debian-patch.patch b/helpers/DATA/psensor/fix-ftbfs-debian-patch.patch deleted file mode 100644 index 61e4bf4..0000000 --- a/helpers/DATA/psensor/fix-ftbfs-debian-patch.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nru psensor-1.1.5/debian/patches/fix-ftbfs.patch psensor-1.1.5/debian/patches/fix-ftbfs.patch ---- psensor-1.1.5/debian/patches/fix-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100 -+++ psensor-1.1.5/debian/patches/fix-ftbfs.patch 2022-09-02 23:32:48.000000000 +0100 -@@ -0,0 +1,20 @@ -+Description: Fix FTBFS with gcc-11 -+ Fix the indentation while keeping the logic same as before. -+ -+Author: Sudip Mukherjee -+--- -+ -+Bug-Debian: https://bugs.debian.org/984298 -+Forwarded: no -+ -+--- psensor-1.1.5.orig/src/lib/pudisks2.c -++++ psensor-1.1.5/src/lib/pudisks2.c -+@@ -83,7 +83,7 @@ static void smart_update(struct psensor -+ PROVIDER_NAME, -+ data->path); -+ -+- data->last_smart_update = t; -++ data->last_smart_update = t; -+ } -+ -+ void udisks2_psensor_list_update(struct psensor **sensors) -diff -Nru psensor-1.1.5/debian/patches/series psensor-1.1.5/debian/patches/series ---- psensor-1.1.5/debian/patches/series 2021-02-06 19:50:55.000000000 +0000 -+++ psensor-1.1.5/debian/patches/series 2022-09-02 23:33:02.000000000 +0100 -@@ -1,3 +1,4 @@ - 0001-Update-rsensor.c-drop-is_error-macro-definition.patch - 14.patch - ayatana-appindicator.patch -+fix-ftbfs.patch diff --git a/helpers/DATA/ring/ffmpeg_time_base_frame.patch b/helpers/DATA/ring/ffmpeg_time_base_frame.patch deleted file mode 100644 index 831d128..0000000 --- a/helpers/DATA/ring/ffmpeg_time_base_frame.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b7dd425660c420466d951f09e3c67e9d5f9eec90 Mon Sep 17 00:00:00 2001 -From: Aline Gondim Santos -Date: Wed, 5 Oct 2022 10:19:27 -0300 -Subject: [PATCH] misc: set frame time_base when decoding - -To properly get the time_base and framerate in the plugins, -we need to set the frame properties when decoding. - -GitLab: https://git.jami.net/savoirfairelinux/jami-plugins/-/issues/23 - -Change-Id: I69a2235c46b13a15414c4d01821cc1eba5b73987 ---- - src/media/media_decoder.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/src/media/media_decoder.cpp b/daemon/src/media/media_decoder.cpp -index 7cba58abe63..cd1698a5048 100644 ---- a/daemon/src/media/media_decoder.cpp -+++ b/daemon/src/media/media_decoder.cpp -@@ -644,6 +644,7 @@ MediaDecoder::decode(AVPacket& packet) - #endif - auto frame = f->pointer(); - ret = avcodec_receive_frame(decoderCtx_, frame); -+ frame->time_base = decoderCtx_->time_base; - if (resolutionChangedCallback_) { - if (decoderCtx_->width != width_ or decoderCtx_->height != height_) { - JAMI_DBG("Resolution changed from %dx%d to %dx%d", diff --git a/helpers/DATA/sugar-toolkit-gtk3/git-20201017.patch b/helpers/DATA/sugar-toolkit-gtk3/git-20201017.patch deleted file mode 100644 index 8ecfad1..0000000 --- a/helpers/DATA/sugar-toolkit-gtk3/git-20201017.patch +++ /dev/null @@ -1,5017 +0,0 @@ -diff --git b/.flake8 a/.flake8 -new file mode 100644 -index 0000000..0146a5f ---- /dev/null -+++ a/.flake8 -@@ -0,0 +1,6 @@ -+[flake8] -+ -+# E402 module level import not at top of file -+# gi.require_version() is required before later imports -+ -+ignore = E402 -diff --git b/MAINTAINERS a/MAINTAINERS -new file mode 100644 -index 0000000..d9dcae7 ---- /dev/null -+++ a/MAINTAINERS -@@ -0,0 +1,3 @@ -+Daniel Drake dsd@laptop.org -+Simon Schampijer simon@laptop.org -+ -diff --git b/README.md a/README.md -new file mode 100644 -index 0000000..c074e93 ---- /dev/null -+++ a/README.md -@@ -0,0 +1,47 @@ -+Sugar Toolkit -+============= -+ -+Sugar Toolkit provides services and a set of GTK+ widgets to build -+activities and other Sugar components on Linux based computers. -+ -+This is the GTK+ 3 binding of the Sugar Toolkit. -+ -+https://www.sugarlabs.org/ -+ -+https://wiki.sugarlabs.org/ -+ -+Installing on Debian or Ubuntu -+------------------------------ -+ -+Automatically done when you install [Sugar -+desktop](https://github.com/sugarlabs/sugar). -+ -+To install Sugar Toolkit alone without Sugar desktop, -+ -+``` -+sudo apt install python-sugar3 -+``` -+ -+Installing on Fedora -+-------------------- -+ -+Automatically done when you install [Sugar -+desktop](https://github.com/sugarlabs/sugar). -+ -+To install Sugar Toolkit alone without Sugar desktop, -+ -+``` -+sudo dnf install sugar-toolkit-gtk3 -+``` -+ -+Building -+-------- -+ -+Sugar Toolkit follows the [GNU Coding -+Standards](https://www.gnu.org/prep/standards/). -+ -+Install all dependencies, especially sugar-artwork and -+sugar-datastore. -+ -+Clone the repository, run `autogen.sh`, then `make` and `make -+install`. -diff --git b/autogen.sh a/autogen.sh -new file mode 100755 -index 0000000..dac7bf4 ---- /dev/null -+++ a/autogen.sh -@@ -0,0 +1,15 @@ -+#!/bin/sh -+ -+test -n "${srcdir}" || srcdir=`dirname "$0"` -+test -n "${srcdir}" || srcdir="$(pwd)" -+ -+olddir="$(pwd)" -+cd "$srcdir" -+ -+mkdir -p m4 -+ -+intltoolize -+autoreconf -i -+ -+cd "$olddir" -+"$srcdir/configure" --enable-maintainer-mode "$@" -diff --git b/bin/sugar-activity-web a/bin/sugar-activity-web -index 8fd7a59..d1db3fd 100644 ---- b/bin/sugar-activity-web -+++ a/bin/sugar-activity-web -@@ -17,8 +17,4 @@ - # Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - --if [ "$SUGAR_USE_WEBKIT1" = "yes" ]; then -- exec sugar-activity3 sugar3.activity.webkit1.WebActivity $@ --else -- exec sugar-activity3 sugar3.activity.webactivity.WebActivity $@ --fi -+exec sugar-activity3 sugar3.activity.webactivity.WebActivity $@ -diff --git b/doc/Makefile a/doc/Makefile -new file mode 100644 -index 0000000..60e9ad5 ---- /dev/null -+++ a/doc/Makefile -@@ -0,0 +1,193 @@ -+# Makefile for Sphinx documentation -+# -+ -+# You can set these variables from the command line. -+SPHINXOPTS = -+SPHINXBUILD = sphinx-build -+PAPER = -+BUILDDIR = _build -+ -+# User-friendly check for sphinx-build -+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -+endif -+ -+# Internal variables. -+PAPEROPT_a4 = -D latex_paper_size=a4 -+PAPEROPT_letter = -D latex_paper_size=letter -+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -+# the i18n builder cannot share the environment and doctrees with the others -+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -+ -+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext -+ -+help: -+ @echo "Please use \`make ' where is one of" -+ @echo " html to make standalone HTML files" -+ @echo " dirhtml to make HTML files named index.html in directories" -+ @echo " singlehtml to make a single large HTML file" -+ @echo " pickle to make pickle files" -+ @echo " json to make JSON files" -+ @echo " htmlhelp to make HTML files and a HTML help project" -+ @echo " qthelp to make HTML files and a qthelp project" -+ @echo " applehelp to make an Apple Help Book" -+ @echo " devhelp to make HTML files and a Devhelp project" -+ @echo " epub to make an epub" -+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" -+ @echo " latexpdf to make LaTeX files and run them through pdflatex" -+ @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" -+ @echo " text to make text files" -+ @echo " man to make manual pages" -+ @echo " texinfo to make Texinfo files" -+ @echo " info to make Texinfo files and run them through makeinfo" -+ @echo " gettext to make PO message catalogs" -+ @echo " changes to make an overview of all changed/added/deprecated items" -+ @echo " xml to make Docutils-native XML files" -+ @echo " pseudoxml to make pseudoxml-XML files for display purposes" -+ @echo " linkcheck to check all external links for integrity" -+ @echo " doctest to run all doctests embedded in the documentation (if enabled)" -+ @echo " coverage to run coverage check of the documentation (if enabled)" -+ -+clean: -+ rm -rf $(BUILDDIR)/* -+ -+html: -+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html -+ @echo -+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." -+ -+dirhtml: -+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml -+ @echo -+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." -+ -+singlehtml: -+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml -+ @echo -+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." -+ -+pickle: -+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle -+ @echo -+ @echo "Build finished; now you can process the pickle files." -+ -+json: -+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json -+ @echo -+ @echo "Build finished; now you can process the JSON files." -+ -+htmlhelp: -+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp -+ @echo -+ @echo "Build finished; now you can run HTML Help Workshop with the" \ -+ ".hhp project file in $(BUILDDIR)/htmlhelp." -+ -+qthelp: -+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp -+ @echo -+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \ -+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" -+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SugarToolkitGTK3.qhcp" -+ @echo "To view the help file:" -+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SugarToolkitGTK3.qhc" -+ -+applehelp: -+ $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp -+ @echo -+ @echo "Build finished. The help book is in $(BUILDDIR)/applehelp." -+ @echo "N.B. You won't be able to view it unless you put it in" \ -+ "~/Library/Documentation/Help or install it in your application" \ -+ "bundle." -+ -+devhelp: -+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp -+ @echo -+ @echo "Build finished." -+ @echo "To view the help file:" -+ @echo "# mkdir -p $$HOME/.local/share/devhelp/SugarToolkitGTK3" -+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SugarToolkitGTK3" -+ @echo "# devhelp" -+ -+epub: -+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub -+ @echo -+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub." -+ -+latex: -+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex -+ @echo -+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." -+ @echo "Run \`make' in that directory to run these through (pdf)latex" \ -+ "(use \`make latexpdf' here to do that automatically)." -+ -+latexpdf: -+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex -+ @echo "Running LaTeX files through pdflatex..." -+ $(MAKE) -C $(BUILDDIR)/latex all-pdf -+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." -+ -+latexpdfja: -+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex -+ @echo "Running LaTeX files through platex and dvipdfmx..." -+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja -+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." -+ -+text: -+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text -+ @echo -+ @echo "Build finished. The text files are in $(BUILDDIR)/text." -+ -+man: -+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man -+ @echo -+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man." -+ -+texinfo: -+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo -+ @echo -+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." -+ @echo "Run \`make' in that directory to run these through makeinfo" \ -+ "(use \`make info' here to do that automatically)." -+ -+info: -+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo -+ @echo "Running Texinfo files through makeinfo..." -+ make -C $(BUILDDIR)/texinfo info -+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." -+ -+gettext: -+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale -+ @echo -+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." -+ -+changes: -+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes -+ @echo -+ @echo "The overview file is in $(BUILDDIR)/changes." -+ -+linkcheck: -+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck -+ @echo -+ @echo "Link check complete; look for any errors in the above output " \ -+ "or in $(BUILDDIR)/linkcheck/output.txt." -+ -+doctest: -+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest -+ @echo "Testing of doctests in the sources finished, look at the " \ -+ "results in $(BUILDDIR)/doctest/output.txt." -+ -+coverage: -+ $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage -+ @echo "Testing of coverage in the sources finished, look at the " \ -+ "results in $(BUILDDIR)/coverage/python.txt." -+ -+xml: -+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml -+ @echo -+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml." -+ -+pseudoxml: -+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml -+ @echo -+ @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." -+ -diff --git b/doc/conf.py a/doc/conf.py -new file mode 100644 -index 0000000..26a811e ---- /dev/null -+++ a/doc/conf.py -@@ -0,0 +1,305 @@ -+# -*- coding: utf-8 -*- -+# -+# Sugar Toolkit GTK3 documentation build configuration file, created by -+# sphinx-quickstart on Sat Aug 1 21:36:44 2015. -+# -+# This file is execfile()d with the current directory set to its -+# containing dir. -+# -+# Note that not all possible configuration values are present in this -+# autogenerated file. -+# -+# All configuration values have a default; values that are commented out -+# serve to show the default. -+ -+import sys -+import os -+from sphinx import version_info -+ -+major, minor, patch, label, label_number = version_info -+ -+# If extensions (or modules to document with autodoc) are in another directory, -+# add these directories to sys.path here. If the directory is relative to the -+# documentation root, use os.path.abspath to make it absolute, like shown here. -+sys.path.insert(0, os.path.abspath('../src')) -+ -+# -- General configuration ------------------------------------------------ -+ -+# If your documentation needs a minimal Sphinx version, state it here. -+#needs_sphinx = '1.0' -+ -+# Add any Sphinx extension module names here, as strings. They can be -+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -+# ones. -+extensions = [ -+ 'sphinx.ext.autodoc', -+ 'sphinx.ext.intersphinx' -+] -+if major >= 1 and minor >= 3: -+ # Included in Sphinx 1.3 -+ extensions.append('sphinx.ext.napoleon') -+else: -+ extensions.append('sphinxcontrib.napoleon') -+ -+intersphinx_mapping = { -+ 'glib': ('http://lazka.github.io/pgi-docs/GLib-2.0', None), -+ 'gobject': ('http://lazka.github.io/pgi-docs/GObject-2.0', None), -+ 'gio': ('http://lazka.github.io/pgi-docs/Gio-2.0', None), -+ 'gtk': ('http://lazka.github.io/pgi-docs/Gtk-3.0', None) -+} -+ -+primary_domain = "py" -+ -+# Add any paths that contain templates here, relative to this directory. -+templates_path = ['_templates'] -+ -+# The suffix(es) of source filenames. -+# You can specify multiple suffix as a list of string: -+# source_suffix = ['.rst', '.md'] -+source_suffix = '.rst' -+ -+# The encoding of source files. -+#source_encoding = 'utf-8-sig' -+ -+# The master toctree document. -+master_doc = 'index' -+ -+# General information about the project. -+project = u'Sugar Toolkit GTK3' -+copyright = u'2017, Sugar Labs' -+author = u'Sugar Labs' -+ -+# The version info for the project you're documenting, acts as replacement for -+# |version| and |release|, also used in various other places throughout the -+# built documents. -+# -+# The short X.Y version. -+version = '0.117' -+# The full version, including alpha/beta/rc tags. -+release = '0.117' -+ -+# The language for content autogenerated by Sphinx. Refer to documentation -+# for a list of supported languages. -+# -+# This is also used if you do content translation via gettext catalogs. -+# Usually you set "language" from the command line for these cases. -+language = None -+ -+# There are two options for replacing |today|: either, you set today to some -+# non-false value, then it is used: -+#today = '' -+# Else, today_fmt is used as the format for a strftime call. -+#today_fmt = '%B %d, %Y' -+ -+# List of patterns, relative to source directory, that match files and -+# directories to ignore when looking for source files. -+exclude_patterns = ['_build'] -+ -+# The reST default role (used for this markup: `text`) to use for all -+# documents. -+#default_role = None -+ -+# If true, '()' will be appended to :func: etc. cross-reference text. -+#add_function_parentheses = True -+ -+# If true, the current module name will be prepended to all description -+# unit titles (such as .. function::). -+#add_module_names = True -+ -+# If true, sectionauthor and moduleauthor directives will be shown in the -+# output. They are ignored by default. -+#show_authors = False -+ -+# The name of the Pygments (syntax highlighting) style to use. -+pygments_style = 'sphinx' -+ -+# A list of ignored prefixes for module index sorting. -+#modindex_common_prefix = [] -+ -+# If true, keep warnings as "system message" paragraphs in the built documents. -+#keep_warnings = False -+ -+# If true, `todo` and `todoList` produce output, else they produce nothing. -+todo_include_todos = False -+ -+ -+# -- Options for HTML output ---------------------------------------------- -+ -+# The theme to use for HTML and HTML Help pages. See the documentation for -+# a list of builtin themes. -+if major >= 1 and minor >= 3: -+ # Added in Sphinx 1.3 -+ html_theme = 'alabaster' -+ -+# Theme options are theme-specific and customize the look and feel of a theme -+# further. For a list of options available for each theme, see the -+# documentation. -+#html_theme_options = {} -+ -+# Add any paths that contain custom themes here, relative to this directory. -+#html_theme_path = [] -+ -+# The name for this set of Sphinx documents. If None, it defaults to -+# " v documentation". -+#html_title = None -+ -+# A shorter title for the navigation bar. Default is the same as html_title. -+#html_short_title = None -+ -+# The name of an image file (relative to this directory) to place at the top -+# of the sidebar. -+#html_logo = None -+ -+# The name of an image file (within the static path) to use as favicon of the -+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -+# pixels large. -+#html_favicon = None -+ -+# Add any paths that contain custom static files (such as style sheets) here, -+# relative to this directory. They are copied after the builtin static files, -+# so a file named "default.css" will overwrite the builtin "default.css". -+html_static_path = ['_static'] -+ -+# Add any extra paths that contain custom files (such as robots.txt or -+# .htaccess) here, relative to this directory. These files are copied -+# directly to the root of the documentation. -+#html_extra_path = [] -+ -+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -+# using the given strftime format. -+#html_last_updated_fmt = '%b %d, %Y' -+ -+# If true, SmartyPants will be used to convert quotes and dashes to -+# typographically correct entities. -+#html_use_smartypants = True -+ -+# Custom sidebar templates, maps document names to template names. -+#html_sidebars = {} -+ -+# Additional templates that should be rendered to pages, maps page names to -+# template names. -+#html_additional_pages = {} -+ -+# If false, no module index is generated. -+#html_domain_indices = True -+ -+# If false, no index is generated. -+#html_use_index = True -+ -+# If true, the index is split into individual pages for each letter. -+#html_split_index = False -+ -+# If true, links to the reST sources are added to the pages. -+#html_show_sourcelink = True -+ -+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -+#html_show_sphinx = True -+ -+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -+#html_show_copyright = True -+ -+# If true, an OpenSearch description file will be output, and all pages will -+# contain a tag referring to it. The value of this option must be the -+# base URL from which the finished HTML is served. -+#html_use_opensearch = '' -+ -+# This is the file name suffix for HTML files (e.g. ".xhtml"). -+#html_file_suffix = None -+ -+# Language to be used for generating the HTML full-text search index. -+# Sphinx supports the following languages: -+# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja' -+# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr' -+#html_search_language = 'en' -+ -+# A dictionary with options for the search language support, empty by default. -+# Now only 'ja' uses this config value -+#html_search_options = {'type': 'default'} -+ -+# The name of a javascript file (relative to the configuration directory) that -+# implements a search results scorer. If empty, the default will be used. -+#html_search_scorer = 'scorer.js' -+ -+# Output file base name for HTML help builder. -+htmlhelp_basename = 'SugarToolkitGTK3doc' -+ -+# -- Options for LaTeX output --------------------------------------------- -+ -+latex_elements = { -+ # The paper size ('letterpaper' or 'a4paper'). -+ #'papersize': 'letterpaper', -+ -+ # The font size ('10pt', '11pt' or '12pt'). -+ #'pointsize': '10pt', -+ -+ # Additional stuff for the LaTeX preamble. -+ #'preamble': '', -+ -+ # Latex figure (float) alignment -+ #'figure_align': 'htbp', -+} -+ -+# Grouping the document tree into LaTeX files. List of tuples -+# (source start file, target name, title, -+# author, documentclass [howto, manual, or own class]). -+latex_documents = [ -+ (master_doc, 'SugarToolkitGTK3.tex', u'Sugar Toolkit GTK3 Documentation', -+ u'Sugar Labs', 'manual'), -+] -+ -+# The name of an image file (relative to this directory) to place at the top of -+# the title page. -+#latex_logo = None -+ -+# For "manual" documents, if this is true, then toplevel headings are parts, -+# not chapters. -+#latex_use_parts = False -+ -+# If true, show page references after internal links. -+#latex_show_pagerefs = False -+ -+# If true, show URL addresses after external links. -+#latex_show_urls = False -+ -+# Documents to append as an appendix to all manuals. -+#latex_appendices = [] -+ -+# If false, no module index is generated. -+#latex_domain_indices = True -+ -+ -+# -- Options for manual page output --------------------------------------- -+ -+# One entry per manual page. List of tuples -+# (source start file, name, description, authors, manual section). -+man_pages = [ -+ (master_doc, 'sugartoolkitgtk3', u'Sugar Toolkit GTK3 Documentation', -+ [author], 1) -+] -+ -+# If true, show URL addresses after external links. -+#man_show_urls = False -+ -+ -+# -- Options for Texinfo output ------------------------------------------- -+ -+# Grouping the document tree into Texinfo files. List of tuples -+# (source start file, target name, title, author, -+# dir menu entry, description, category) -+texinfo_documents = [ -+ (master_doc, 'SugarToolkitGTK3', u'Sugar Toolkit GTK3 Documentation', -+ author, 'SugarToolkitGTK3', 'One line description of project.', -+ 'Miscellaneous'), -+] -+ -+# Documents to append as an appendix to all manuals. -+#texinfo_appendices = [] -+ -+# If false, no module index is generated. -+#texinfo_domain_indices = True -+ -+# How to display URL addresses: 'footnote', 'no', or 'inline'. -+#texinfo_show_urls = 'footnote' -+ -+# If true, do not generate a @detailmenu in the "Top" node's menu. -+#texinfo_no_detailmenu = False -diff --git b/doc/index.rst a/doc/index.rst -new file mode 100644 -index 0000000..ba28b9f ---- /dev/null -+++ a/doc/index.rst -@@ -0,0 +1,33 @@ -+Sugar Toolkit GTK3 -+================== -+ -+Sugar Toolkit GTK3, or `sugar3`, is a toolkit for writing Sugar -+activities in Python: -+ -+* write a `setup.py` which calls :class:`~sugar3.activity.bundlebuilder`, -+* write an `activity/activity.info` file with metadata, see :class:`~sugar3.bundle`, -+* write a class derived from :class:`~sugar3.activity.activity.Activity`, -+* use the :class:`~sugar3.graphics` module classes to build a user interface. -+ -+Optional modules include: -+ -+* use the :class:`~sugar3.profile` module to fetch user profile information, -+* use the :class:`~sugar3.presence` module classes to implement sharing, -+* use the :class:`~sugar3.logger` module for debug logging, -+* use the :class:`~sugar3.network` module for downloading data, -+* use the :class:`~sugar3.speech` module for speech synthesis. -+ -+Indices and tables -+================== -+ -+* :ref:`Functions and classes ` -+* :ref:`Modules ` -+* :ref:`search` -+ -+Table of Contents -+================= -+ -+.. toctree:: -+ :maxdepth: 5 -+ -+ sugar3 -diff --git b/doc/modules.rst a/doc/modules.rst -new file mode 100644 -index 0000000..126de53 ---- /dev/null -+++ a/doc/modules.rst -@@ -0,0 +1,7 @@ -+src -+=== -+ -+.. toctree:: -+ :maxdepth: 4 -+ -+ sugar3 -diff --git b/examples/alert.py a/examples/alert.py -new file mode 100644 -index 0000000..f0425cb ---- /dev/null -+++ a/examples/alert.py -@@ -0,0 +1,33 @@ -+from gi.repository import Gtk -+from sugar3.graphics.alert import TimeoutAlert -+from common import set_theme -+ -+ -+set_theme() -+w = Gtk.Window() -+w.connect("delete-event", Gtk.main_quit) -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+w.add(box) -+ -+# Create a TimeoutAlert Object -+alert = TimeoutAlert(5) -+alert.props.title = '' -+alert.props.msg = '' -+ -+# Add Timeout Object to the box -+box.pack_start(alert, False, False, 0) -+ -+ -+# Called when an alert object throws a response event. -+def __alert_response_cb(alert, response_id): -+ if response_id is Gtk.ResponseType.OK: -+ print('Continue Button was clicked.') -+ elif response_id is Gtk.ResponseType.CANCEL: -+ print('Cancel Button was clicked.') -+ elif response_id == -1: -+ print('Timeout occurred') -+ -+ -+alert.connect('response', __alert_response_cb) -+w.show_all() -+Gtk.main() -diff --git b/examples/animator.py a/examples/animator.py -new file mode 100644 -index 0000000..c6ede6f ---- /dev/null -+++ a/examples/animator.py -@@ -0,0 +1,46 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics import animator -+from sugar3.graphics.icon import Icon -+from sugar3.graphics import style -+ -+from common import set_theme -+set_theme() -+ -+ -+class _Animation(animator.Animation): -+ -+ def __init__(self, icon, start_size, end_size): -+ animator.Animation.__init__(self, 0.0, 1.0) -+ -+ self._icon = icon -+ self.start_size = start_size -+ self.end_size = end_size -+ -+ def next_frame(self, current): -+ d = (self.end_size - self.start_size) * current -+ self._icon.props.pixel_size = int(self.start_size + d) -+ -+ -+def __animation_completed_cb(anim): -+ print('Animation completed') -+ -+ -+w = Gtk.Window() -+w.connect('delete-event', Gtk.main_quit) -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+w.add(box) -+ -+anim = animator.Animator(5) -+anim.connect('completed', __animation_completed_cb) -+ -+my_icon = Icon(icon_name='go-next') -+box.pack_start(my_icon, False, False, 0) -+ -+anim.add(_Animation(my_icon, style.STANDARD_ICON_SIZE, style.XLARGE_ICON_SIZE)) -+anim.start() -+ -+w.show_all() -+ -+Gtk.main() -diff --git b/examples/buttons.py a/examples/buttons.py -new file mode 100644 -index 0000000..5c679c2 ---- /dev/null -+++ a/examples/buttons.py -@@ -0,0 +1,64 @@ -+from gi.repository import Gtk -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+box.show() -+ -+# test Gtk.SpinButton: -+ -+adj = Gtk.Adjustment(0, 0, 10, 1, 32, 0) -+spin = Gtk.SpinButton() -+spin.set_adjustment(adj) -+box.pack_start(spin, False, False, 1) -+spin.show() -+ -+# test Gtk.RadioButton: -+ -+radio_1 = Gtk.RadioButton.new_with_label_from_widget(None, 'Radio 1') -+box.pack_start(radio_1, False, False, 1) -+radio_1.show() -+radio_2 = Gtk.RadioButton.new_with_label_from_widget(radio_1, 'Radio 2') -+box.pack_start(radio_2, False, False, 1) -+radio_2.show() -+radio_3 = Gtk.RadioButton.new_with_label_from_widget(radio_1, 'Radio 3') -+box.pack_start(radio_3, False, False, 1) -+radio_3.show() -+ -+# test Gtk.CheckButton: -+ -+check_1 = Gtk.CheckButton('Check 1') -+box.pack_start(check_1, False, False, 1) -+check_1.show() -+ -+check_2 = Gtk.CheckButton('Check 2') -+box.pack_start(check_2, False, False, 1) -+check_2.show() -+ -+# test Gtk.Button: -+ -+button = Gtk.Button('Button') -+box.pack_start(button, False, False, 1) -+button.show() -+ -+# test Gtk.Button insensitive: -+ -+insensitive_button = Gtk.Button('Insensitive Button') -+box.pack_start(insensitive_button, False, False, 1) -+insensitive_button.props.sensitive = False -+insensitive_button.show() -+ -+# test Gtk.ToggleButton: -+ -+toggle_button = Gtk.ToggleButton('ToggleButton') -+box.pack_start(toggle_button, False, False, 1) -+toggle_button.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/cellrenderericon.py a/examples/cellrenderericon.py -new file mode 100644 -index 0000000..e280204 ---- /dev/null -+++ a/examples/cellrenderericon.py -@@ -0,0 +1,37 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics import style -+from sugar3.graphics.icon import CellRendererIcon -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+model = Gtk.ListStore(str) -+for icon in ['one', 'two', 'three']: -+ model.append([icon]) -+ -+treeview = Gtk.TreeView() -+treeview.set_model(model) -+test.pack_start(treeview, True, True, 0) -+treeview.show() -+ -+col = Gtk.TreeViewColumn() -+treeview.append_column(col) -+ -+cell_icon = CellRendererIcon() -+cell_icon.props.width = style.GRID_CELL_SIZE -+cell_icon.props.height = style.GRID_CELL_SIZE -+cell_icon.props.size = style.SMALL_ICON_SIZE -+cell_icon.props.icon_name = 'emblem-favorite' -+col.pack_start(cell_icon, expand=False) -+ -+cell_text = Gtk.CellRendererText() -+col.pack_start(cell_text, expand=True) -+col.add_attribute(cell_text, 'text', 0) -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/colorbutton.py a/examples/colorbutton.py -new file mode 100644 -index 0000000..09db068 ---- /dev/null -+++ a/examples/colorbutton.py -@@ -0,0 +1,37 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.toolbarbox import ToolbarBox -+from sugar3.graphics.colorbutton import ColorToolButton -+ -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+box.show() -+ -+toolbar_box = ToolbarBox() -+box.pack_start(toolbar_box, False, False, 0) -+toolbar_box.show() -+ -+separator = Gtk.SeparatorToolItem() -+toolbar_box.toolbar.insert(separator, -1) -+separator.show() -+ -+ -+def color_changed_cb(button, pspec): -+ print(button.get_color()) -+ -+ -+color_button = ColorToolButton() -+color_button.connect("notify::color", color_changed_cb) -+toolbar_box.toolbar.insert(color_button, -1) -+color_button.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/combobox.py a/examples/combobox.py -new file mode 100644 -index 0000000..6d1c1a0 ---- /dev/null -+++ a/examples/combobox.py -@@ -0,0 +1,25 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.combobox import ComboBox -+from common import set_theme -+set_theme() -+ -+ -+def __combo_changed_cb(combo): -+ print('Combo changed to %r' % combo.get_value()) -+ -+ -+w = Gtk.Window() -+w.connect("delete-event", Gtk.main_quit) -+ -+combo = ComboBox() -+combo.append_item(True, 'one') -+combo.append_item(2, 'two', 'go-next') -+combo.append_item('3', 'three') -+# This will make 'two' active (zero indexed) -+combo.set_active(1) -+combo.connect('changed', __combo_changed_cb) -+w.add(combo) -+ -+w.show_all() -+Gtk.main() -diff --git b/examples/common.py a/examples/common.py -new file mode 100644 -index 0000000..906eb50 ---- /dev/null -+++ a/examples/common.py -@@ -0,0 +1,77 @@ -+# Copyright (C) 2007, Red Hat, Inc. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+from gi.repository import Gtk -+from gi.repository import GObject -+ -+from sugar3.graphics.toolbutton import ToolButton -+ -+import os -+ -+ -+def set_theme(): -+ settings = Gtk.Settings.get_default() -+ sugar_theme = 'sugar-72' -+ if 'SUGAR_SCALING' in os.environ: -+ if os.environ['SUGAR_SCALING'] == '100': -+ sugar_theme = 'sugar-100' -+ settings.set_property('gtk-theme-name', sugar_theme) -+ settings.set_property('gtk-icon-theme-name', 'sugar') -+ -+ -+class Test(Gtk.Box): -+ -+ def __init__(self): -+ GObject.GObject.__init__(self, orientation=Gtk.Orientation.VERTICAL) -+ -+ set_theme() -+ -+ -+class TestPalette(Test): -+ -+ def __init__(self): -+ Test.__init__(self) -+ -+ toolbar = Gtk.Toolbar() -+ -+ self._invoker = ToolButton('go-previous') -+ toolbar.insert(self._invoker, -1) -+ self._invoker.show() -+ -+ self.pack_start(toolbar, False, False, 0) -+ toolbar.show() -+ -+ def set_palette(self, palette): -+ self._invoker.set_palette(palette) -+ -+ -+class TestRunner(object): -+ -+ def run(self, test): -+ window = Gtk.Window() -+ window.connect('delete-event', Gtk.main_quit) -+ window.add(test) -+ test.show() -+ -+ window.show() -+ -+ -+def main(test): -+ runner = TestRunner() -+ runner.run(test) -+ -+ Gtk.main() -diff --git b/examples/customdestroy.py a/examples/customdestroy.py -new file mode 100644 -index 0000000..fc33eb9 ---- /dev/null -+++ a/examples/customdestroy.py -@@ -0,0 +1,47 @@ -+from gi.repository import Gtk -+ -+""" -+Since GTK+3 Gtk.CellRenderer doesn't have a destroy signal anymore. -+We can do the cleanup in the python destructor method instead. -+ -+""" -+ -+ -+class MyCellRenderer(Gtk.CellRenderer): -+ -+ def __init__(self): -+ Gtk.CellRenderer.__init__(self) -+ -+ def __del__(self): -+ print("cellrenderer destroy") -+ -+ def do_render(self, cairo_t, widget, background_area, cell_area, flags): -+ pass -+ -+ -+def window_destroy_cb(*kwargs): -+ print("window destroy") -+ Gtk.main_quit() -+ -+ -+window = Gtk.Window(Gtk.WindowType.TOPLEVEL) -+window.connect("destroy", window_destroy_cb) -+window.show() -+ -+ -+def treeview_destroy_cb(*kwargs): -+ print("treeview destroy") -+ -+ -+treeview = Gtk.TreeView() -+treeview.connect("destroy", treeview_destroy_cb) -+window.add(treeview) -+treeview.show() -+ -+col = Gtk.TreeViewColumn() -+treeview.append_column(col) -+ -+cel = MyCellRenderer() -+col.pack_start(cel, expand=True) -+ -+Gtk.main() -diff --git b/examples/gtktreesensitive.py a/examples/gtktreesensitive.py -new file mode 100644 -index 0000000..58fea99 ---- /dev/null -+++ a/examples/gtktreesensitive.py -@@ -0,0 +1,48 @@ -+#!/usr/bin/python3 -+from gi.repository import Gtk -+ -+import common -+test = common.Test() -+test.show() -+ -+ -+class MyBox(Gtk.Box): -+ -+ def __init__(self): -+ Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) -+ -+ scrolled = Gtk.ScrolledWindow() -+ scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, -+ Gtk.PolicyType.AUTOMATIC) -+ -+ store = Gtk.ListStore(str, str) -+ for i in range(5): -+ store.append([str(i), 'Item %s' % i]) -+ -+ treeview = Gtk.TreeView(store) -+ renderer_no_sens = Gtk.CellRendererText() -+ # set 'sensitive' property -+ renderer_no_sens.set_property('sensitive', False) -+ -+ renderer = Gtk.CellRendererText() -+ -+ column = Gtk.TreeViewColumn('\'sensitive\' False', -+ renderer_no_sens, text=0) -+ treeview.append_column(column) -+ -+ column = Gtk.TreeViewColumn('\'sensitive\' True', -+ renderer, text=1) -+ treeview.append_column(column) -+ -+ scrolled.add(treeview) -+ self.pack_start(scrolled, True, True, 0) -+ -+ self.show_all() -+ -+ -+box = MyBox() -+test.pack_start(box, True, True, 0) -+box.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/iconbadges.py a/examples/iconbadges.py -new file mode 100644 -index 0000000..545f0d0 ---- /dev/null -+++ a/examples/iconbadges.py -@@ -0,0 +1,42 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.icon import EventIcon -+from sugar3.graphics.icon import Icon -+from sugar3.graphics import style -+from sugar3.graphics.xocolor import XoColor -+from sugar3.graphics.palette import Palette -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+box.show() -+ -+# An XO Icon, normal size, setting the color via the XoColor object -+icon = Icon(icon_name='computer-xo', -+ pixel_size=style.STANDARD_ICON_SIZE, -+ xo_color=XoColor('#00BEFF,#FF7800')) -+box.pack_start(icon, False, False, 0) -+icon.show() -+ -+# You can mix constructor keyword argument and setting -+# properties after creation -+icon = EventIcon(icon_name='network-wireless-080', -+ pixel_size=style.STANDARD_ICON_SIZE) -+# Badges are little icons displayed -+icon.props.badge_name = 'emblem-favorite' -+# Instead of using the XoColor, you can use any SVG color specifier: -+icon.props.fill_color = 'rgb(230, 0, 10)' -+icon.props.stroke_color = '#78E600' -+# Unlike normal icons, EventIcons support palettes: -+icon.props.palette = Palette('Hello World') -+box.pack_start(icon, False, False, 0) -+icon.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/iconcache.py a/examples/iconcache.py -new file mode 100644 -index 0000000..a766a37 ---- /dev/null -+++ a/examples/iconcache.py -@@ -0,0 +1,72 @@ -+# Copyright (C) 2007, Red Hat, Inc. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+""" -+Test the sugar3.graphics.icon.* cache. -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics.icon import Icon -+from sugar3.graphics.xocolor import XoColor -+from sugar3.graphics import style -+ -+import common -+ -+test = common.Test() -+ -+data = [ -+ ['battery-000', '#FF8F00,#FF2B34'], -+ ['battery-010', '#D1A3FF,#00A0FF'], -+ ['battery-020', '#FF8F00,#FF2B34'], -+ ['battery-030', '#00A0FF,#D1A3FF'], -+ ['battery-040', '#AC32FF,#FF2B34'], -+ ['battery-050', '#D1A3FF,#00A0FF'], -+ ['battery-060', '#AC32FF,#FF2B34'], -+ ['battery-070', '#00A0FF,#D1A3FF'], -+ ['battery-080', '#FF8F00,#FF2B34'], -+ ['battery-090', '#D1A3FF,#00A0FF'], -+ ['battery-100', '#AC32FF,#FF2B34']] -+ -+ -+def _button_activated_cb(button): -+ import random -+ -+ global data -+ random.shuffle(data) -+ -+ for i in range(0, len(test.get_children()) - 1): -+ test.get_children()[i].props.icon_name = data[i][0] -+ test.get_children()[i].props.xo_color = XoColor(data[i][1]) -+ -+ -+for d in data: -+ icon = Icon(icon_name=d[0], -+ pixel_size=style.STANDARD_ICON_SIZE, -+ xo_color=XoColor(d[1])) -+ test.pack_start(icon, True, True, 0) -+ icon.show() -+ -+button = Gtk.Button('mec mac') -+test.pack_start(button, True, True, 0) -+button.connect('activate', _button_activated_cb) -+button.show() -+ -+test.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/iconentry.py a/examples/iconentry.py -new file mode 100644 -index 0000000..e35c601 ---- /dev/null -+++ a/examples/iconentry.py -@@ -0,0 +1,32 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics import iconentry -+from common import set_theme -+set_theme() -+ -+ -+def __go_next_cb(entry, icon_pos, data=None): -+ print('Go next') -+ -+ -+def __entry_activate_cb(widget, data=None): -+ print('Entry activate') -+ -+ -+w = Gtk.Window() -+w.connect("delete-event", Gtk.main_quit) -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+w.add(box) -+ -+entry = iconentry.IconEntry() -+entry.set_icon_from_name(iconentry.ICON_ENTRY_SECONDARY, -+ 'go-next') -+entry.connect('icon-press', __go_next_cb) -+entry.connect('activate', __entry_activate_cb) -+entry.set_progress_fraction(0.3) -+box.pack_start(entry, False, False, 0) -+ -+w.show_all() -+ -+Gtk.main() -diff --git b/examples/iconwidget.py a/examples/iconwidget.py -new file mode 100644 -index 0000000..2854b4c ---- /dev/null -+++ a/examples/iconwidget.py -@@ -0,0 +1,88 @@ -+# Copyright (C) 2007, Red Hat, Inc. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+""" -+Test the sugar3.graphics.icon.Icon widget. -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics.icon import Icon -+from sugar3.graphics.xocolor import XoColor -+from sugar3.graphics import style -+ -+import common -+ -+test = common.Test() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+test.pack_start(box, True, True, 0) -+sensitive_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+insensitive_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+ -+box.pack_start(sensitive_box, True, True, 0) -+box.pack_start(insensitive_box, True, True, 0) -+box.show_all() -+ -+ -+def create_icon_widgets(box, sensitive=True): -+ icon = Icon(icon_name='go-previous') -+ icon.props.pixel_size = style.STANDARD_ICON_SIZE -+ box.pack_start(icon, True, True, 0) -+ icon.set_sensitive(sensitive) -+ icon.show() -+ -+ icon = Icon(icon_name='computer-xo', -+ pixel_size=style.STANDARD_ICON_SIZE, -+ xo_color=XoColor()) -+ box.pack_start(icon, True, True, 0) -+ icon.set_sensitive(sensitive) -+ icon.show() -+ -+ icon = Icon(icon_name='battery-000', -+ pixel_size=style.STANDARD_ICON_SIZE, -+ badge_name='emblem-busy') -+ box.pack_start(icon, True, True, 0) -+ icon.set_sensitive(sensitive) -+ icon.show() -+ -+ icon = Icon(icon_name='gtk-new', -+ pixel_size=style.STANDARD_ICON_SIZE, -+ badge_name='gtk-cancel') -+ box.pack_start(icon, True, True, 0) -+ icon.set_sensitive(sensitive) -+ icon.show() -+ -+ -+create_icon_widgets(sensitive_box, True) -+create_icon_widgets(insensitive_box, False) -+ -+test.show() -+ -+# This can be used to test for leaks by setting the LRU cache size -+# in icon.py to 1. -+# def idle_cb(): -+# import gc -+# gc.collect() -+# test.queue_draw() -+# return True -+# -+# from gi.repository import GLib -+# GLib.idle_add(idle_cb) -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/notebook.py a/examples/notebook.py -new file mode 100644 -index 0000000..7462e0d ---- /dev/null -+++ a/examples/notebook.py -@@ -0,0 +1,32 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.notebook import Notebook -+from common import set_theme -+set_theme() -+ -+ -+w = Gtk.Window() -+w.connect("delete-event", Gtk.main_quit) -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+w.add(box) -+ -+nb = Notebook(can_close_tabs=True) -+box.pack_start(nb, False, False, 0) -+ -+for i in range(5): -+ bufferf = "Prepend Frame %d" % (i + 1) -+ bufferl = "PPage %d" % (i + 1) -+ -+ frame = Gtk.Frame() -+ frame.set_border_width(10) -+ frame.set_size_request(100, 75) -+ label = Gtk.Label(bufferf) -+ frame.add(label) -+ label.show() -+ nb.add_page(bufferl, frame) -+ frame.show() -+ -+w.show_all() -+ -+Gtk.main() -diff --git b/examples/progress.py a/examples/progress.py -new file mode 100644 -index 0000000..62a9313 ---- /dev/null -+++ a/examples/progress.py -@@ -0,0 +1,20 @@ -+from gi.repository import Gtk -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+test.pack_start(box, True, False, 10) -+box.show() -+ -+bar = Gtk.ProgressBar() -+bar.set_fraction(0.5) -+box.pack_start(bar, True, True, 10) -+bar.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/progressicon.py a/examples/progressicon.py -new file mode 100644 -index 0000000..4bf3d99 ---- /dev/null -+++ a/examples/progressicon.py -@@ -0,0 +1,58 @@ -+from gi.repository import Gtk -+from gi.repository import GLib -+ -+from sugar3.graphics.toolbarbox import ToolbarBox -+from sugar3.graphics.progressicon import ProgressIcon -+from sugar3.graphics import style -+ -+import common -+ -+ -+test = common.Test() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+ -+toolbar_box = ToolbarBox() -+box.pack_start(toolbar_box, False, False, 0) -+ -+separator = Gtk.SeparatorToolItem() -+toolbar_box.toolbar.insert(separator, -1) -+ -+icon = ProgressIcon( -+ pixel_size=style.LARGE_ICON_SIZE, -+ icon_name='computer-xo', -+ stroke_color=style.COLOR_BUTTON_GREY.get_svg(), -+ fill_color=style.COLOR_WHITE.get_svg()) -+test.pack_start(icon, True, True, 0) -+icon.show() -+ -+icon2 = ProgressIcon( -+ pixel_size=style.LARGE_ICON_SIZE, -+ icon_name='computer-xo', -+ stroke_color=style.COLOR_BUTTON_GREY.get_svg(), -+ fill_color=style.COLOR_WHITE.get_svg(), -+ direction='horizontal') -+test.pack_start(icon2, True, True, 0) -+icon2.show() -+ -+test.show_all() -+ -+progress = 0 -+ -+ -+def timeout_cb(): -+ global progress -+ progress += 0.05 -+ icon.update(progress) -+ icon2.update(progress) -+ if progress >= 1: -+ return False -+ return True -+ -+ -+GLib.timeout_add(50, timeout_cb) -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/radiopalette.py a/examples/radiopalette.py -new file mode 100644 -index 0000000..8537144 ---- /dev/null -+++ a/examples/radiopalette.py -@@ -0,0 +1,78 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.radiopalette import RadioPalette, RadioMenuButton, \ -+ RadioToolsButton -+from sugar3.graphics.radiotoolbutton import RadioToolButton -+from common import set_theme -+set_theme() -+ -+ -+window = Gtk.Window() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+window.add(box) -+ -+toolbar = Gtk.Toolbar() -+box.pack_start(toolbar, False, False, 0) -+ -+text_view = Gtk.TextView() -+box.pack_start(text_view, True, True, 0) -+ -+ -+def echo(button, label): -+ if not button.props.active: -+ return -+ text_view.props.buffer.props.text += '\n' + label -+ -+ -+# RadioMenuButton -+ -+palette = RadioPalette() -+ -+group = RadioToolButton( -+ icon_name='document-open') -+group.connect('clicked', lambda button: echo(button, 'document-open')) -+palette.append(group, 'menu.document-open') -+ -+button = RadioToolButton( -+ icon_name='document-save', -+ group=group) -+button.connect('clicked', lambda button: echo(button, 'document-save')) -+palette.append(button, 'menu.document-save') -+ -+button = RadioToolButton( -+ icon_name='document-send', -+ group=group) -+button.connect('clicked', lambda button: echo(button, 'document-send')) -+palette.append(button, 'menu.document-send') -+ -+button = RadioMenuButton(palette=palette) -+toolbar.insert(button, -1) -+ -+# RadioToolsButton -+ -+palette = RadioPalette() -+ -+group = RadioToolButton( -+ icon_name='document-open') -+group.connect('clicked', lambda button: echo(button, 'document-open')) -+palette.append(group, 'menu.document-open') -+ -+button = RadioToolButton( -+ icon_name='document-save', -+ group=group) -+button.connect('clicked', lambda button: echo(button, 'document-save')) -+palette.append(button, 'menu.document-save') -+ -+button = RadioToolButton( -+ icon_name='document-send', -+ group=group) -+button.connect('clicked', lambda button: echo(button, 'document-send')) -+palette.append(button, 'menu.document-send') -+ -+button = RadioToolsButton(palette=palette) -+toolbar.insert(button, -1) -+ -+window.connect('delete-event', Gtk.main_quit) -+window.show_all() -+Gtk.main() -diff --git b/examples/radiotoolbutton.py a/examples/radiotoolbutton.py -new file mode 100644 -index 0000000..5d0b547 ---- /dev/null -+++ a/examples/radiotoolbutton.py -@@ -0,0 +1,48 @@ -+from gi.repository import Gtk -+from sugar3.graphics.radiotoolbutton import RadioToolButton -+from sugar3.graphics.radiopalette import RadioPalette, RadioMenuButton -+from sugar3.graphics.xocolor import XoColor -+ -+ -+from common import set_theme -+set_theme() -+ -+window = Gtk.Window() -+window.show() -+window.connect("delete-event", Gtk.main_quit) -+ -+box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+window.add(box) -+box.show() -+ -+ -+def echo(button, label): -+ if not button.props.active: -+ return -+ print(label) -+ -+ -+palette = RadioPalette() -+# Adding 3 RadioToolButtons to a palette -+ -+button1 = RadioToolButton(icon_name='document-save', accelerator="S", -+ xo_color=XoColor("white")) -+button1.connect('toggled', lambda button: echo(button, 'document-save')) -+palette.append(button1, 'menu.document-save') -+ -+button2 = RadioToolButton(icon_name='document-open', accelerator="O", -+ xo_color=XoColor("white"), group=button1) -+button2.connect('toggled', lambda button: echo(button, 'document-open')) -+palette.append(button2, 'menu.document-open') -+ -+button3 = RadioToolButton(icon_name='document-send', accelerator="F", -+ xo_color=XoColor("white"), group=button1) -+button3.connect('toggled', lambda button: echo(button, 'document-send')) -+palette.append(button3, 'menu.document-send') -+ -+button = RadioMenuButton(palette=palette) -+box.pack_start(button, False, False, 1) -+button.show() -+ -+if __name__ == '__main__': -+ Gtk.main() -diff --git b/examples/scrollingdetector.py a/examples/scrollingdetector.py -new file mode 100644 -index 0000000..df0c70a ---- /dev/null -+++ a/examples/scrollingdetector.py -@@ -0,0 +1,73 @@ -+import os -+import time -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics import style -+from sugar3.graphics.icon import CellRendererIcon -+from sugar3.graphics.xocolor import XoColor -+from sugar3.graphics.scrollingdetector import ScrollingDetector -+from sugar3.graphics.palettewindow import TreeViewInvoker -+import common -+ -+ -+def _scroll_start_cb(event, treeview, invoker): -+ print("Scroll starts") -+ invoker.detach() -+ -+ -+def _scroll_end_cb(event, treeview, invoker): -+ print("Scroll ends") -+ invoker.attach_treeview(treeview) -+ -+ -+test = common.Test() -+test.show() -+ -+model = Gtk.ListStore(str) -+ -+data_dir = os.getenv('GTK_DATA_PREFIX', '/usr/') -+ -+iconlist = os.listdir(os.path.join(data_dir, -+ 'share/icons/sugar/scalable/actions/')) -+print("Displaying %s icons" % len(iconlist)) -+for icon in iconlist: -+ icon = os.path.basename(icon) -+ icon = icon[:icon.find('.')] -+ model.append([icon]) -+ -+scrolled = Gtk.ScrolledWindow() -+scrolled.set_size_request(800, 800) -+treeview = Gtk.TreeView() -+ -+treeview.set_model(model) -+scrolled.add(treeview) -+test.pack_start(scrolled, True, True, 0) -+test.show_all() -+ -+col = Gtk.TreeViewColumn() -+treeview.append_column(col) -+ -+xo_color = XoColor('#FF0000,#00FF00') -+cell_icon = CellRendererIcon() -+cell_icon.props.width = style.GRID_CELL_SIZE -+cell_icon.props.height = style.GRID_CELL_SIZE -+cell_icon.props.size = style.STANDARD_ICON_SIZE -+cell_icon.props.xo_color = xo_color -+ -+col.pack_start(cell_icon, expand=False) -+col.add_attribute(cell_icon, 'icon-name', 0) -+cell_text = Gtk.CellRendererText() -+col.pack_start(cell_text, expand=True) -+col.add_attribute(cell_text, 'text', 0) -+ -+invoker = TreeViewInvoker() -+invoker.attach_treeview(treeview) -+ -+detector = ScrollingDetector(scrolled) -+detector.connect('scroll-start', _scroll_start_cb, treeview, invoker) -+detector.connect('scroll-end', _scroll_end_cb, treeview, invoker) -+ -+if __name__ == '__main__': -+ time_ini = time.time() -+ common.main(test) -diff --git b/examples/tabs.py a/examples/tabs.py -new file mode 100644 -index 0000000..7a8b52f ---- /dev/null -+++ a/examples/tabs.py -@@ -0,0 +1,46 @@ -+#!/usr/bin/python3 -+from gi.repository import Gtk -+ -+from sugar3.graphics.icon import Icon -+ -+import common -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+test.pack_start(box, True, True, 0) -+box.show() -+ -+# notebook without button -+ -+notebook = Gtk.Notebook() -+box.pack_start(notebook, True, True, 0) -+notebook.show() -+ -+for i in range(3): -+ hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+ notebook.append_page(hbox, Gtk.Label('Page %d' % (i + 1))) -+ hbox.show() -+ -+# notebook with buttons -+ -+notebook = Gtk.Notebook() -+box.pack_start(notebook, True, True, 0) -+notebook.show() -+ -+add_icon = Icon(icon_name='add') -+button = Gtk.Button() -+button.props.focus_on_click = False -+button.add(add_icon) -+add_icon.show() -+ -+notebook.set_action_widget(button, Gtk.PackType.END) -+button.show() -+ -+for i in range(3): -+ hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+ notebook.append_page(hbox, Gtk.Label('Page %d' % (i + 1))) -+ hbox.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/ticket2855.py a/examples/ticket2855.py -new file mode 100644 -index 0000000..59a2917 ---- /dev/null -+++ a/examples/ticket2855.py -@@ -0,0 +1,60 @@ -+# Copyright (C) 2007, Red Hat, Inc. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+""" -+Test the style of toggle and radio buttons inside a palette. The buttons -+contains only an icon and should be rendered similarly to the toolbar -+controls. Ticket #2855. -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics.palette import Palette -+from sugar3.graphics.icon import Icon -+from sugar3.graphics import style -+ -+import common -+ -+test = common.TestPalette() -+ -+palette = Palette('Test radio and toggle') -+test.set_palette(palette) -+ -+box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+ -+toggle = Gtk.ToggleButton() -+ -+icon = Icon(icon_name='go-previous', pixel_size=style.STANDARD_ICON_SIZE) -+toggle.set_image(icon) -+ -+box.pack_start(toggle, False, False, 0) -+toggle.show() -+ -+radio = Gtk.RadioButton() -+ -+icon = Icon(icon_name='go-next', pixel_size=style.STANDARD_ICON_SIZE) -+radio.set_image(icon) -+ -+radio.set_mode(False) -+box.pack_start(radio, False, False, 0) -+radio.show() -+ -+palette.set_content(box) -+box.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/bin/sugar-activity-web a/examples/ticket2999.py -similarity index 66% -copy from bin/sugar-activity-web -copy to examples/ticket2999.py -index 8fd7a59..0d42297 100644 ---- b/bin/sugar-activity-web -+++ a/examples/ticket2999.py -@@ -1,6 +1,4 @@ --#!/bin/sh -- --# Copyright (C) 2013 Daniel Narvaez -+# Copyright (C) 2007, One Laptop Per Child - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -17,8 +15,21 @@ - # Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - --if [ "$SUGAR_USE_WEBKIT1" = "yes" ]; then -- exec sugar-activity3 sugar3.activity.webkit1.WebActivity $@ --else -- exec sugar-activity3 sugar3.activity.webactivity.WebActivity $@ --fi -+""" -+Spec in ticket #2999. -+""" -+ -+from gi.repository import Gtk -+ -+import common -+ -+test = common.Test() -+test.set_border_width(60) -+ -+text_view = Gtk.TextView() -+text_view.props.buffer.props.text = 'Blah blah blah, blah blah blah.' -+test.pack_start(text_view, True, True, 0) -+text_view.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/bin/sugar-activity-web a/examples/ticket3000.py -similarity index 56% -copy from bin/sugar-activity-web -copy to examples/ticket3000.py -index 8fd7a59..488985e 100644 ---- b/bin/sugar-activity-web -+++ a/examples/ticket3000.py -@@ -1,6 +1,4 @@ --#!/bin/sh -- --# Copyright (C) 2013 Daniel Narvaez -+# Copyright (C) 2007, One Laptop Per Child - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -17,8 +15,34 @@ - # Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - --if [ "$SUGAR_USE_WEBKIT1" = "yes" ]; then -- exec sugar-activity3 sugar3.activity.webkit1.WebActivity $@ --else -- exec sugar-activity3 sugar3.activity.webactivity.WebActivity $@ --fi -+""" -+Spec in ticket #3000. -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics.toolbutton import ToolButton -+ -+import common -+ -+test = common.Test() -+ -+toolbar = Gtk.Toolbar() -+test.pack_start(toolbar, False, False, 0) -+toolbar.show() -+ -+button = ToolButton('go-previous') -+toolbar.insert(button, -1) -+button.show() -+ -+separator = Gtk.SeparatorToolItem() -+toolbar.add(separator) -+separator.show() -+ -+button = ToolButton('go-next') -+toolbar.insert(button, -1) -+button.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/toggletoolbutton.py a/examples/toggletoolbutton.py -new file mode 100644 -index 0000000..bc37c17 ---- /dev/null -+++ a/examples/toggletoolbutton.py -@@ -0,0 +1,33 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.toolbarbox import ToolbarBox -+from sugar3.graphics.toggletoolbutton import ToggleToolButton -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+box.show() -+ -+toolbar_box = ToolbarBox() -+box.pack_start(toolbar_box, False, False, 0) -+toolbar_box.show() -+ -+favorite_button = ToggleToolButton('emblem-favorite') -+favorite_button.set_tooltip('Favorite') -+toolbar_box.toolbar.insert(favorite_button, -1) -+favorite_button.show() -+ -+favorite_button2 = ToggleToolButton('emblem-favorite') -+favorite_button2.set_tooltip('Favorite') -+toolbar_box.toolbar.insert(favorite_button2, -1) -+favorite_button2.set_active(True) -+favorite_button2.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/toolbar.py a/examples/toolbar.py -new file mode 100644 -index 0000000..dc3cb41 ---- /dev/null -+++ a/examples/toolbar.py -@@ -0,0 +1,56 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.toolbutton import ToolButton -+from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton -+from common import set_theme -+set_theme() -+ -+ -+window = Gtk.Window() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+window.add(box) -+ -+toolbar = ToolbarBox() -+box.pack_start(toolbar, False, False, 0) -+ -+tollbarbutton_1 = ToolbarButton( -+ page=Gtk.Button('sub-widget #1'), -+ icon_name='computer-xo') -+toolbar.toolbar.insert(tollbarbutton_1, -1) -+ -+tollbarbutton_2 = ToolbarButton( -+ page=Gtk.Button('sub-widget #2'), -+ icon_name='button_cancel', -+ tooltip='with custom palette instead of sub-widget') -+toolbar.toolbar.insert(tollbarbutton_2, -1) -+ -+toolbar.toolbar.insert(Gtk.SeparatorToolItem(), -1) -+ -+ -+def del_cb(widget): -+ toolbar.toolbar.remove(tollbarbutton_3) -+ -+ -+del_b = Gtk.Button('delete sub-widget #3') -+del_b.connect('clicked', del_cb) -+tollbarbutton_3 = ToolbarButton( -+ page=del_b, -+ icon_name='activity-journal') -+toolbar.toolbar.insert(tollbarbutton_3, -1) -+ -+subbar = Gtk.Toolbar() -+subbutton = ToolButton( -+ icon_name='document-send', -+ tooltip='document-send') -+subbar.insert(subbutton, -1) -+subbar.show_all() -+ -+tollbarbutton_4 = ToolbarButton( -+ page=subbar, -+ icon_name='document-save') -+toolbar.toolbar.insert(tollbarbutton_4, -1) -+ -+window.connect('delete-event', Gtk.main_quit) -+window.show_all() -+Gtk.main() -diff --git b/examples/toolbarpalettes.py a/examples/toolbarpalettes.py -new file mode 100644 -index 0000000..5d9ee9a ---- /dev/null -+++ a/examples/toolbarpalettes.py -@@ -0,0 +1,65 @@ -+# Copyright (C) 2007, Red Hat, Inc. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+""" -+Test palette positioning for toolbar and tray. -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics.tray import HTray, TrayButton -+from sugar3.graphics.toolbutton import ToolButton -+ -+import common -+ -+test = common.Test() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+ -+theme_icons = Gtk.IconTheme.get_default().list_icons() -+ -+toolbar = Gtk.Toolbar() -+box.pack_start(toolbar, False, False, 0) -+toolbar.show() -+ -+for i in range(0, 5): -+ button = ToolButton(icon_name=theme_icons[i]) -+ button.set_tooltip('Icon %d' % i) -+ toolbar.insert(button, -1) -+ button.show() -+ -+content = Gtk.Label() -+box.pack_start(content, True, True, 0) -+content.show() -+ -+tray = HTray() -+box.pack_start(tray, False, False, 0) -+tray.show() -+ -+for i in range(0, 30): -+ button = TrayButton(icon_name=theme_icons[i]) -+ button.set_tooltip('Icon %d' % i) -+ tray.add_item(button) -+ button.show() -+ -+test.pack_start(box, True, True, 0) -+box.show() -+ -+test.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/toolbutton.py a/examples/toolbutton.py -new file mode 100644 -index 0000000..c4a2649 ---- /dev/null -+++ a/examples/toolbutton.py -@@ -0,0 +1,36 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.toolbarbox import ToolbarBox -+from sugar3.graphics.toolbutton import ToolButton -+ -+import common -+ -+ -+test = common.Test() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+ -+toolbar_box = ToolbarBox() -+box.pack_start(toolbar_box, False, False, 0) -+ -+separator = Gtk.SeparatorToolItem() -+toolbar_box.toolbar.insert(separator, -1) -+ -+ -+def __clicked_cb(button): -+ n = int(button.get_tooltip()) -+ button.set_tooltip(str(n + 1)) -+ print("tool button click count %d" % n) -+ -+ -+tool_button = ToolButton(icon_name='view-radial', tooltip='0') -+tool_button.connect('clicked', __clicked_cb) -+tool_button.set_hide_tooltip_on_click(False) -+tool_button.set_accelerator('') -+toolbar_box.toolbar.insert(tool_button, -1) -+ -+test.show_all() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/toolbuttons.py a/examples/toolbuttons.py -new file mode 100644 -index 0000000..75e9e49 ---- /dev/null -+++ a/examples/toolbuttons.py -@@ -0,0 +1,46 @@ -+from gi.repository import Gtk -+ -+from sugar3.graphics.toolbarbox import ToolbarBox -+from sugar3.graphics.colorbutton import ColorToolButton -+from sugar3.graphics.radiotoolbutton import RadioToolButton -+from sugar3.graphics.toggletoolbutton import ToggleToolButton -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+test.pack_start(box, True, True, 0) -+box.show() -+ -+toolbar_box = ToolbarBox() -+box.pack_start(toolbar_box, False, False, 0) -+toolbar_box.show() -+ -+radial_button = RadioToolButton(icon_name='view-radial') -+toolbar_box.toolbar.insert(radial_button, -1) -+radial_button.show() -+ -+list_button = RadioToolButton(icon_name='view-list') -+list_button.props.group = radial_button -+toolbar_box.toolbar.insert(list_button, -1) -+list_button.show() -+ -+separator = Gtk.SeparatorToolItem() -+toolbar_box.toolbar.insert(separator, -1) -+separator.show() -+ -+color_button = ColorToolButton() -+toolbar_box.toolbar.insert(color_button, -1) -+color_button.show() -+ -+favorite_button = ToggleToolButton('emblem-favorite') -+favorite_button.set_tooltip('Favorite') -+toolbar_box.toolbar.insert(favorite_button, -1) -+favorite_button.show() -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/examples/tray.py a/examples/tray.py -new file mode 100644 -index 0000000..b336a92 ---- /dev/null -+++ a/examples/tray.py -@@ -0,0 +1,82 @@ -+# Copyright (C) 2007, Red Hat, Inc. -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+""" -+Test the sugar3.graphics.icon.Icon widget. -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics.tray import HTray, VTray -+from sugar3.graphics.tray import TrayButton, TrayIcon -+ -+import common -+ -+test = common.Test() -+ -+vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) -+ -+tray = HTray() -+vbox.pack_start(tray, False, False, 0) -+tray.show() -+ -+theme_icons = Gtk.IconTheme.get_default().list_icons(context=None) -+ -+for i in range(0, 100): -+ button = TrayButton(icon_name=theme_icons[i]) -+ tray.add_item(button) -+ button.show() -+ -+tray = HTray() -+vbox.pack_start(tray, False, False, 0) -+tray.show() -+ -+for i in range(0, 10): -+ icon = TrayIcon(icon_name=theme_icons[i]) -+ tray.add_item(icon) -+ icon.show() -+ -+hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL) -+ -+tray = VTray() -+hbox.pack_start(tray, False, False, 0) -+tray.show() -+ -+for i in range(0, 100): -+ button = TrayButton(icon_name=theme_icons[i]) -+ tray.add_item(button) -+ button.show() -+ -+tray = VTray() -+hbox.pack_start(tray, False, False, 0) -+tray.show() -+ -+for i in range(0, 4): -+ button = TrayButton(icon_name=theme_icons[i]) -+ tray.add_item(button) -+ button.show() -+ -+vbox.pack_start(hbox, True, True, 0) -+hbox.show() -+ -+test.pack_start(vbox, True, True, 0) -+vbox.show() -+ -+test.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/m4/.gitignore a/m4/.gitignore -new file mode 100644 -index 0000000..e08c7c8 ---- /dev/null -+++ a/m4/.gitignore -@@ -0,0 +1,3 @@ -+intltool.m4 -+libtool.m4 -+lt*.m4 -diff --git b/m4/python.m4 a/m4/python.m4 -new file mode 100644 -index 0000000..e1c5266 ---- /dev/null -+++ a/m4/python.m4 -@@ -0,0 +1,62 @@ -+## this one is commonly used with AM_PATH_PYTHONDIR ... -+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -+dnl Check if a module containing a given symbol is visible to python. -+AC_DEFUN([AM_CHECK_PYMOD], -+[AC_REQUIRE([AM_PATH_PYTHON]) -+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -+ifelse([$2],[], [prog=" -+import sys -+try: -+ import $1 -+except ImportError: -+ sys.exit(1) -+except: -+ sys.exit(0) -+sys.exit(0)"], [prog=" -+import $1 -+$1.$2"]) -+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC -+ then -+ eval "py_cv_mod_$py_mod_var=yes" -+ else -+ eval "py_cv_mod_$py_mod_var=no" -+ fi -+]) -+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -+if test "x$py_val" != xno; then -+ AC_MSG_RESULT(yes) -+ ifelse([$3], [],, [$3 -+])dnl -+else -+ AC_MSG_RESULT(no) -+ ifelse([$4], [],, [$4 -+])dnl -+fi -+]) -+ -+dnl a macro to check for ability to create python extensions -+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -+dnl function also defines PYTHON_INCLUDES -+AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -+[AC_REQUIRE([AM_PATH_PYTHON]) -+AC_MSG_CHECKING(for headers required to compile python extensions) -+dnl deduce PYTHON_INCLUDES -+py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -+if test "$py_prefix" != "$py_exec_prefix"; then -+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+fi -+AC_SUBST(PYTHON_INCLUDES) -+dnl check if the headers exist: -+save_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -+AC_TRY_CPP([#include ],dnl -+[AC_MSG_RESULT(found) -+$1],dnl -+[AC_MSG_RESULT(not found) -+$2]) -+CPPFLAGS="$save_CPPFLAGS" -+]) -diff --git b/make-doc.sh a/make-doc.sh -new file mode 100755 -index 0000000..d8721d9 ---- /dev/null -+++ a/make-doc.sh -@@ -0,0 +1,4 @@ -+#!/bin/sh -+ -+sphinx-apidoc --force --separate --output-dir=doc src -+make -C doc html -diff --git b/po/.gitignore a/po/.gitignore -new file mode 100644 -index 0000000..da9bbde ---- /dev/null -+++ a/po/.gitignore -@@ -0,0 +1,4 @@ -+*.gmo -+Makefile.in.in -+POTFILES -+stamp-it -diff --git b/po/ast.po a/po/ast.po -new file mode 100644 -index 0000000..983872f ---- /dev/null -+++ a/po/ast.po -@@ -0,0 +1,559 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2017-10-16 18:58+1100\n" -+"PO-Revision-Date: 2016-10-05 03:47+0000\n" -+"Last-Translator: Chris \n" -+"Language-Team: LANGUAGE \n" -+"Language: ast\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Pootle 2.5.1.1\n" -+"X-POOTLE-MTIME: 1475639246.000000\n" -+ -+#: ../src/sugar3/activity/activity.py:416 src/sugar3/activity/activity.py:467 -+#, python-format -+msgid "%s Activity" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:967 src/sugar3/activity/activity.py:1127 -+msgid "Keep error" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:968 src/sugar3/activity/activity.py:1128 -+msgid "Keep error: all changes will be lost" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:971 src/sugar3/activity/activity.py:1131 -+msgid "Don't stop" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:975 src/sugar3/activity/activity.py:1135 -+msgid "Stop anyway" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:86 src/sugar3/activity/activity.py:1169 -+#: src/sugar3/activity/widgets.py:86 -+msgid "Stop" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:98 src/sugar3/activity/widgets.py:99 -+msgid "Undo" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:106 src/sugar3/activity/widgets.py:107 -+msgid "Redo" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:113 src/sugar3/activity/widgets.py:114 -+msgid "Copy" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:121 src/sugar3/activity/widgets.py:122 -+msgid "Paste" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:132 src/sugar3/activity/widgets.py:133 -+msgid "Private" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:139 src/sugar3/activity/widgets.py:140 -+msgid "My Neighborhood" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:233 src/sugar3/activity/widgets.py:234 -+msgid "Description" -+msgstr "" -+ -+#: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429 -+#: src/sugar3/activity/activity.py:1189 src/sugar3/graphics/alert.py:301 -+#: src/sugar3/graphics/alert.py:467 -+msgid "Cancel" -+msgstr "" -+ -+#: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337 -+#: ../src/sugar3/graphics/alert.py:479 src/sugar3/graphics/alert.py:305 -+#: src/sugar3/graphics/alert.py:346 src/sugar3/graphics/alert.py:393 -+#: src/sugar3/graphics/alert.py:512 -+msgid "Ok" -+msgstr "" -+ -+#: ../src/sugar3/graphics/alert.py:434 src/sugar3/graphics/alert.py:464 -+msgid "Continue" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:54 -+#: src/sugar3/graphics/colorbutton.py:55 -+msgid "Choose a color" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:279 -+#: src/sugar3/graphics/colorbutton.py:300 -+msgid "Red" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:281 -+#: src/sugar3/graphics/colorbutton.py:302 -+#, fuzzy -+msgid "Green" -+msgstr "griegu" -+ -+#: ../src/sugar3/graphics/colorbutton.py:283 -+#: src/sugar3/graphics/colorbutton.py:304 -+msgid "Blue" -+msgstr "" -+ -+#: ../src/sugar3/util.py:217 src/sugar3/util.py:217 -+msgid " and " -+msgstr "" -+ -+#: ../src/sugar3/util.py:218 src/sugar3/util.py:218 -+msgid ", " -+msgstr "" -+ -+#. TRANS: Indicating something that just happened, eg. "just now", "moments ago" -+#: ../src/sugar3/util.py:221 src/sugar3/util.py:221 -+msgid "Seconds ago" -+msgstr "" -+ -+#. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago", -+#. "[2 minutes] in the past", or "[3 years, 1 month] earlier" -+#: ../src/sugar3/util.py:225 src/sugar3/util.py:225 -+#, python-format -+msgid "%s ago" -+msgstr "" -+ -+#. TRANS: Relative dates (eg. 1 month and 5 days). -+#: ../src/sugar3/util.py:240 src/sugar3/util.py:240 -+#, python-format -+msgid "%d year" -+msgid_plural "%d years" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:241 src/sugar3/util.py:241 -+#, python-format -+msgid "%d month" -+msgid_plural "%d months" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:242 src/sugar3/util.py:242 -+#, python-format -+msgid "%d week" -+msgid_plural "%d weeks" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:243 src/sugar3/util.py:243 -+#, python-format -+msgid "%d day" -+msgid_plural "%d days" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:244 src/sugar3/util.py:244 -+#, python-format -+msgid "%d hour" -+msgid_plural "%d hours" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:245 src/sugar3/util.py:245 -+#, python-format -+msgid "%d minute" -+msgid_plural "%d minutes" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:346 src/sugar3/util.py:346 -+msgid "Empty" -+msgstr "" -+ -+#: ../src/sugar3/util.py:348 src/sugar3/util.py:348 -+#, python-format -+msgid "%d B" -+msgstr "" -+ -+#: ../src/sugar3/util.py:350 src/sugar3/util.py:350 -+#, python-format -+msgid "%d KB" -+msgstr "" -+ -+#: ../src/sugar3/util.py:352 src/sugar3/util.py:352 -+#, python-format -+msgid "%d MB" -+msgstr "" -+ -+#: ../src/sugar3/util.py:354 src/sugar3/util.py:354 -+#, python-format -+msgid "%d GB" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:56 src/sugar3/mime.py:59 -+msgid "Text" -+msgstr "Testu" -+ -+#: ../src/sugar3/mime.py:63 src/sugar3/mime.py:66 -+msgid "Image" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:68 src/sugar3/mime.py:71 -+msgid "Audio" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:75 src/sugar3/mime.py:78 -+msgid "Video" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:86 src/sugar3/mime.py:89 -+msgid "Link" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:91 src/sugar3/mime.py:94 -+msgid "Bundle" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:48 src/sugar3/speech.py:56 -+msgid "Afrikaans" -+msgstr "afrikaans" -+ -+#: ../src/sugar3/speech.py:49 src/sugar3/speech.py:58 -+msgid "Aragonese" -+msgstr "aragonés" -+ -+#: ../src/sugar3/speech.py:50 src/sugar3/speech.py:60 -+msgid "Bulgarian" -+msgstr "búlgaru" -+ -+#: ../src/sugar3/speech.py:51 src/sugar3/speech.py:62 -+msgid "Bosnian" -+msgstr "bosniu" -+ -+#: ../src/sugar3/speech.py:52 src/sugar3/speech.py:64 -+msgid "Catalan" -+msgstr "catalán" -+ -+#: ../src/sugar3/speech.py:53 src/sugar3/speech.py:66 -+msgid "Czech" -+msgstr "checu" -+ -+#: ../src/sugar3/speech.py:54 src/sugar3/speech.py:68 -+msgid "Welsh" -+msgstr "galés" -+ -+#: ../src/sugar3/speech.py:55 src/sugar3/speech.py:70 -+msgid "Danish" -+msgstr "danés" -+ -+#: ../src/sugar3/speech.py:56 src/sugar3/speech.py:72 -+msgid "German" -+msgstr "alemán" -+ -+#: ../src/sugar3/speech.py:57 src/sugar3/speech.py:74 -+msgid "Greek" -+msgstr "griegu" -+ -+#: ../src/sugar3/speech.py:58 -+msgid "Default" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:59 src/sugar3/speech.py:77 -+msgid "English Britain" -+msgstr "inglés de Gran Bretaña" -+ -+#: ../src/sugar3/speech.py:60 src/sugar3/speech.py:79 -+#, fuzzy -+msgid "English scottish" -+msgstr "inglés" -+ -+#: ../src/sugar3/speech.py:61 src/sugar3/speech.py:80 -+#, fuzzy -+msgid "English-north" -+msgstr "inglés" -+ -+#: ../src/sugar3/speech.py:62 src/sugar3/speech.py:82 -+msgid "English_rp" -+msgstr "inglés" -+ -+#: ../src/sugar3/speech.py:63 src/sugar3/speech.py:84 -+#, fuzzy -+msgid "English_wmids" -+msgstr "inglés" -+ -+#: ../src/sugar3/speech.py:64 src/sugar3/speech.py:86 -+msgid "English USA" -+msgstr "Inglés (EE.XX.)" -+ -+#: ../src/sugar3/speech.py:65 -+#, fuzzy -+msgid "English west indies" -+msgstr "inglés" -+ -+#: ../src/sugar3/speech.py:66 src/sugar3/speech.py:90 -+msgid "Esperanto" -+msgstr "esperanto" -+ -+#: ../src/sugar3/speech.py:67 src/sugar3/speech.py:92 -+msgid "Spanish" -+msgstr "español" -+ -+#: ../src/sugar3/speech.py:68 src/sugar3/speech.py:93 -+#, fuzzy -+msgid "Spanish latin american" -+msgstr "español" -+ -+#: ../src/sugar3/speech.py:69 src/sugar3/speech.py:95 -+msgid "Estonian" -+msgstr "estoniu" -+ -+#: ../src/sugar3/speech.py:70 src/sugar3/speech.py:97 -+msgid "Farsi" -+msgstr "persa" -+ -+#: ../src/sugar3/speech.py:71 src/sugar3/speech.py:99 -+msgid "Farsi-pinglish" -+msgstr "persa-inglés" -+ -+#: ../src/sugar3/speech.py:72 src/sugar3/speech.py:101 -+msgid "Finnish" -+msgstr "finlandés" -+ -+#: ../src/sugar3/speech.py:73 src/sugar3/speech.py:103 -+msgid "French belgium" -+msgstr "Francés (Bélxica)" -+ -+#: ../src/sugar3/speech.py:74 src/sugar3/speech.py:105 -+msgid "French" -+msgstr "francés" -+ -+#: ../src/sugar3/speech.py:75 src/sugar3/speech.py:107 -+msgid "Irish-gaeilge" -+msgstr "irlandés" -+ -+#: ../src/sugar3/speech.py:76 src/sugar3/speech.py:109 -+msgid "Greek-ancient" -+msgstr "Griegu, Antiguu" -+ -+#: ../src/sugar3/speech.py:77 src/sugar3/speech.py:111 -+msgid "Hindi" -+msgstr "hindi" -+ -+#: ../src/sugar3/speech.py:78 src/sugar3/speech.py:113 -+msgid "Croatian" -+msgstr "croata" -+ -+#: ../src/sugar3/speech.py:79 src/sugar3/speech.py:115 -+msgid "Hungarian" -+msgstr "húngaru" -+ -+#: ../src/sugar3/speech.py:80 src/sugar3/speech.py:117 -+msgid "Armenian" -+msgstr "armeniu" -+ -+#: ../src/sugar3/speech.py:81 src/sugar3/speech.py:119 -+#, fuzzy -+msgid "Armenian (west)" -+msgstr "armeniu" -+ -+#: ../src/sugar3/speech.py:82 src/sugar3/speech.py:121 -+msgid "Indonesian" -+msgstr "indonesiu" -+ -+#: ../src/sugar3/speech.py:83 src/sugar3/speech.py:123 -+msgid "Icelandic" -+msgstr "islandés" -+ -+#: ../src/sugar3/speech.py:84 src/sugar3/speech.py:125 -+msgid "Italian" -+msgstr "italianu" -+ -+#: ../src/sugar3/speech.py:85 src/sugar3/speech.py:127 -+msgid "Lojban" -+msgstr "lojban" -+ -+#: ../src/sugar3/speech.py:86 src/sugar3/speech.py:129 -+msgid "Georgian" -+msgstr "xeorxanu" -+ -+#: ../src/sugar3/speech.py:87 src/sugar3/speech.py:131 -+msgid "Kannada" -+msgstr "canarés" -+ -+#: ../src/sugar3/speech.py:88 src/sugar3/speech.py:133 -+msgid "Kurdish" -+msgstr "curdu" -+ -+#: ../src/sugar3/speech.py:89 src/sugar3/speech.py:135 -+msgid "Latin" -+msgstr "llatín" -+ -+#: ../src/sugar3/speech.py:90 src/sugar3/speech.py:137 -+msgid "Lithuanian" -+msgstr "lituanu" -+ -+#: ../src/sugar3/speech.py:91 src/sugar3/speech.py:139 -+msgid "Latvian" -+msgstr "letón" -+ -+#: ../src/sugar3/speech.py:92 src/sugar3/speech.py:141 -+msgid "Macedonian" -+msgstr "macedoniu" -+ -+#: ../src/sugar3/speech.py:93 src/sugar3/speech.py:143 -+msgid "Malayalam" -+msgstr "malayalam" -+ -+#: ../src/sugar3/speech.py:94 src/sugar3/speech.py:145 -+msgid "Malay" -+msgstr "malayu" -+ -+#: ../src/sugar3/speech.py:95 src/sugar3/speech.py:147 -+msgid "Nepali" -+msgstr "nepalés" -+ -+#: ../src/sugar3/speech.py:96 src/sugar3/speech.py:149 -+msgid "Dutch" -+msgstr "neerlandés" -+ -+#: ../src/sugar3/speech.py:97 src/sugar3/speech.py:151 -+msgid "Norwegian" -+msgstr "noruegu" -+ -+#: ../src/sugar3/speech.py:98 src/sugar3/speech.py:153 -+msgid "Punjabi" -+msgstr "punyabí" -+ -+#: ../src/sugar3/speech.py:99 src/sugar3/speech.py:155 -+msgid "Polish" -+msgstr "polacu" -+ -+#: ../src/sugar3/speech.py:100 src/sugar3/speech.py:157 -+msgid "Portuguese (Brazil)" -+msgstr "Portugués (Brasil)" -+ -+#: ../src/sugar3/speech.py:101 src/sugar3/speech.py:159 -+msgid "Portuguese (Portugal)" -+msgstr "Portugués (Portugal)" -+ -+#: ../src/sugar3/speech.py:102 src/sugar3/speech.py:161 -+msgid "Romanian" -+msgstr "rumanu" -+ -+#: ../src/sugar3/speech.py:103 src/sugar3/speech.py:163 -+msgid "Russian" -+msgstr "rusu" -+ -+#: ../src/sugar3/speech.py:104 src/sugar3/speech.py:165 -+msgid "Slovak" -+msgstr "eslovacu" -+ -+#: ../src/sugar3/speech.py:105 src/sugar3/speech.py:167 -+msgid "Albanian" -+msgstr "albanu" -+ -+#: ../src/sugar3/speech.py:106 src/sugar3/speech.py:169 -+msgid "Serbian" -+msgstr "serbiu" -+ -+#: ../src/sugar3/speech.py:107 src/sugar3/speech.py:171 -+msgid "Swedish" -+msgstr "suecu" -+ -+#: ../src/sugar3/speech.py:108 -+msgid "Swahili-test" -+msgstr "suaḥili" -+ -+#: ../src/sugar3/speech.py:109 src/sugar3/speech.py:175 -+msgid "Tamil" -+msgstr "tamil" -+ -+#: ../src/sugar3/speech.py:110 src/sugar3/speech.py:177 -+msgid "Turkish" -+msgstr "turcu" -+ -+#: ../src/sugar3/speech.py:111 src/sugar3/speech.py:179 -+msgid "Vietnam" -+msgstr "vietnamín" -+ -+#: ../src/sugar3/speech.py:112 src/sugar3/speech.py:180 -+msgid "Vietnam_hue" -+msgstr "vietnamín_hue" -+ -+#: ../src/sugar3/speech.py:113 src/sugar3/speech.py:181 -+msgid "Vietnam_sgn" -+msgstr "vietnamín_sgn" -+ -+#: ../src/sugar3/speech.py:114 src/sugar3/speech.py:183 -+#, fuzzy -+msgid "Mandarin" -+msgstr "chinu" -+ -+#: ../src/sugar3/speech.py:115 src/sugar3/speech.py:185 -+#, fuzzy -+msgid "Cantonese" -+msgstr "chinu" -+ -+#: src/sugar3/activity/activity.py:1170 -+msgid "Stop: name your journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1193 -+msgid "Cancel stop and continue the activity" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1230 -+msgid "Save new" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1231 -+msgid "Save a new journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1234 -+msgid "Save" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1235 -+msgid "Save into the old journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1241 -+msgid "Erase changes" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1242 -+msgid "Erase what you have done, and leave your old journal entry unchanged" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1245 -+msgid "Erase" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1246 -+msgid "Erase what you have done, and avoid making a journal entry" -+msgstr "" -+ -+#: src/sugar3/graphics/popwindow.py:179 -+msgid "Close" -+msgstr "" -+ -+#: src/sugar3/speech.py:75 -+msgid "English" -+msgstr "" -+ -+#: src/sugar3/speech.py:88 -+#, fuzzy -+msgid "English West Indies" -+msgstr "inglés" -+ -+#: src/sugar3/speech.py:173 -+msgid "Swahili" -+msgstr "" -diff --git b/po/nah.po a/po/nah.po -new file mode 100644 -index 0000000..17e8938 ---- /dev/null -+++ a/po/nah.po -@@ -0,0 +1,552 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2017-10-16 18:58+1100\n" -+"PO-Revision-Date: 2013-08-30 17:49+0200\n" -+"Last-Translator: Chris \n" -+"Language-Team: LANGUAGE \n" -+"Language: nah\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Pootle 2.0.5\n" -+ -+#: ../src/sugar3/activity/activity.py:416 src/sugar3/activity/activity.py:467 -+#, python-format -+#, python-format, fuzzy -+msgid "%s Activity" -+msgstr "tlen ti chiuas %s" -+ -+#: ../src/sugar3/activity/activity.py:967 src/sugar3/activity/activity.py:1127 -+#, fuzzy -+msgid "Keep error" -+msgstr "kuapolo" -+ -+#: ../src/sugar3/activity/activity.py:968 src/sugar3/activity/activity.py:1128 -+msgid "Keep error: all changes will be lost" -+msgstr "kuapolo kema ti ajukui katli ti chijki pulus" -+ -+#: ../src/sugar3/activity/activity.py:971 src/sugar3/activity/activity.py:1131 -+msgid "Don't stop" -+msgstr "inka moketsas" -+ -+#: ../src/sugar3/activity/activity.py:975 src/sugar3/activity/activity.py:1135 -+msgid "Stop anyway" -+msgstr "moketsas" -+ -+#: ../src/sugar3/activity/widgets.py:86 src/sugar3/activity/activity.py:1169 -+#: src/sugar3/activity/widgets.py:86 -+#, fuzzy -+msgid "Stop" -+msgstr "Moketsas" -+ -+#: ../src/sugar3/activity/widgets.py:98 src/sugar3/activity/widgets.py:99 -+msgid "Undo" -+msgstr "patik" -+ -+#: ../src/sugar3/activity/widgets.py:106 src/sugar3/activity/widgets.py:107 -+msgid "Redo" -+msgstr "ompawi" -+ -+#: ../src/sugar3/activity/widgets.py:113 src/sugar3/activity/widgets.py:114 -+msgid "Copy" -+msgstr "ixcopina" -+ -+#: ../src/sugar3/activity/widgets.py:121 src/sugar3/activity/widgets.py:122 -+msgid "Paste" -+msgstr "tlatskis" -+ -+#: ../src/sugar3/activity/widgets.py:132 src/sugar3/activity/widgets.py:133 -+msgid "Private" -+msgstr "san iyaya" -+ -+#: ../src/sugar3/activity/widgets.py:139 src/sugar3/activity/widgets.py:140 -+msgid "My Neighborhood" -+msgstr "nechicokalime" -+ -+#: ../src/sugar3/activity/widgets.py:233 src/sugar3/activity/widgets.py:234 -+msgid "Description" -+msgstr "tlaixkuilolli" -+ -+#: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429 -+#: src/sugar3/activity/activity.py:1189 src/sugar3/graphics/alert.py:301 -+#: src/sugar3/graphics/alert.py:467 -+#, fuzzy -+msgid "Cancel" -+msgstr "Tlamilti" -+ -+#: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337 -+#: ../src/sugar3/graphics/alert.py:479 src/sugar3/graphics/alert.py:305 -+#: src/sugar3/graphics/alert.py:346 src/sugar3/graphics/alert.py:393 -+#: src/sugar3/graphics/alert.py:512 -+msgid "Ok" -+msgstr "selis" -+ -+#: ../src/sugar3/graphics/alert.py:434 src/sugar3/graphics/alert.py:464 -+msgid "Continue" -+msgstr "mosentokilis" -+ -+#: ../src/sugar3/graphics/colorbutton.py:54 -+#: src/sugar3/graphics/colorbutton.py:55 -+msgid "Choose a color" -+msgstr "xitlapejoeni se tlapalli" -+ -+#: ../src/sugar3/graphics/colorbutton.py:279 -+#: src/sugar3/graphics/colorbutton.py:300 -+msgid "Red" -+msgstr "chichiltik" -+ -+#: ../src/sugar3/graphics/colorbutton.py:281 -+#: src/sugar3/graphics/colorbutton.py:302 -+msgid "Green" -+msgstr "xoxowik" -+ -+#: ../src/sugar3/graphics/colorbutton.py:283 -+#: src/sugar3/graphics/colorbutton.py:304 -+msgid "Blue" -+msgstr "axoxoltik" -+ -+#: ../src/sugar3/util.py:217 src/sugar3/util.py:217 -+msgid " and " -+msgstr " wan " -+ -+#: ../src/sugar3/util.py:218 src/sugar3/util.py:218 -+msgid ", " -+msgstr ", " -+ -+#. TRANS: Indicating something that just happened, eg. "just now", "moments ago" -+#: ../src/sugar3/util.py:221 src/sugar3/util.py:221 -+msgid "Seconds ago" -+msgstr "omekawiltsitsi ikatlaika" -+ -+#. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago", -+#. "[2 minutes] in the past", or "[3 years, 1 month] earlier" -+#: ../src/sugar3/util.py:225 src/sugar3/util.py:225 -+#, python-format -+msgid "%s ago" -+msgstr "%s katlaika" -+ -+#. TRANS: Relative dates (eg. 1 month and 5 days). -+#: ../src/sugar3/util.py:240 src/sugar3/util.py:240 -+#, python-format -+msgid "%d year" -+msgid_plural "%d years" -+msgstr[0] "%d xiwitl" -+msgstr[1] "%d xiwimej" -+ -+#: ../src/sugar3/util.py:241 src/sugar3/util.py:241 -+#, python-format -+msgid "%d month" -+msgid_plural "%d months" -+msgstr[0] "%d meestli" -+msgstr[1] "%d meestlimej" -+ -+#: ../src/sugar3/util.py:242 src/sugar3/util.py:242 -+#, python-format -+msgid "%d week" -+msgid_plural "%d weeks" -+msgstr[0] "%d chikontonal" -+msgstr[1] "%d chikontonalmej" -+ -+#: ../src/sugar3/util.py:243 src/sugar3/util.py:243 -+#, python-format -+msgid "%d day" -+msgid_plural "%d days" -+msgstr[0] "%d tonal" -+msgstr[1] "%d tonalmej" -+ -+#: ../src/sugar3/util.py:244 src/sugar3/util.py:244 -+#, python-format -+msgid "%d hour" -+msgid_plural "%d hours" -+msgstr[0] "%d kawitl" -+msgstr[1] "%d kawitlmej" -+ -+#: ../src/sugar3/util.py:245 src/sugar3/util.py:245 -+#, python-format -+msgid "%d minute" -+msgid_plural "%d minutes" -+msgstr[0] "%d kawiltsi" -+msgstr[1] "%d kawilmej" -+ -+#: ../src/sugar3/util.py:346 src/sugar3/util.py:346 -+msgid "Empty" -+msgstr "kaktok" -+ -+#: ../src/sugar3/util.py:348 src/sugar3/util.py:348 -+#, python-format -+msgid "%d B" -+msgstr "%d B" -+ -+#: ../src/sugar3/util.py:350 src/sugar3/util.py:350 -+#, python-format -+msgid "%d KB" -+msgstr "%de KB" -+ -+#: ../src/sugar3/util.py:352 src/sugar3/util.py:352 -+#, python-format -+msgid "%d MB" -+msgstr "%d MB" -+ -+#: ../src/sugar3/util.py:354 src/sugar3/util.py:354 -+#, python-format -+msgid "%d GB" -+msgstr "%d GB" -+ -+#: ../src/sugar3/mime.py:56 src/sugar3/mime.py:59 -+msgid "Text" -+msgstr "tlakuilolpa" -+ -+#: ../src/sugar3/mime.py:63 src/sugar3/mime.py:66 -+msgid "Image" -+msgstr "ixnextli" -+ -+#: ../src/sugar3/mime.py:68 src/sugar3/mime.py:71 -+msgid "Audio" -+msgstr "kakiilistli" -+ -+#: ../src/sugar3/mime.py:75 src/sugar3/mime.py:78 -+msgid "Video" -+msgstr "ixnextilli" -+ -+#: ../src/sugar3/mime.py:86 src/sugar3/mime.py:89 -+msgid "Link" -+msgstr "saloli" -+ -+#: ../src/sugar3/mime.py:91 src/sugar3/mime.py:94 -+msgid "Bundle" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:48 src/sugar3/speech.py:56 -+msgid "Afrikaans" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:49 src/sugar3/speech.py:58 -+msgid "Aragonese" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:50 src/sugar3/speech.py:60 -+msgid "Bulgarian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:51 src/sugar3/speech.py:62 -+msgid "Bosnian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:52 src/sugar3/speech.py:64 -+msgid "Catalan" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:53 src/sugar3/speech.py:66 -+msgid "Czech" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:54 src/sugar3/speech.py:68 -+msgid "Welsh" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:55 src/sugar3/speech.py:70 -+msgid "Danish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:56 src/sugar3/speech.py:72 -+msgid "German" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:57 src/sugar3/speech.py:74 -+msgid "Greek" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:58 -+msgid "Default" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:59 src/sugar3/speech.py:77 -+msgid "English Britain" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:60 src/sugar3/speech.py:79 -+msgid "English scottish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:61 src/sugar3/speech.py:80 -+msgid "English-north" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:62 src/sugar3/speech.py:82 -+msgid "English_rp" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:63 src/sugar3/speech.py:84 -+msgid "English_wmids" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:64 src/sugar3/speech.py:86 -+msgid "English USA" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:65 -+msgid "English west indies" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:66 src/sugar3/speech.py:90 -+msgid "Esperanto" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:67 src/sugar3/speech.py:92 -+msgid "Spanish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:68 src/sugar3/speech.py:93 -+msgid "Spanish latin american" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:69 src/sugar3/speech.py:95 -+msgid "Estonian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:70 src/sugar3/speech.py:97 -+msgid "Farsi" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:71 src/sugar3/speech.py:99 -+msgid "Farsi-pinglish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:72 src/sugar3/speech.py:101 -+msgid "Finnish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:73 src/sugar3/speech.py:103 -+msgid "French belgium" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:74 src/sugar3/speech.py:105 -+msgid "French" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:75 src/sugar3/speech.py:107 -+msgid "Irish-gaeilge" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:76 src/sugar3/speech.py:109 -+msgid "Greek-ancient" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:77 src/sugar3/speech.py:111 -+msgid "Hindi" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:78 src/sugar3/speech.py:113 -+msgid "Croatian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:79 src/sugar3/speech.py:115 -+msgid "Hungarian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:80 src/sugar3/speech.py:117 -+msgid "Armenian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:81 src/sugar3/speech.py:119 -+msgid "Armenian (west)" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:82 src/sugar3/speech.py:121 -+msgid "Indonesian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:83 src/sugar3/speech.py:123 -+msgid "Icelandic" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:84 src/sugar3/speech.py:125 -+msgid "Italian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:85 src/sugar3/speech.py:127 -+msgid "Lojban" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:86 src/sugar3/speech.py:129 -+msgid "Georgian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:87 src/sugar3/speech.py:131 -+msgid "Kannada" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:88 src/sugar3/speech.py:133 -+msgid "Kurdish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:89 src/sugar3/speech.py:135 -+msgid "Latin" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:90 src/sugar3/speech.py:137 -+msgid "Lithuanian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:91 src/sugar3/speech.py:139 -+msgid "Latvian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:92 src/sugar3/speech.py:141 -+msgid "Macedonian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:93 src/sugar3/speech.py:143 -+msgid "Malayalam" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:94 src/sugar3/speech.py:145 -+msgid "Malay" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:95 src/sugar3/speech.py:147 -+msgid "Nepali" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:96 src/sugar3/speech.py:149 -+msgid "Dutch" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:97 src/sugar3/speech.py:151 -+msgid "Norwegian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:98 src/sugar3/speech.py:153 -+msgid "Punjabi" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:99 src/sugar3/speech.py:155 -+msgid "Polish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:100 src/sugar3/speech.py:157 -+msgid "Portuguese (Brazil)" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:101 src/sugar3/speech.py:159 -+msgid "Portuguese (Portugal)" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:102 src/sugar3/speech.py:161 -+msgid "Romanian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:103 src/sugar3/speech.py:163 -+msgid "Russian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:104 src/sugar3/speech.py:165 -+msgid "Slovak" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:105 src/sugar3/speech.py:167 -+msgid "Albanian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:106 src/sugar3/speech.py:169 -+msgid "Serbian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:107 src/sugar3/speech.py:171 -+msgid "Swedish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:108 -+msgid "Swahili-test" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:109 src/sugar3/speech.py:175 -+msgid "Tamil" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:110 src/sugar3/speech.py:177 -+msgid "Turkish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:111 src/sugar3/speech.py:179 -+msgid "Vietnam" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:112 src/sugar3/speech.py:180 -+msgid "Vietnam_hue" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:113 src/sugar3/speech.py:181 -+msgid "Vietnam_sgn" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:114 src/sugar3/speech.py:183 -+msgid "Mandarin" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:115 src/sugar3/speech.py:185 -+msgid "Cantonese" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1170 -+msgid "Stop: name your journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1193 -+msgid "Cancel stop and continue the activity" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1230 -+msgid "Save new" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1231 -+msgid "Save a new journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1234 -+msgid "Save" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1235 -+msgid "Save into the old journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1241 -+msgid "Erase changes" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1242 -+msgid "Erase what you have done, and leave your old journal entry unchanged" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1245 -+msgid "Erase" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1246 -+msgid "Erase what you have done, and avoid making a journal entry" -+msgstr "" -+ -+#: src/sugar3/graphics/popwindow.py:179 -+msgid "Close" -+msgstr "" -+ -+#: src/sugar3/speech.py:75 -+msgid "English" -+msgstr "" -+ -+#: src/sugar3/speech.py:88 -+msgid "English West Indies" -+msgstr "" -+ -+#: src/sugar3/speech.py:173 -+msgid "Swahili" -+msgstr "" -diff --git b/po/sugar-toolkit-gtk3.pot a/po/sugar-toolkit-gtk3.pot -new file mode 100644 -index 0000000..adfc7a5 ---- /dev/null -+++ a/po/sugar-toolkit-gtk3.pot -@@ -0,0 +1,569 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2019-03-13 14:50+1100\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"Language: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -+ -+#: ../src/sugar3/activity/activity.py:416 src/sugar3/activity/activity.py:467 -+#: src/sugar3/activity/activity.py:475 -+#, python-format -+msgid "%s Activity" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:967 src/sugar3/activity/activity.py:1127 -+#: src/sugar3/activity/activity.py:1122 -+msgid "Keep error" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:968 src/sugar3/activity/activity.py:1128 -+#: src/sugar3/activity/activity.py:1123 -+msgid "Keep error: all changes will be lost" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:971 src/sugar3/activity/activity.py:1131 -+#: src/sugar3/activity/activity.py:1126 -+msgid "Don't stop" -+msgstr "" -+ -+#: ../src/sugar3/activity/activity.py:975 src/sugar3/activity/activity.py:1135 -+#: src/sugar3/activity/activity.py:1130 -+msgid "Stop anyway" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:86 src/sugar3/activity/activity.py:1169 -+#: src/sugar3/activity/widgets.py:86 src/sugar3/activity/activity.py:1164 -+#: src/sugar3/activity/widgets.py:88 -+msgid "Stop" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:98 src/sugar3/activity/widgets.py:99 -+#: src/sugar3/activity/widgets.py:101 -+msgid "Undo" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:106 src/sugar3/activity/widgets.py:107 -+#: src/sugar3/activity/widgets.py:109 -+msgid "Redo" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:113 src/sugar3/activity/widgets.py:114 -+#: src/sugar3/activity/widgets.py:116 -+msgid "Copy" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:121 src/sugar3/activity/widgets.py:122 -+#: src/sugar3/activity/widgets.py:124 -+msgid "Paste" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:132 src/sugar3/activity/widgets.py:133 -+#: src/sugar3/activity/widgets.py:135 -+msgid "Private" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:139 src/sugar3/activity/widgets.py:140 -+#: src/sugar3/activity/widgets.py:142 -+msgid "My Neighborhood" -+msgstr "" -+ -+#: ../src/sugar3/activity/widgets.py:233 src/sugar3/activity/widgets.py:234 -+#: src/sugar3/activity/widgets.py:249 -+msgid "Description" -+msgstr "" -+ -+#: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429 -+#: src/sugar3/activity/activity.py:1189 src/sugar3/graphics/alert.py:301 -+#: src/sugar3/graphics/alert.py:467 src/sugar3/activity/activity.py:1184 -+#: src/sugar3/graphics/alert.py:308 src/sugar3/graphics/alert.py:476 -+msgid "Cancel" -+msgstr "" -+ -+#: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337 -+#: ../src/sugar3/graphics/alert.py:479 src/sugar3/graphics/alert.py:305 -+#: src/sugar3/graphics/alert.py:346 src/sugar3/graphics/alert.py:393 -+#: src/sugar3/graphics/alert.py:512 src/sugar3/graphics/alert.py:312 -+#: src/sugar3/graphics/alert.py:353 src/sugar3/graphics/alert.py:402 -+#: src/sugar3/graphics/alert.py:521 -+msgid "Ok" -+msgstr "" -+ -+#: ../src/sugar3/graphics/alert.py:434 src/sugar3/graphics/alert.py:464 -+#: src/sugar3/graphics/alert.py:473 -+msgid "Continue" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:54 -+#: src/sugar3/graphics/colorbutton.py:55 src/sugar3/graphics/colorbutton.py:60 -+msgid "Choose a color" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:279 -+#: src/sugar3/graphics/colorbutton.py:300 -+#: src/sugar3/graphics/colorbutton.py:305 -+msgid "Red" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:281 -+#: src/sugar3/graphics/colorbutton.py:302 -+#: src/sugar3/graphics/colorbutton.py:307 -+msgid "Green" -+msgstr "" -+ -+#: ../src/sugar3/graphics/colorbutton.py:283 -+#: src/sugar3/graphics/colorbutton.py:304 -+#: src/sugar3/graphics/colorbutton.py:309 -+msgid "Blue" -+msgstr "" -+ -+#: ../src/sugar3/util.py:217 src/sugar3/util.py:217 src/sugar3/util.py:224 -+msgid " and " -+msgstr "" -+ -+#: ../src/sugar3/util.py:218 src/sugar3/util.py:218 src/sugar3/util.py:225 -+msgid ", " -+msgstr "" -+ -+#. TRANS: Indicating something that just happened, eg. "just now", "moments ago" -+#: ../src/sugar3/util.py:221 src/sugar3/util.py:221 src/sugar3/util.py:228 -+msgid "Seconds ago" -+msgstr "" -+ -+#. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago", -+#. "[2 minutes] in the past", or "[3 years, 1 month] earlier" -+#: ../src/sugar3/util.py:225 src/sugar3/util.py:225 src/sugar3/util.py:232 -+#, python-format -+msgid "%s ago" -+msgstr "" -+ -+#. TRANS: Relative dates (eg. 1 month and 5 days). -+#: ../src/sugar3/util.py:240 src/sugar3/util.py:240 src/sugar3/util.py:247 -+#, python-format -+msgid "%d year" -+msgid_plural "%d years" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:241 src/sugar3/util.py:241 src/sugar3/util.py:248 -+#, python-format -+msgid "%d month" -+msgid_plural "%d months" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:242 src/sugar3/util.py:242 src/sugar3/util.py:249 -+#, python-format -+msgid "%d week" -+msgid_plural "%d weeks" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:243 src/sugar3/util.py:243 src/sugar3/util.py:250 -+#, python-format -+msgid "%d day" -+msgid_plural "%d days" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:244 src/sugar3/util.py:244 src/sugar3/util.py:251 -+#, python-format -+msgid "%d hour" -+msgid_plural "%d hours" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:245 src/sugar3/util.py:245 src/sugar3/util.py:252 -+#, python-format -+msgid "%d minute" -+msgid_plural "%d minutes" -+msgstr[0] "" -+msgstr[1] "" -+ -+#: ../src/sugar3/util.py:346 src/sugar3/util.py:346 src/sugar3/util.py:354 -+msgid "Empty" -+msgstr "" -+ -+#: ../src/sugar3/util.py:348 src/sugar3/util.py:348 src/sugar3/util.py:356 -+#, python-format -+msgid "%d B" -+msgstr "" -+ -+#: ../src/sugar3/util.py:350 src/sugar3/util.py:350 src/sugar3/util.py:358 -+#, python-format -+msgid "%d KB" -+msgstr "" -+ -+#: ../src/sugar3/util.py:352 src/sugar3/util.py:352 src/sugar3/util.py:360 -+#, python-format -+msgid "%d MB" -+msgstr "" -+ -+#: ../src/sugar3/util.py:354 src/sugar3/util.py:354 src/sugar3/util.py:362 -+#, python-format -+msgid "%d GB" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:56 src/sugar3/mime.py:59 src/sugar3/mime.py:61 -+msgid "Text" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:63 src/sugar3/mime.py:66 src/sugar3/mime.py:68 -+msgid "Image" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:68 src/sugar3/mime.py:71 src/sugar3/mime.py:73 -+msgid "Audio" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:75 src/sugar3/mime.py:78 src/sugar3/mime.py:80 -+msgid "Video" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:86 src/sugar3/mime.py:89 src/sugar3/mime.py:91 -+msgid "Link" -+msgstr "" -+ -+#: ../src/sugar3/mime.py:91 src/sugar3/mime.py:94 src/sugar3/mime.py:96 -+msgid "Bundle" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:48 src/sugar3/speech.py:56 -+msgid "Afrikaans" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:49 src/sugar3/speech.py:58 -+msgid "Aragonese" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:50 src/sugar3/speech.py:60 -+msgid "Bulgarian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:51 src/sugar3/speech.py:62 -+msgid "Bosnian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:52 src/sugar3/speech.py:64 -+msgid "Catalan" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:53 src/sugar3/speech.py:66 -+msgid "Czech" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:54 src/sugar3/speech.py:68 -+msgid "Welsh" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:55 src/sugar3/speech.py:70 -+msgid "Danish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:56 src/sugar3/speech.py:72 -+msgid "German" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:57 src/sugar3/speech.py:74 -+msgid "Greek" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:58 -+msgid "Default" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:59 src/sugar3/speech.py:77 -+msgid "English Britain" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:60 src/sugar3/speech.py:79 -+msgid "English scottish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:61 src/sugar3/speech.py:80 -+msgid "English-north" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:62 src/sugar3/speech.py:82 -+msgid "English_rp" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:63 src/sugar3/speech.py:84 -+msgid "English_wmids" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:64 src/sugar3/speech.py:86 -+msgid "English USA" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:65 -+msgid "English west indies" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:66 src/sugar3/speech.py:90 -+msgid "Esperanto" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:67 src/sugar3/speech.py:92 -+msgid "Spanish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:68 src/sugar3/speech.py:93 -+msgid "Spanish latin american" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:69 src/sugar3/speech.py:95 -+msgid "Estonian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:70 src/sugar3/speech.py:97 -+msgid "Farsi" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:71 src/sugar3/speech.py:99 -+msgid "Farsi-pinglish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:72 src/sugar3/speech.py:101 -+msgid "Finnish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:73 src/sugar3/speech.py:103 -+msgid "French belgium" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:74 src/sugar3/speech.py:105 -+msgid "French" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:75 src/sugar3/speech.py:107 -+msgid "Irish-gaeilge" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:76 src/sugar3/speech.py:109 -+msgid "Greek-ancient" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:77 src/sugar3/speech.py:111 -+msgid "Hindi" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:78 src/sugar3/speech.py:113 -+msgid "Croatian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:79 src/sugar3/speech.py:115 -+msgid "Hungarian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:80 src/sugar3/speech.py:117 -+msgid "Armenian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:81 src/sugar3/speech.py:119 -+msgid "Armenian (west)" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:82 src/sugar3/speech.py:121 -+msgid "Indonesian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:83 src/sugar3/speech.py:123 -+msgid "Icelandic" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:84 src/sugar3/speech.py:125 -+msgid "Italian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:85 src/sugar3/speech.py:127 -+msgid "Lojban" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:86 src/sugar3/speech.py:129 -+msgid "Georgian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:87 src/sugar3/speech.py:131 -+msgid "Kannada" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:88 src/sugar3/speech.py:133 -+msgid "Kurdish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:89 src/sugar3/speech.py:135 -+msgid "Latin" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:90 src/sugar3/speech.py:137 -+msgid "Lithuanian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:91 src/sugar3/speech.py:139 -+msgid "Latvian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:92 src/sugar3/speech.py:141 -+msgid "Macedonian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:93 src/sugar3/speech.py:143 -+msgid "Malayalam" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:94 src/sugar3/speech.py:145 -+msgid "Malay" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:95 src/sugar3/speech.py:147 -+msgid "Nepali" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:96 src/sugar3/speech.py:149 -+msgid "Dutch" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:97 src/sugar3/speech.py:151 -+msgid "Norwegian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:98 src/sugar3/speech.py:153 -+msgid "Punjabi" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:99 src/sugar3/speech.py:155 -+msgid "Polish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:100 src/sugar3/speech.py:157 -+msgid "Portuguese (Brazil)" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:101 src/sugar3/speech.py:159 -+msgid "Portuguese (Portugal)" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:102 src/sugar3/speech.py:161 -+msgid "Romanian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:103 src/sugar3/speech.py:163 -+msgid "Russian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:104 src/sugar3/speech.py:165 -+msgid "Slovak" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:105 src/sugar3/speech.py:167 -+msgid "Albanian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:106 src/sugar3/speech.py:169 -+msgid "Serbian" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:107 src/sugar3/speech.py:171 -+msgid "Swedish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:108 -+msgid "Swahili-test" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:109 src/sugar3/speech.py:175 -+msgid "Tamil" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:110 src/sugar3/speech.py:177 -+msgid "Turkish" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:111 src/sugar3/speech.py:179 -+msgid "Vietnam" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:112 src/sugar3/speech.py:180 -+msgid "Vietnam_hue" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:113 src/sugar3/speech.py:181 -+msgid "Vietnam_sgn" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:114 src/sugar3/speech.py:183 -+msgid "Mandarin" -+msgstr "" -+ -+#: ../src/sugar3/speech.py:115 src/sugar3/speech.py:185 -+msgid "Cantonese" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1170 src/sugar3/activity/activity.py:1165 -+msgid "Stop: name your journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1193 src/sugar3/activity/activity.py:1188 -+msgid "Cancel stop and continue the activity" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1230 src/sugar3/activity/activity.py:1225 -+msgid "Save new" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1231 src/sugar3/activity/activity.py:1226 -+msgid "Save a new journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1234 src/sugar3/activity/activity.py:1229 -+msgid "Save" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1235 src/sugar3/activity/activity.py:1230 -+msgid "Save into the old journal entry" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1241 src/sugar3/activity/activity.py:1236 -+msgid "Erase changes" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1242 src/sugar3/activity/activity.py:1237 -+msgid "Erase what you have done, and leave your old journal entry unchanged" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1245 src/sugar3/activity/activity.py:1240 -+msgid "Erase" -+msgstr "" -+ -+#: src/sugar3/activity/activity.py:1246 src/sugar3/activity/activity.py:1241 -+msgid "Erase what you have done, and avoid making a journal entry" -+msgstr "" -+ -+#: src/sugar3/graphics/popwindow.py:179 -+msgid "Close" -+msgstr "" -+ -+#: src/sugar3/speech.py:75 -+msgid "English" -+msgstr "" -+ -+#: src/sugar3/speech.py:88 -+msgid "English West Indies" -+msgstr "" -+ -+#: src/sugar3/speech.py:173 -+msgid "Swahili" -+msgstr "" -diff --git b/src/sugar3/.gitignore a/src/sugar3/.gitignore -new file mode 100644 -index 0000000..de24e35 ---- /dev/null -+++ a/src/sugar3/.gitignore -@@ -0,0 +1,4 @@ -+sugar-marshal.c -+sugar-marshal.h -+_sugarext.c -+_sugarext.c -diff --git b/src/sugar3/.license a/src/sugar3/.license -new file mode 100644 -index 0000000..6989ebe ---- /dev/null -+++ a/src/sugar3/.license -@@ -0,0 +1 @@ -+LGPL -diff --git b/src/sugar3/activity/Makefile.am a/src/sugar3/activity/Makefile.am -index e3cf05b..1f7a433 100644 ---- b/src/sugar3/activity/Makefile.am -+++ a/src/sugar3/activity/Makefile.am -@@ -7,7 +7,6 @@ sugar_PYTHON = \ - activityhandle.py \ - activityservice.py \ - bundlebuilder.py \ -- webkit1.py \ - webactivity.py \ - i18n.py \ - widgets.py -diff --git b/src/sugar3/activity/activity.py a/src/sugar3/activity/activity.py -index a459d64..4f7c9a2 100644 ---- b/src/sugar3/activity/activity.py -+++ a/src/sugar3/activity/activity.py -@@ -854,7 +854,7 @@ class Activity(Window, Gtk.Container): - is seeing at the time. - - Returns: -- str: image data in PNG format -+ bytes: image data in PNG format - - Activities may override this method, and return a string with - image data in PNG format with a width and height of -diff --git b/src/sugar3/activity/bundlebuilder.py a/src/sugar3/activity/bundlebuilder.py -index 9fd3839..cc32d60 100644 ---- b/src/sugar3/activity/bundlebuilder.py -+++ a/src/sugar3/activity/bundlebuilder.py -@@ -42,7 +42,7 @@ import logging - from glob import glob - from fnmatch import fnmatch - from six.moves.configparser import ConfigParser --import xml.etree.cElementTree as ET -+import xml.etree.ElementTree as ET - from six.moves.html_parser import HTMLParser - - from sugar3 import env -@@ -629,9 +629,9 @@ def start(): - source_dir = os.path.abspath(os.path.dirname(sys.argv[0])) - config = Config(source_dir) - -- try: -- globals()['cmd_' + options.command](config, options) -- except (KeyError, IndexError): -+ if 'cmd_' + (options.command or '') in globals(): -+ globals()['cmd_' + (options.command or '')](config, options) -+ else: - parser.print_help() - - -diff --git b/src/sugar3/graphics/style.py a/src/sugar3/graphics/style.py -index 8dafd5b..4b34351 100644 ---- b/src/sugar3/graphics/style.py -+++ a/src/sugar3/graphics/style.py -@@ -155,7 +155,7 @@ def zoom(units): - Returns size of units pixels at current zoom level - - Args: -- units (int): size of item at full size -+ units (int or float): size of item at full size - ''' - return int(ZOOM_FACTOR * units) - -diff --git b/src/sugar3/presence/test_presence.txt a/src/sugar3/presence/test_presence.txt -new file mode 100644 -index 0000000..d0736a9 ---- /dev/null -+++ a/src/sugar3/presence/test_presence.txt -@@ -0,0 +1,26 @@ -+This is a test of presence. -+ -+To test this service we will start up a mock dbus library: -+ -+ >>> from sugar.testing import mockdbus -+ >>> import dbus -+ >>> pres_service = mockdbus.MockService( -+ ... 'org.laptop.Presence', '/org/laptop/Presence', name='pres') -+ >>> pres_service.install() -+ >>> pres_interface = dbus.Interface(pres_service, 'org.laptop.Presence') -+ -+Then we import the library (second, to make sure it connects to our -+mocked system, though the lazy instantiation in get_instance() should -+handle it): -+ -+ >>> from sugar.presence import PresenceService -+ >>> ps = PresenceService.get_instance() -+ >>> pres_interface.make_response('getServices', []) -+ >>> ps.get_services() -+ Called pres.org.laptop.Presence:getServices() -+ [] -+ >>> pres_interface.make_response('getBuddies', []) -+ >>> ps.get_buddies() -+ Called pres.org.laptop.Presence:getBuddies() -+ [] -+ -diff --git b/tests/data/mime.svg a/tests/data/mime.svg -new file mode 100644 -index 0000000..d4e6db3 ---- /dev/null -+++ a/tests/data/mime.svg -@@ -0,0 +1,3 @@ -+ -+ -+ -diff --git b/tests/data/sample.activity/activity.py a/tests/data/sample.activity/activity.py -new file mode 100644 -index 0000000..ea4e983 ---- /dev/null -+++ a/tests/data/sample.activity/activity.py -@@ -0,0 +1,9 @@ -+from gettext import gettext as _ -+ -+from sugar3.activity import activity -+ -+ -+class SampleActivity(activity.Activity): -+ def __init__(self, handle): -+ activity.Activity.__init__(self, handle) -+ self._text = _("Text string") -diff --git b/tests/data/sample.activity/activity/activity-sample.svg a/tests/data/sample.activity/activity/activity-sample.svg -new file mode 100644 -index 0000000..8da7c63 ---- /dev/null -+++ a/tests/data/sample.activity/activity/activity-sample.svg -@@ -0,0 +1,26 @@ -+ -+ -+]> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git b/tests/data/sample.activity/activity/activity.info a/tests/data/sample.activity/activity/activity.info -new file mode 100644 -index 0000000..820c07a ---- /dev/null -+++ a/tests/data/sample.activity/activity/activity.info -@@ -0,0 +1,7 @@ -+[Activity] -+name = Sample -+activity_version = 1 -+bundle_id = org.sugarlabs.Sample -+exec = sugar-activity3 activity.SampleActivity -+icon = activity-sample -+license = GPLv2+ -diff --git b/tests/data/sample.activity/po/Sample.pot a/tests/data/sample.activity/po/Sample.pot -new file mode 100644 -index 0000000..0cee357 ---- /dev/null -+++ a/tests/data/sample.activity/po/Sample.pot -@@ -0,0 +1,26 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2012-12-06 20:10+0100\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"Language: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: activity/activity.info:2 -+msgid "Sample" -+msgstr "" -+ -+#: activity.py:8 -+msgid "Text string" -+msgstr "" -diff --git b/tests/data/sample.activity/po/es.po a/tests/data/sample.activity/po/es.po -new file mode 100644 -index 0000000..a1a6adb ---- /dev/null -+++ a/tests/data/sample.activity/po/es.po -@@ -0,0 +1,26 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2012-12-06 20:10+0100\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"Language: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: activity/activity.info:2 -+msgid "Sample" -+msgstr "" -+ -+#: activity.py:8 -+msgid "Text string" -+msgstr "" -diff --git b/tests/data/sample.activity/setup.py a/tests/data/sample.activity/setup.py -new file mode 100755 -index 0000000..191204b ---- /dev/null -+++ a/tests/data/sample.activity/setup.py -@@ -0,0 +1,5 @@ -+#!/usr/bin/env python3 -+ -+from sugar3.activity import bundlebuilder -+ -+bundlebuilder.start() -diff --git b/tests/data/sample.content/index.html a/tests/data/sample.content/index.html -new file mode 100644 -index 0000000..e69de29 -diff --git b/tests/data/sample.content/library/library.info a/tests/data/sample.content/library/library.info -new file mode 100644 -index 0000000..fb372df ---- /dev/null -+++ a/tests/data/sample.content/library/library.info -@@ -0,0 +1,10 @@ -+[Library] -+name = sample -+long_name = sample -+global_name = org.sugarlabs.samplecontent -+library_version = 1 -+host_version = 1 -+l10n = false -+locale = en -+license = CC-BY 2.0 -+category = media -diff --git b/tests/graphics/cellrendererprogress.py a/tests/graphics/cellrendererprogress.py -new file mode 100644 -index 0000000..94c1b9a ---- /dev/null -+++ a/tests/graphics/cellrendererprogress.py -@@ -0,0 +1,46 @@ -+""" -+ -+http://developer.gnome.org/gtk3/stable/GtkCellRendererProgress.html -+ -+""" -+ -+from gi.repository import Gtk -+ -+from sugar3.graphics import style -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+model = Gtk.ListStore(str, int, int) -+for item in [('one', 72, -1), -+ ('two', 50, -1), -+ ('three', 35, -1), -+ ('four', 0, 5)]: -+ model.append(item) -+ -+treeview = Gtk.TreeView() -+treeview.set_model(model) -+treeview.set_headers_visible(False) -+test.pack_start(treeview, True, True, 0) -+treeview.show() -+ -+col = Gtk.TreeViewColumn() -+treeview.append_column(col) -+ -+cell_text = Gtk.CellRendererText() -+cell_text.props.height = style.GRID_CELL_SIZE -+col.pack_start(cell_text, expand=False) -+col.add_attribute(cell_text, 'text', 0) -+ -+cell_progress = Gtk.CellRendererProgress() -+cell_progress.props.ypad = style.GRID_CELL_SIZE / 4 -+col.pack_start(cell_progress, expand=True) -+col.add_attribute(cell_progress, 'value', 1) -+col.add_attribute(cell_progress, 'pulse', 2) -+ -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/tests/graphics/combobox.py a/tests/graphics/combobox.py -new file mode 100644 -index 0000000..0c329a0 ---- /dev/null -+++ a/tests/graphics/combobox.py -@@ -0,0 +1,24 @@ -+from gi.repository import Gtk -+ -+import common -+ -+ -+test = common.Test() -+test.show() -+ -+# test Gtk.ComboBox: -+ -+store = Gtk.ListStore(int, str) -+for i in range(100): -+ description = "combo test entry %d" % i -+ store.append([i, description]) -+ -+combobox = Gtk.ComboBox(model=store) -+cell = Gtk.CellRendererText() -+combobox.pack_start(cell, True) -+combobox.add_attribute(cell, 'text', 1) -+test.pack_start(combobox, True, True, 0) -+combobox.show() -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/tests/graphics/progressicon.py a/tests/graphics/progressicon.py -new file mode 100644 -index 0000000..b756d2f ---- /dev/null -+++ a/tests/graphics/progressicon.py -@@ -0,0 +1,66 @@ -+# Copyright (C) 2013, One Laptop Per Child -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2 of the License, or (at your option) any later version. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the -+# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+# Boston, MA 02111-1307, USA. -+ -+""" -+Test the sugar3.graphics.progressicon.ProgressIcon widget. -+""" -+ -+ -+from gi.repository import GLib -+ -+from sugar3.graphics.progressicon import ProgressIcon -+from sugar3.graphics import style -+ -+import common -+ -+test = common.Test() -+test.show() -+ -+icon = ProgressIcon( -+ pixel_size=style.LARGE_ICON_SIZE, -+ icon_name='computer-xo', -+ stroke_color=style.COLOR_BUTTON_GREY.get_svg(), -+ fill_color=style.COLOR_WHITE.get_svg()) -+test.pack_start(icon, True, True, 0) -+icon.show() -+ -+icon2 = ProgressIcon( -+ pixel_size=style.LARGE_ICON_SIZE, -+ icon_name='computer-xo', -+ stroke_color=style.COLOR_BUTTON_GREY.get_svg(), -+ fill_color=style.COLOR_WHITE.get_svg(), -+ direction='horizontal') -+test.pack_start(icon2, True, True, 0) -+icon2.show() -+ -+progress = 0 -+ -+ -+def timeout_cb(): -+ global progress -+ progress += 0.05 -+ icon.update(progress) -+ icon2.update(progress) -+ if progress >= 1: -+ return False -+ return True -+ -+ -+GLib.timeout_add(50, timeout_cb) -+ -+if __name__ == '__main__': -+ common.main(test) -diff --git b/tests/test_bundle.py a/tests/test_bundle.py -new file mode 100644 -index 0000000..9d343d2 ---- /dev/null -+++ a/tests/test_bundle.py -@@ -0,0 +1,49 @@ -+# Copyright (C) 2013, One Laptop per Child -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+import os -+import unittest -+import subprocess -+ -+from sugar3.bundle.helpers import bundle_from_dir, bundle_from_archive -+from sugar3.bundle.activitybundle import ActivityBundle -+from sugar3.bundle.contentbundle import ContentBundle -+ -+tests_dir = os.path.dirname(__file__) -+data_dir = os.path.join(tests_dir, "data") -+SAMPLE_ACTIVITY_PATH = os.path.join(data_dir, 'sample.activity') -+SAMPLE_CONTENT_PATH = os.path.join(data_dir, 'sample.content') -+ -+ -+class TestBundle(unittest.TestCase): -+ def test_bundle_from_dir(self): -+ bundle = bundle_from_dir(SAMPLE_ACTIVITY_PATH) -+ self.assertIsInstance(bundle, ActivityBundle) -+ bundle = bundle_from_dir(SAMPLE_CONTENT_PATH) -+ self.assertIsInstance(bundle, ContentBundle) -+ -+ def test_activity_bundle_from_archive(self): -+ os.chdir(SAMPLE_ACTIVITY_PATH) -+ subprocess.check_call(["./setup.py", "dist_xo"]) -+ xo_path = os.path.join(".", "dist", "Sample-1.xo") -+ bundle = bundle_from_archive(xo_path) -+ self.assertIsInstance(bundle, ActivityBundle) -+ -+ def test_content_bundle_from_archive(self): -+ os.chdir(data_dir) -+ subprocess.check_call(["zip", "-r", "sample-1.xol", "sample.content"]) -+ bundle = bundle_from_archive("./sample-1.xol") -+ self.assertIsInstance(bundle, ContentBundle) -diff --git b/tests/test_bundlebuilder.py a/tests/test_bundlebuilder.py -new file mode 100644 -index 0000000..bda1af6 ---- /dev/null -+++ a/tests/test_bundlebuilder.py -@@ -0,0 +1,245 @@ -+# Copyright (C) 2012, Daniel Narvaez -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+import os -+import unittest -+import shutil -+import subprocess -+import tempfile -+import tarfile -+import zipfile -+ -+tests_dir = os.path.dirname(__file__) -+data_dir = os.path.join(tests_dir, "data") -+ -+ -+class TestGit(unittest.TestCase): -+ _source_files = ["activity.py", -+ "setup.py", -+ "po/Sample.pot", -+ "po/es.po", -+ "activity/activity.info", -+ "activity/activity-sample.svg"] -+ -+ _activity_locale_files = ["locale/es/activity.linfo"] -+ -+ _share_locale_files = ["locale/es/LC_MESSAGES/org.sugarlabs.Sample.mo"] -+ -+ def _get_all_locale_files(self): -+ expected = self._share_locale_files[:] -+ expected.extend(self._activity_locale_files) -+ return expected -+ -+ def _create_repo(self): -+ cwd = os.getcwd() -+ path = tempfile.mkdtemp() -+ os.chdir(path) -+ -+ subprocess.check_call(["git", "init"]) -+ subprocess.check_call(["git", "config", "user.name", "Test Test"]) -+ subprocess.check_call(["git", "config", "user.email", "test@test.org"]) -+ -+ for source in self._source_files: -+ source_path = os.path.join(data_dir, "sample.activity", source) -+ dest_path = os.path.join(path, source) -+ -+ try: -+ os.makedirs(os.path.dirname(dest_path)) -+ except OSError: -+ pass -+ -+ shutil.copyfile(source_path, dest_path) -+ shutil.copymode(source_path, dest_path) -+ -+ subprocess.check_call(["git", "add", source]) -+ -+ subprocess.check_call(["git", "commit", "-m", "Initial commit", "-a"]) -+ -+ os.chdir(cwd) -+ -+ return path -+ -+ def _strip_root_dir(self, paths): -+ return [path[path.find("/") + 1:] for path in paths] -+ -+ def _test_dist_xo(self, source_path, build_path): -+ cwd = os.getcwd() -+ os.chdir(build_path) -+ -+ setup_path = os.path.join(source_path, "setup.py") -+ subprocess.call([setup_path, "dist_xo"]) -+ -+ xo_path = os.path.join(build_path, "dist", "Sample-1.xo") -+ filenames = zipfile.ZipFile(xo_path).namelist() -+ -+ stripped_filenames = self._strip_root_dir(filenames) -+ expected = self._source_files[:] -+ expected.extend(self._get_all_locale_files()) -+ self.assertItemsEqual(stripped_filenames, expected) -+ -+ os.chdir(cwd) -+ -+ def _test_dist_source(self, source_path, build_path): -+ cwd = os.getcwd() -+ os.chdir(build_path) -+ -+ setup_path = os.path.join(source_path, "setup.py") -+ subprocess.call([setup_path, "dist_source"]) -+ -+ xo_path = os.path.join(build_path, "dist", "Sample-1.tar.bz2") -+ filenames = tarfile.open(name=xo_path, mode="r:bz2").getnames() -+ -+ stripped_filenames = self._strip_root_dir(filenames) -+ self.assertItemsEqual(stripped_filenames, self._source_files) -+ -+ os.chdir(cwd) -+ -+ def _test_build(self, source_path, build_path): -+ cwd = os.getcwd() -+ os.chdir(build_path) -+ -+ setup_path = os.path.join(source_path, "setup.py") -+ subprocess.call([setup_path, "build"]) -+ -+ locale_path = os.path.join(build_path, "locale") -+ -+ filenames = [] -+ for root, dirs, files in os.walk(locale_path): -+ rel_root = root[len(build_path) + 1:] -+ filenames.extend([os.path.join(rel_root, name) for name in files]) -+ -+ self.assertItemsEqual(filenames, self._get_all_locale_files()) -+ -+ os.chdir(cwd) -+ -+ def _test_dev(self, source_path, build_path): -+ activities_path = tempfile.mkdtemp() -+ -+ cwd = os.getcwd() -+ os.chdir(build_path) -+ -+ os.environ["SUGAR_ACTIVITIES_PATH"] = activities_path -+ -+ setup_path = os.path.join(source_path, "setup.py") -+ subprocess.call([setup_path, "dev"]) -+ -+ activity_py_path = os.path.join(activities_path, "Sample.activity", -+ "activity.py") -+ self.assertTrue(os.path.exists(activity_py_path)) -+ -+ os.chdir(cwd) -+ -+ def _test_genpot(self, source_path, build_path): -+ cwd = os.getcwd() -+ os.chdir(build_path) -+ -+ pot_path = os.path.join(source_path, "po", "Sample.pot") -+ os.unlink(pot_path) -+ -+ setup_path = os.path.join(source_path, "setup.py") -+ subprocess.call([setup_path, "genpot"]) -+ -+ self.assertTrue(os.path.exists(pot_path)) -+ -+ os.chdir(cwd) -+ -+ def _test_install(self, source_path, build_path): -+ install_path = tempfile.mkdtemp() -+ -+ cwd = os.getcwd() -+ os.chdir(build_path) -+ -+ setup_path = os.path.join(source_path, "setup.py") -+ subprocess.call([setup_path, "install", "--prefix", install_path]) -+ -+ filenames = [] -+ activity_dir = os.path.join(install_path, "share", -+ "sugar", "activities", "Sample.activity") -+ for root, dirs, files in os.walk(activity_dir): -+ rel_root = root[len(activity_dir) + 1:] -+ filenames.extend([os.path.join(rel_root, name) for name in files]) -+ -+ expected = self._source_files[:] -+ expected.extend(self._activity_locale_files) -+ -+ self.assertItemsEqual(filenames, expected) -+ -+ filenames = [] -+ share_dir = os.path.join(install_path, "share") -+ locale_dir = os.path.join(share_dir, "locale") -+ for root, dirs, files in os.walk(locale_dir): -+ rel_root = root[len(share_dir) + 1:] -+ for name in files: -+ if "org.sugarlabs.Sample" in name: -+ filenames.append(os.path.join(rel_root, name)) -+ -+ self.assertItemsEqual(filenames, self._share_locale_files) -+ -+ os.chdir(cwd) -+ -+ def test_dist_xo_in_source(self): -+ repo_path = self._create_repo() -+ self._test_dist_xo(repo_path, repo_path) -+ -+ def test_dist_xo_out_of_source(self): -+ repo_path = self._create_repo() -+ build_path = tempfile.mkdtemp() -+ self._test_dist_xo(repo_path, build_path) -+ -+ def test_dist_source_in_source(self): -+ repo_path = self._create_repo() -+ self._test_dist_source(repo_path, repo_path) -+ -+ def test_dist_source_out_of_source(self): -+ repo_path = self._create_repo() -+ build_path = tempfile.mkdtemp() -+ self._test_dist_source(repo_path, build_path) -+ -+ def test_install_in_source(self): -+ repo_path = self._create_repo() -+ self._test_install(repo_path, repo_path) -+ -+ def test_install_out_of_source(self): -+ repo_path = self._create_repo() -+ build_path = tempfile.mkdtemp() -+ self._test_install(repo_path, build_path) -+ -+ def test_build_in_source(self): -+ repo_path = self._create_repo() -+ self._test_build(repo_path, repo_path) -+ -+ def test_build_out_of_source(self): -+ repo_path = self._create_repo() -+ build_path = tempfile.mkdtemp() -+ self._test_build(repo_path, build_path) -+ -+ def test_dev_in_source(self): -+ repo_path = self._create_repo() -+ self._test_dev(repo_path, repo_path) -+ -+ def test_dev_out_of_source(self): -+ repo_path = self._create_repo() -+ build_path = tempfile.mkdtemp() -+ self._test_dev(repo_path, build_path) -+ -+ def test_genpot_in_source(self): -+ repo_path = self._create_repo() -+ self._test_genpot(repo_path, repo_path) -+ -+ def test_genpot_out_of_source(self): -+ repo_path = self._create_repo() -+ build_path = tempfile.mkdtemp() -+ self._test_genpot(repo_path, build_path) -diff --git b/tests/test_mime.py a/tests/test_mime.py -new file mode 100644 -index 0000000..9e478de ---- /dev/null -+++ a/tests/test_mime.py -@@ -0,0 +1,109 @@ -+#!/usr/bin/env python3 -+ -+# Copyright (C) 2006, Red Hat, Inc. -+# Copyright (C) 2007, One Laptop Per Child -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+import os -+import unittest -+ -+from sugar3 import mime -+ -+tests_dir = os.path.dirname(__file__) -+data_dir = os.path.join(tests_dir, "data") -+ -+ -+class TestMime(unittest.TestCase): -+ def test_split_uri_list(self): -+ self.assertSequenceEqual(mime.split_uri_list("http://one\nhttp://two"), -+ ("http://one", "http://two")) -+ -+ def test_get_mime_parents(self): -+ self.assertListEqual(mime.get_mime_parents("image/svg+xml"), -+ ["application/xml"]) -+ -+ # If the mime type don't have parents, should return a empty array -+ self.assertListEqual(mime.get_mime_parents("application/octet-stream"), -+ []) -+ -+ def test_get_for_file(self): -+ self.assertEqual(mime.get_for_file(os.path.join(data_dir, "mime.svg")), -+ 'image/svg+xml') -+ -+ def test_from_file_name(self): -+ self.assertEqual(mime.get_from_file_name('test.pdf'), -+ 'application/pdf') -+ -+ def test_choose_most_significant(self): -+ # Mozilla's text in dnd -+ mime_type = mime.choose_most_significant( -+ ['text/plain', 'text/_moz_htmlcontext', 'text/unicode', -+ 'text/html', 'text/_moz_htmlinfo']) -+ self.assertEqual(mime_type, 'text/html') -+ -+ # Mozilla's text in c&v -+ mime_type = mime.choose_most_significant( -+ ['text/_moz_htmlcontext', -+ 'STRING', -+ 'text/html', -+ 'text/_moz_htmlinfo', -+ 'text/x-moz-url-priv', -+ 'UTF8_STRING', -+ 'COMPOUND_TEXT']) -+ self.assertEqual(mime_type, 'text/html') -+ -+ # Mozilla gif in dnd -+ mime_type = mime.choose_most_significant( -+ ['application/x-moz-file-promise-url', -+ 'application/x-moz-file-promise-dest-filename', -+ 'text/_moz_htmlinfo', 'text/x-moz-url-desc', -+ 'text/_moz_htmlcontext', 'text/x-moz-url-data', -+ 'text/uri-list']) -+ self.assertEqual(mime_type, 'text/uri-list') -+ -+ # Mozilla url in dnd -+ mime_type = mime.choose_most_significant( -+ ['text/_moz_htmlcontext', -+ 'text/html', -+ 'text/_moz_htmlinfo', -+ '_NETSCAPE_URL', -+ 'text/x-moz-url', -+ 'text/x-moz-url-desc', -+ 'text/x-moz-url-data', -+ 'text/plain', -+ 'text/unicode']) -+ self.assertEqual(mime_type, 'text/x-moz-url') -+ -+ # Abiword text in dnd -+ mime_type = mime.choose_most_significant( -+ ['text/rtf', 'text/uri-list']) -+ self.assertEqual(mime_type, 'text/uri-list') -+ -+ # Abiword text in c&v -+ mime_type = mime.choose_most_significant( -+ ['UTF8_STRING', 'STRING', 'text/html', 'TEXT', 'text/rtf', -+ 'COMPOUND_TEXT', 'application/rtf', 'text/plain', -+ 'application/xhtml+xml']) -+ self.assertEqual(mime_type, 'application/rtf') -+ -+ # Abiword text in c&v -+ mime_type = mime.choose_most_significant( -+ ['GTK_TEXT_BUFFER_CONTENTS', -+ 'application/x-gtk-text-buffer-rich-text', -+ 'UTF8_STRING', 'COMPOUND_TEXT', 'TEXT', 'STRING', -+ 'text/plain;charset=utf-8', 'text/plain;charset=UTF-8', -+ 'text/plain']) -+ self.assertEqual(mime_type, 'text/plain') -diff --git b/tests/test_uitree.py a/tests/test_uitree.py -new file mode 100644 -index 0000000..b7c7da4 ---- /dev/null -+++ a/tests/test_uitree.py -@@ -0,0 +1,54 @@ -+# Copyright (C) 2012, Daniel Narvaez -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+import sys -+import subprocess -+import unittest -+ -+from sugar3.test import uitree -+ -+ -+class TestUITree(unittest.TestCase): -+ def test_tree(self): -+ process = subprocess.Popen(["python3", __file__, "show_window1"]) -+ -+ try: -+ root = uitree.get_root() -+ window = root.find_child(name="window1", role_name="frame") -+ button = window.find_child(name="button1", role_name="push button") -+ finally: -+ process.terminate() -+ -+ self.assertIsNotNone(button) -+ -+ -+def show_window1(): -+ from gi.repository import Gtk -+ -+ window = Gtk.Window() -+ window.set_title("window1") -+ -+ button = Gtk.Button(label="button1") -+ window.add(button) -+ button.show() -+ -+ window.show() -+ -+ Gtk.main() -+ -+ -+if __name__ == '__main__': -+ globals()[sys.argv[1]]() diff --git a/helpers/make-app-install-data-ubuntu b/helpers/make-app-install-data-ubuntu index b8341c2..8fd73e0 100644 --- a/helpers/make-app-install-data-ubuntu +++ b/helpers/make-app-install-data-ubuntu @@ -25,7 +25,7 @@ VERSION=4 cp $DATA/applications.menu menu-data/applications.menu # We remove any info about non-free packages -egrep -lr 'X-AppInstall-Section=(multiverse|restricted)' . | xargs -r rm +grep -lr 'X-AppInstall-Section=(multiverse|restricted)' . | xargs -r rm for i in firefox jockey ndisgtk chromium-browser bughugger testdrive menueditor lp-review-list groundcontrol gstreamer nvidia dell-recovery ubufox thunderbird do find -name *$i*xpm -exec rm {} \; diff --git a/helpers/make-casper b/helpers/make-casper index caa9396..ce006e5 100644 --- a/helpers/make-casper +++ b/helpers/make-casper @@ -45,9 +45,6 @@ sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions # Set trisquel isos as default suggestion. patch --no-backup-if-mismatch -p1 < $DATA/set_trisquel_iso_suggestion.patch -# FIX T11 only: Set live user uid as 1000, which fails due to -# systemd taking 999 in later versions (LP: #2004092) remove on T12. -patch --no-backup-if-mismatch -p1 < $DATA/set_liveuser_uid_1000.patch changelog "Compiled for Trisquel" diff --git a/helpers/make-cdrkit b/helpers/make-cdrkit index af6a271..b0587d7 100644 --- a/helpers/make-cdrkit +++ b/helpers/make-cdrkit @@ -29,7 +29,7 @@ rm -rf genisoimage/apple_driver* rm -rf doc/genisoimage/README.hfs_boot -changelog "Compiled for Trisquel" +changelog "Compiled for Trisquel" package diff --git a/helpers/make-conky b/helpers/make-conky deleted file mode 100644 index 9427177..0000000 --- a/helpers/make-conky +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2021 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed -i '/libxnvctrl-dev/d' debian/control -sed -i 's|DBUILD_NVIDIA=ON|DBUILD_NVIDIA=OFF|g' debian/rules - -changelog "Remove nvidia-settings dependency." - -package diff --git a/helpers/make-expat b/helpers/make-expat index 09e2b08..1ac27f9 100644 --- a/helpers/make-expat +++ b/helpers/make-expat @@ -27,11 +27,7 @@ VERSION=2 NETINST=true . ./config -#FIXME:T12 -# Set version number due to source origin change -export FULLVERSION="$(sed 's|ubuntu0.3||' <<< $FULLVERSION)" changelog "Fetch and build as udeb dependency for debian-installer." -head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit package diff --git a/helpers/make-fai-server b/helpers/make-fai-server index 50ad9b2..7340534 100644 --- a/helpers/make-fai-server +++ b/helpers/make-fai-server @@ -45,3 +45,4 @@ sed "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$CODENAME http://archive.trisquel.o changelog "Adapted for Trisquel. Fixes #28007" package + diff --git a/helpers/make-hwloc b/helpers/make-hwloc deleted file mode 100644 index e0c5eec..0000000 --- a/helpers/make-hwloc +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2021 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed -i '/libxnvctrl-dev/d' debian/control - -changelog "Remove nvidia-settings dependency." - -package diff --git a/helpers/make-indicator-sensors b/helpers/make-indicator-sensors deleted file mode 100644 index e0c5eec..0000000 --- a/helpers/make-indicator-sensors +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2021 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed -i '/libxnvctrl-dev/d' debian/control - -changelog "Remove nvidia-settings dependency." - -package diff --git a/helpers/make-libtgowt b/helpers/make-libtgowt index 789b160..7a72626 100644 --- a/helpers/make-libtgowt +++ b/helpers/make-libtgowt @@ -17,23 +17,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=5 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 +VERSION=4 +EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' +REPOKEY=6ED0E7B82643E131 BACKPORT=true . ./config -# Apply patches to use system's libsrtp2 -for patch in $(ls -v ${DATA}/*.patch) -do - echo "Applying $patch" - patch --no-backup-if-mismatch -Np1 < $patch -done -# Manually remove third_party src -rm -r src/third_party/libsrtp - -changelog "Applied libsrtp system usage update to bullseye-backports." +changelog "Backported from debian bookworm as a dependency of telegram-desktop" package diff --git a/helpers/make-mate-sensors-applet b/helpers/make-mate-sensors-applet deleted file mode 100644 index 7588898..0000000 --- a/helpers/make-mate-sensors-applet +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2021 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed -i '/libxnvctrl-dev/d' debian/control -sed -i '/nvidia/s|yes|no|g' debian/rules -rm debian/mate-sensors-applet-nvidia.install - -changelog "Remove nvidia-settings dependency." - -package diff --git a/helpers/make-mate-user-admin b/helpers/make-mate-user-admin deleted file mode 100644 index d990f66..0000000 --- a/helpers/make-mate-user-admin +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe' - -. ./config - -# Add cracklib-runtime dependency to debian/control -patch --no-backup-if-mismatch -p1 < $DATA/add-cracklib-runtime-as-dependency.patch - -changelog "Imported into Trisquel Aramo | Added cracklib-runtime dependency." - -package diff --git a/helpers/make-mtpaint b/helpers/make-mtpaint index d8cd4a2..e4b5a3f 100644 --- a/helpers/make-mtpaint +++ b/helpers/make-mtpaint @@ -25,6 +25,6 @@ VERSION=0 #Apply path for handle open with, fix LP:#1714264 patch --no-backup-if-mismatch -p1 < $DATA/mtpaint-desktop.patch -changelog "Remove nvidia-settings dependency." +changelog "Apply path for handle open with, fix LP:#1714264" package diff --git a/helpers/make-neofetch b/helpers/make-neofetch index 2a23426..54dc252 100644 --- a/helpers/make-neofetch +++ b/helpers/make-neofetch @@ -26,4 +26,3 @@ patch --no-backup-if-mismatch -p1 < $DATA/1946.patch changelog "Adding ASC-II trisquel logo update, thanks to @LegoLeprechaun" package - diff --git a/helpers/make-openssh b/helpers/make-openssh index c676070..ffd5bcb 100644 --- a/helpers/make-openssh +++ b/helpers/make-openssh @@ -22,15 +22,10 @@ NETINST=true . ./config -#FIXME:T12 -# Set version number due to source origin change -export FULLVERSION="$(sed 's|ubuntu0.6||' <<< $FULLVERSION)" - sed 's:Ubuntu:Trisquel\ GNU/Linux:g' -i debian/rules sed "s|^SSH_EXTRAVERSION.*|SSH_EXTRAVERSION := Trisquel_GNU/Linux_$REVISION-$VERSION|" -i debian/rules changelog "Rebranded for Trisquel" -head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit package diff --git a/helpers/make-p7zip b/helpers/make-p7zip index e1a0227..68e4f19 100644 --- a/helpers/make-p7zip +++ b/helpers/make-p7zip @@ -21,7 +21,7 @@ VERSION=1 . ./config -sed -i '/Suggests: p7zip-rar/d' debian/control +sed -i '/Suggests: p7zip-rar/d' debian/control #Our versions doesn't handle rar files, due to licenses sed -i 's/RAR (only//; s/if non-free p7zip-rar package is installed),//' debian/control # diff --git a/helpers/make-pidgin b/helpers/make-pidgin index 675d722..f9f3d16 100644 --- a/helpers/make-pidgin +++ b/helpers/make-pidgin @@ -30,13 +30,6 @@ done sed '/PIDGIN_PREFS_ROOT.*conv_focus/s/TRUE/FALSE/' -i pidgin/gtksound.c -# apply upstream pidgin security fixes / patches not yet in ubuntu. -for patch in $(ls -v ${DATA}/cve/*.patch) -do - echo "Applying $patch" - patch --no-backup-if-mismatch -Np1 < $patch -done - changelog "Compiled for Trisquel" package diff --git a/helpers/make-plymouth b/helpers/make-plymouth index 2cbf3ed..da48377 100644 --- a/helpers/make-plymouth +++ b/helpers/make-plymouth @@ -142,4 +142,3 @@ sed s/Ubuntu/Trisquel/ -i debian/plymouth-theme-trisquel-text.postinst changelog "Plymouth themes modified for Trisquel" package - diff --git a/helpers/make-psensor b/helpers/make-psensor deleted file mode 100644 index 212a5f7..0000000 --- a/helpers/make-psensor +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Pablo Correa Gómez -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed '/libxnvctrl-dev/d' -i debian/control - -#Apply fix ftbfs patch -patch --no-backup-if-mismatch -p1 < $DATA/fix-ftbfs-debian-patch.patch - -changelog "Removed libxnvctrl0 dependency not present in Trisquel" - -package diff --git a/helpers/make-python-apt b/helpers/make-python-apt index ee44ba7..2d3f480 100644 --- a/helpers/make-python-apt +++ b/helpers/make-python-apt @@ -24,9 +24,6 @@ COMPONENT=main . ./config -# Fix version number due to early release. -export FULLVERSION="$(sed 's|ubuntu2||' <<< $FULLVERSION)" - cat << EOF > data/templates/Trisquel.mirrors #LOC:BR https://trisquel.c3sl.ufpr.br/packages/ @@ -109,7 +106,6 @@ EOF export DEB_BUILD_OPTIONS=nocheck changelog "Compiled for Trisquel" -head -n1 debian/changelog | grep -q ubuntu && echo "error: update FULLVERSION value" && exit package diff --git a/helpers/make-qtwebengine-opensource-src b/helpers/make-qtwebengine-opensource-src index 8e3a7f9..4401a21 100644 --- a/helpers/make-qtwebengine-opensource-src +++ b/helpers/make-qtwebengine-opensource-src @@ -22,7 +22,6 @@ VERSION=3 . ./config -sed '/libxnvctrl-dev/d' -i debian/control echo "gn_args += safe_browsing_mode=0" >> src/core/config/common.pri #Increase parallel restriction (it fails at full speed). diff --git a/helpers/make-ring b/helpers/make-ring deleted file mode 100644 index dc928f9..0000000 --- a/helpers/make-ring +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe' -VERSION=2 - -. ./config - -# Fix version number due to source origin change. -export FULLVERSION="$(sed 's|ubuntu0.1||' <<< $FULLVERSION)" - -# Add trisquel aramo's dependencies -sed -i "/# Qt client/i # trisquel's aramo dependencies" debian/control -for i in "libgl1-mesa-dev" \ - "libqt6opengl6-dev" \ - "libvulkan-dev" \ - "libxkbcommon-dev" -do - sed -i "/# Qt client/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $i," debian/control -done - - -# Add aramo's missing runtime dependencies -for i in "libqt6multimediaquick6" \ - "libqt6quickshapes6" \ - "libqt6quicktemplates2-6" \ - "qt6-qpa-plugins" -do - sed -i "/jami-daemon (=/i \ \ \ \ \ \ \ \ \ $i," debian/control -done - -# Remove not available qt libraries at Trisquel 11.0 -for i in qt6-5compat-dev \ - qml6-module-qtquick3d-spatialaudio -do - sed -i "/$i/d" debian/control -done - -# Removing ffmpeg time_base feature req. from jami so it builds -# against libavutil56 (ffmpeg 4.4). Can be removed on Trisquel 12 -remove_patch fc975f0cacde4b06c6adde3d7f0c02f71abfb38c.patch -patch --no-backup-if-mismatch -R -p1 < $DATA/ffmpeg_time_base_frame.patch - -# Backport latest changes required at experimental - Remove once package -# keep up with changes at testing or unstable release. -for patch in $(ls -v ${DATA}/debian_backport/*.patch) -do -echo "Applying $patch" -patch --no-backup-if-mismatch -Np1 < $patch -done - -changelog "Backport ring/jammi to aramo from LTS noble" -head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit - -package diff --git a/helpers/make-sugar-artwork b/helpers/make-sugar-artwork deleted file mode 100644 index d6bf26f..0000000 --- a/helpers/make-sugar-artwork +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Ruben Rodriguez -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu kinetic universe' - -. ./config - -changelog "Backported from kinetic" - -package diff --git a/helpers/make-sugar-datastore b/helpers/make-sugar-datastore deleted file mode 100644 index d6bf26f..0000000 --- a/helpers/make-sugar-datastore +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Ruben Rodriguez -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu kinetic universe' - -. ./config - -changelog "Backported from kinetic" - -package diff --git a/helpers/make-sugar-toolkit-gtk3 b/helpers/make-sugar-toolkit-gtk3 deleted file mode 100644 index d6bf26f..0000000 --- a/helpers/make-sugar-toolkit-gtk3 +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Ruben Rodriguez -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu kinetic universe' - -. ./config - -changelog "Backported from kinetic" - -package diff --git a/helpers/make-telegram-desktop b/helpers/make-telegram-desktop index 1276d90..29112da 100644 --- a/helpers/make-telegram-desktop +++ b/helpers/make-telegram-desktop @@ -18,17 +18,17 @@ # VERSION=4 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports-sloppy main' -REPOKEY=0E98404D386FA1D9 +EXTERNAL='deb-src http://ftp.debian.org/debian bookworm-backports main' +REPOKEY=6ED0E7B82643E131 BACKPORT=true . ./config #Remove stable backport workaround to keep using libmsgsl-dev 3.0 -sed -i 's|\-I\$(CURDIR)/debian||' debian/rules +#sed -i 's|\-I\$(CURDIR)/debian||' debian/rules # Bump VERSION=4 to rebuild against newer libtgowt with openssl 3.0 support. -changelog "Backported from debian bullseye-backports-sloppy | * Bump VERSION=4 to rebuild against libtgowt (0~git20230105.5098730+dfsg-1~bpo11+1+11.0trisquel5) with openssl 3.0 support." +changelog "Backported from debian bookworm-backports" package diff --git a/helpers/make-umbrello b/helpers/make-umbrello index 8a33f43..409efaa 100644 --- a/helpers/make-umbrello +++ b/helpers/make-umbrello @@ -28,6 +28,7 @@ BACKPORT=true . ./config sed -i 's|kdevplatform-dev|kdevelop-dev|' debian/control +sed -i 's|llvm-13-dev|llvm-14-dev|' debian/control changelog "Backport latest release from kde neon archive." diff --git a/helpers/make-virtnbdbackup b/helpers/make-virtnbdbackup index a4d9be5..0971d4f 100644 --- a/helpers/make-virtnbdbackup +++ b/helpers/make-virtnbdbackup @@ -24,8 +24,8 @@ BACKPORTS=true . ./config # Set on a supported python version -sed -i "s|python3.11|python3.10|" debian/control -sed -i "/PYBUILD_INTERPRETERS/s|python3.11|python3.10|" debian/rules +sed -i "s|python3.11|python3.12|" debian/control +sed -i "/PYBUILD_INTERPRETERS/s|python3.11|python3.12|" debian/rules changelog "Imported into Trisquel" package diff --git a/helpers/make-vokoscreen b/helpers/make-vokoscreen-ng similarity index 100% rename from helpers/make-vokoscreen rename to helpers/make-vokoscreen-ng diff --git a/helpers/make-xfce4-sensors-plugin b/helpers/make-xfce4-sensors-plugin deleted file mode 100644 index a374391..0000000 --- a/helpers/make-xfce4-sensors-plugin +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2021 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 - -. ./config - -sed -i '/libxnvctrl-dev/d' debian/control -sed -i '/enable-xnvctrl/d' debian/rules - -changelog "Remove nvidia-settings dependency." - -package diff --git a/helpers/make-youtube-dl b/helpers/make-youtube-dl deleted file mode 100644 index 3e224d8..0000000 --- a/helpers/make-youtube-dl +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 Rubén Rodríguez -# Copyright (C) 2021 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=4 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -. ./config - -SUPPORTED_SITES="https://ytdl-org.github.io/youtube-dl/supportedsites.html" -LAST_SUPPORTED="$(tail -n1 debian/control|sed 's|^ ||')" - -sed -i "/Currently supported/s|are:|are at:|" debian/control -/bin/sed -n -i '/Currently supported/{p;:a;N;/'$LAST_SUPPORTED'/!ba;s| .*| '$SUPPORTED_SITES'\n|};p' -i debian/control -# Make sure it fails if we don't get the wanted output. -[ "$SUPPORTED_SITES" != "$(tail -n2 debian/control|awk NF|sed 's|^ ||')" ] && echo -e ">>>Site replacement needs fixing, exiting...<<<\n" && exit - -changelog "Imported into Trisquel" - -package From 9e144601e1e0f1e93641ca29a936e67a839c5023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 8 May 2024 19:05:39 +0000 Subject: [PATCH 006/341] config: add echo comment to easily identify sed_csum errors. --- helpers/config | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/config b/helpers/config index 22d27c5..67d8704 100755 --- a/helpers/config +++ b/helpers/config @@ -257,5 +257,6 @@ remove_patch(){ } sed_csum() { + echo "> Checksum replace for $1 in progress..." grep -rl "$1" "${3:-"./"}" | xargs -r /bin/sed -i "s|$1|$2|" } From 516a0a86abf0843cbeb21a53c395630a72bcc146 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Thu, 9 May 2024 07:26:36 +0000 Subject: [PATCH 007/341] firefox: update helper and patches for v126 --- .../patch_changes/Remove_Android_and_iOS_promotion.patch | 6 ++++-- helpers/make-firefox | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch b/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch index 74524a7..9d5a063 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch +++ b/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch @@ -1,13 +1,14 @@ diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml -index 7d37d26..4ebbc06 100644 +index 492491a3..0c8c462a 100644 --- a/browser/components/preferences/sync.inc.xhtml +++ b/browser/components/preferences/sync.inc.xhtml -@@ -35,22 +35,6 @@ +@@ -35,24 +35,6 @@ -