Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • trisquel/package-helpers
  • aklis/package-helpers
  • leny2010/package-helpers
  • fr33domlover/package-helpers
  • Legimet/package-helpers
  • ralphtheninja/package-helpers
  • damo22/package-helpers
  • wherrfrye/package-helpers
  • habs/package-helpers
  • pehjota/package-helpers
  • kpengboy/package-helpers
  • alvaro/package-helpers
  • salman/package-helpers
  • pabloyoyoista/package-helpers
  • mixalis/package-helpers
  • jorgesumle/package-helpers
  • a_slacker_here/package-helpers
  • chaosmonk/package-helpers
  • Beformed/package-helpers
  • dknight/package-helpers
  • proninyaroslav/package-helpers
  • adfeno/package-helpers
  • snd/package-helpers
  • davidpgil/package-helpers
  • diopon/package-helpers
  • ruben/package-helpers
  • bandali/package-helpers
  • joshaspinall/package-helpers
  • GNUtoo/package-helpers
  • Ark74/package-helpers
  • dragestil/package-helpers
  • bill-auger/package-helpers
  • andi89gi/package-helpers
  • Fikar/package-helpers
  • davidl/package-helpers
  • jas/package-helpers
  • parodper/package-helpers
  • David_Hedlund/package-helpers
  • dinomug/package-helpers
  • bf/package-helpers
  • hartkemd/package-helpers
  • del111/package-helpers
  • jxself/package-helpers
  • JacobK/package-helpers
44 results
Show changes
Commits on Source (24)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1237 additions and 50 deletions
helpers/DATA/distro-info-data/trisquel.csv
View file @ 980fc52d
...@@ -11,3 +11,4 @@ version,codename,series,created,release,eol ...@@ -11,3 +11,4 @@ version,codename,series,created,release,eol
8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21 8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21
9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26 9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26
10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23 10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23
11.0 LTS,Aramo,aramo,2021-10-14,2027-04-21,2027-04-21
helpers/DATA/firefox/bookmarks.html.in deleted 100644 → 0
View file @ 60bc04ac
#filter substitution
#include @BOOKMARKS_INCLUDE_PATH@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<meta charset="UTF-8">
<title>@bookmarks_title@</title>
<h1>@bookmarks_heading@</h1>
<dl><p>
<dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
<dd>@bookmarks_toolbarfolder_description@
<dl>
</dl>
</dl>
helpers/DATA/firefox/default-bookmarks.html 0 → 100644
View file @ 980fc52d
#filter substitution
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<html>
<head>
<meta charset="UTF-8">
<!-- These localization links are not automatically applied to any XHR
response body and must be applied manually as well. They are included
so that viewing the file directly shows the results. -->
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
<title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
</head>
<body>
<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
<dl><p>
<dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">Bookmarks Toolbar</h3></dt>
</dl>
</body>
</html>
helpers/DATA/greybird-gtk-theme/mate.scss
View file @ 980fc52d
...@@ -74,6 +74,12 @@ ...@@ -74,6 +74,12 @@
border-width: 1px 1px 1px 0px; border-width: 1px 1px 1px 0px;
} }
/* fix no cursor on dark theme*/
.caja-desktop.view .entry,
.caja-navigation-window .view .entry {
caret-color: #000;
}
/**************** /****************
* Mate-Panel * * Mate-Panel *
****************/ ****************/
......
helpers/DATA/linux-hwe-5.13/deblob-5.13
View file @ 980fc52d
...@@ -1758,17 +1758,17 @@ clean_sed ' ...@@ -1758,17 +1758,17 @@ clean_sed '
-EINVAL) -EINVAL)
}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware' }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware'
clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
clean_sed ' clean_sed "
/^int bnx2x_compare_fw_ver/,/^}$/{ /^int bnx2x_compare_fw_ver/,/^}$/{
/^ u32 my_fw = /i\ /[[:space:]]u32 my_fw = /i\\
/*(DEBLOBBED)*/ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ /*(DEBLOBBED)*/
/^ u32 my_fw = /,/<< 24);/d; /[[:space:]]u32 my_fw = /,/<< 24);/d;
/^ u32 loaded_fw = /,/^$/{ /[[:space:]]u32 loaded_fw = /,/^$/{
/^$/i\ /^$/i\\
\ \\
u32 my_fw = ~loaded_fw; \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ u32 my_fw = ~loaded_fw;
} }
}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test' }" drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test'
clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
clean_sed ' clean_sed '
/static void bnx2x_init_wr_wb/{ /static void bnx2x_init_wr_wb/{
...@@ -3878,6 +3878,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo ...@@ -3878,6 +3878,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo
if $errors; then if $errors; then
echo errors above were ignored because of --force >&2 echo errors above were ignored because of --force >&2
else
echo cleaning up has completed successfully, without verification >&2
# Verification is largely manual, comparing the changes with
# those of a previous known (presumed) good version, e.g.
# git merge the previous known good version onto the current base
# version, and then git diff with this cleaned-up version.
# Creating a tarball of this version, named linux-*.*.tar,
# and running deblob-check on it may also help catch cleaning-up
# errors: .../deblob-check --use-awk -B linux-*.*.tar.
fi fi
exit 0 exit 0
helpers/DATA/linux-hwe-5.13/deblob-check
View file @ 980fc52d
...@@ -2281,7 +2281,7 @@ set_except () { ...@@ -2281,7 +2281,7 @@ set_except () {
defsnc 'static[ ]\(u16\|struct[ ]i2c_reg_u16\)[ ]\(bridge\|mt9\(v\(11[12]\|011\)\|m001\)\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c defsnc 'static[ ]\(u16\|struct[ ]i2c_reg_u16\)[ ]\(bridge\|mt9\(v\(11[12]\|011\)\|m001\)\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c
defsnc 'static[ ]\(u8\|struct[ ]i2c_reg_u8\)[ ]\(soi968\|ov\(76[67]0\|965[05]\)\|hv7131r\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c defsnc 'static[ ]\(u8\|struct[ ]i2c_reg_u8\)[ ]\(soi968\|ov\(76[67]0\|965[05]\)\|hv7131r\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c
defsnc 'static[ ]struct[ ]nand_ecclayout[ ]onenand_oob_128[ ]=' drivers/mtd/onenand/onenand_base.c defsnc 'static[ ]struct[ ]nand_ecclayout[ ]onenand_oob_128[ ]=' drivers/mtd/onenand/onenand_base.c
blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h' #blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h'
blob 'static[ ]int[ ]\(__devinit[ ]\)\?bnx2x_check_firmware[(]struct[ ]bnx2x[ ][*]bp[)][\n][{][^\n]*\([\n]\+[^\n}][^\n]*\)*[\n]\+[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blob 'static[ ]int[ ]\(__devinit[ ]\)\?bnx2x_check_firmware[(]struct[ ]bnx2x[ ][*]bp[)][\n][{][^\n]*\([\n]\+[^\n}][^\n]*\)*[\n]\+[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c'
blobna 'if[ ][(][(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ][|][|][\n][ ]*[(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\)*[)][ ][{][^{}]*[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blobna 'if[ ][(][(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ][|][|][\n][ ]*[(]fw_ver\[[0-3]\][ ]!=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\)*[)][ ][{][^{}]*[}]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c'
blobna 'sprintf[(]fw_file_name[ ][+][ ]offset,[ ]["]%d[.]%d[.]%d[.]%d[.]fw["]\(,[\n][ ]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)*[)][;]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c' blobna 'sprintf[(]fw_file_name[ ][+][ ]offset,[ ]["]%d[.]%d[.]%d[.]%d[.]fw["]\(,[\n][ ]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)*[)][;]' 'drivers/net/\(bnx2x[/]\)\?bnx2x_main\.c'
...@@ -2411,7 +2411,7 @@ set_except () { ...@@ -2411,7 +2411,7 @@ set_except () {
blob '#define[ ]_FW_NAME[(]api[)][ ]DRV_NAME[ ]["][.]["][ ]#api[ ]["]\.fw["]' drivers/media/video/iwmc3200top.h blob '#define[ ]_FW_NAME[(]api[)][ ]DRV_NAME[ ]["][.]["][ ]#api[ ]["]\.fw["]' drivers/media/video/iwmc3200top.h
blob '#define[ ]FW_FILE_VERSION\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' blob '#define[ ]FW_FILE_VERSION\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c' #blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blob '#define[ ]FW_VERSION\([ ]__stringify[(]FW_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c blob '#define[ ]FW_VERSION\([ ]__stringify[(]FW_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c
blobname 'cxgb3[/]t3fw-["][ ]FW_VERSION[ ]["]\.bin' drivers/net/cxgb3/cxgb3_main.c blobname 'cxgb3[/]t3fw-["][ ]FW_VERSION[ ]["]\.bin' drivers/net/cxgb3/cxgb3_main.c
blob '#define[ ]TPSRAM_VERSION\([ ]__stringify[(]TP_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c blob '#define[ ]TPSRAM_VERSION\([ ]__stringify[(]TP_VERSION_\(MAJOR\|MINOR\|MICRO\)[)]\([ ]["][.]["]\)\?\([ ]*[\\][\n]\)\?\)\+' drivers/net/cxgb3/cxgb3_main.c
...@@ -6164,12 +6164,26 @@ set_except () { ...@@ -6164,12 +6164,26 @@ set_except () {
   
# New in 5.12.9, 5.10.42. # New in 5.12.9, 5.10.42.
blobname '\(silead[/]\)\?gsl1680-chuwi-hi10-pro\.fw' drivers/platform/x86/touchscreen_dmi.c blobname '\(silead[/]\)\?gsl1680-chuwi-hi10-pro\.fw' drivers/platform/x86/touchscreen_dmi.c
# Added by Trisquel for nabia # Added by Trisquel for nabia
blobname '\(silead[/]\)\?gsl1680-chuwi-hibook\.fw' drivers/platform/x86/touchscreen_dmi.c blobname '\(silead[/]\)\?gsl1680-chuwi-hibook\.fw' drivers/platform/x86/touchscreen_dmi.c
blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c blobna '[/][*][ ]linux-firmware\.git[ ]hash[ ][0-9a-f]*[ ][*][/]' drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h blobname 'mediatek[/]WIFI_RAM_CODE_MT7922_1\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h blobname 'mediatek[/]WIFI_MT7922_patch_mcu_1_1_hdr\.bin' drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
   
# Backport bnx2x changes from 5.17 - Trisquel 10.0
blob '#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)\(_V15\)\?[ ]*[0-9]\+\([\n]#define[ ]BCM_5710_FW_\(\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\|COMPILE_FLAGS\)\(_V15\)\?[ ]*[0-9]\+\)*' 'drivers/net/\(bnx2x[/]\)\?bnx2x_hsi\.h'
blob '#define[ ]FW_FILE_VERSION\(_V15\)\?\([ ]*[\\][\n][ ]__stringify[(]BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\(_V15\)\?[)]\([ ]["][.]["]\)\?\)\+' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-["][ ]FW_FILE_VERSION\(_V15\)\?[ ]["]\.fw' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobname '\(bnx2x[/]\)\?bnx2x-e[12]h\?-\([0-9.%d]*\.fw\)\?' 'drivers/net/\(bnx2x/\)\?bnx2x_main\.c'
blobna '\([,][\n \t]*BCM_5710_FW_\(MAJOR\|MINOR\|REVISION\|ENGINEERING\)_VERSION\)\+' drivers/net/wireless/broadcom/bnx2x/bnx2x_main.c
accept '[\t][\t][\t]goto[ ]request_firmware_exit[;]' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
blobna 'bp->fw_\(major\|minor\|eng\|rev\)[ ]=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?[;]\([\n][\t]*bp->fw_\(major\|minor\|eng\|rev\)[ ]=[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?[;]\)*' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
blobna '\([,][\n \t]*bp->fw_\(major\|minor\|rev\)\)\+' drivers/net/wireless/broadcom/bnx2x/bnx2x_main.c
# Backport new in 5.16.3, 5.15.17, 5.10.94, 5.4.174, 4.19.226, 4.14.263. - Trisquel 10.0
accept 'static[ ]struct[ ]dvb_usb_device_properties[ ]\(p1100\|s660\|p7500\)_properties[ ]=[ ][{][\n]\([ ]\.\(caps\|usb_ctrl\|size_of_priv\)[ ]*=[ ][^",]*,[\n]*\)*[ ]\.firmware[ ]*=[ ]' drivers/media/usb/dvb-usb/dw2102.c
# New in 5.13-rc. # New in 5.13-rc.
# Sources are in cwsr_trap_handler_gfx9.asm. # Sources are in cwsr_trap_handler_gfx9.asm.
defsnc 'static[ ]const[ ]uint32_t[ ]cwsr_trap_aldebaran_hex\[\][ ]=' drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h defsnc 'static[ ]const[ ]uint32_t[ ]cwsr_trap_aldebaran_hex\[\][ ]=' drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
...@@ -6223,6 +6237,9 @@ set_except () { ...@@ -6223,6 +6237,9 @@ set_except () {
# New in 5.13.5 and 5.10.53. # New in 5.13.5 and 5.10.53.
blobna 'and[ ]booted[ ]am335x-pm-firmware\.elf\.[\n][ ][*][/]' Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt blobna 'and[ ]booted[ ]am335x-pm-firmware\.elf\.[\n][ ][*][/]' Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
   
# Trisquel linux-hwe-5.13 adjustments
blobname 'gsl1680-rwc-nanote-p8\.fw' drivers/platform/x86/touchscreen_dmi.c
# New in 5.14-rc. # New in 5.14-rc.
accept '[ ]*nvidia,emc-registers[ ]=[ ]*<\(0x[0-9a-f]*[ \n]*\)*>[;]' Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml accept '[ ]*nvidia,emc-registers[ ]=[ ]*<\(0x[0-9a-f]*[ \n]*\)*>[;]' Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-emc.yaml
blobname 'msnv11\.bin' Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml blobname 'msnv11\.bin' Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml
......
helpers/DATA/linux/deblob-5.4
View file @ 980fc52d
...@@ -407,9 +407,12 @@ clean_sed ' ...@@ -407,9 +407,12 @@ clean_sed '
s,git://git\..*torvalds/linux\.git,/*(DEBLOBBED)*/, s,git://git\..*torvalds/linux\.git,/*(DEBLOBBED)*/,
' scripts/package/mkdebian 'upstream development repo' ' scripts/package/mkdebian 'upstream development repo'
clean_sed ' # The tarball name and its expansion do not include -libre.
s,Name: kernel,&-libre, # We could change KERNELPATH and keep this, but what else would break?
' scripts/package/mkspec 'package name' # Enabling this would require the other commented-out mkspec bits below.
# clean_sed '
# s,Name: kernel,&-libre,
# ' scripts/package/mkspec 'package name'
clean_sed ' clean_sed '
s,The Linux,The GNU Linux-libre, s,The Linux,The GNU Linux-libre,
...@@ -423,13 +426,22 @@ clean_sed ' ...@@ -423,13 +426,22 @@ clean_sed '
s,https\?://www\.kernel\.org,https://linux-libre.fsfla.org, s,https\?://www\.kernel\.org,https://linux-libre.fsfla.org,
' scripts/package/mkspec 'home page' ' scripts/package/mkspec 'home page'
# clean_sed '
# s,\(%description\) -n kernel-,\1 ,
# ' scripts/package/mkspec '-libre subpackages'
# clean_sed '
# /Provides: kernel-/{p;s,kernel-,&libre-,;}
# ' scripts/package/mkspec '-libre provides'
# As with rpms, we leave the package name as kernel.
clean_sed ' clean_sed '
s,\(%description\) -n kernel-,\1 , s,The upstream Linux kernel,The GNU Linux-libre kernel,
' scripts/package/mkspec '-libre subpackages' ' scripts/package/snapcraft.template 'description'
clean_sed ' clean_sed '
/Provides: kernel-/{p;s,kernel-,&libre-,;} s,Linux kernel,GNU Linux-libre,
' scripts/package/mkspec '-libre provides' ' scripts/package/snapcraft.template 'summary'
# Add reject_firmware and maybe_reject_firmware # Add reject_firmware and maybe_reject_firmware
grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h ||
...@@ -444,7 +456,7 @@ clean_sed '$i\ ...@@ -444,7 +456,7 @@ clean_sed '$i\
static inline int\ static inline int\
is_nonfree_firmware(const char *name)\ is_nonfree_firmware(const char *name)\
{\ {\
return strstr(name, NONFREE_FIRMWARE) != 0;\ return strstr(name, NONFREE_FIRMWARE) != 0;\
}\ }\
\ \
static inline int\ static inline int\
...@@ -460,6 +472,7 @@ firmware_reject_nowarn(const struct firmware **fw,\ ...@@ -460,6 +472,7 @@ firmware_reject_nowarn(const struct firmware **fw,\
{\ {\
const struct firmware *xfw = NULL;\ const struct firmware *xfw = NULL;\
int retval, retval0 = -ENOENT;\ int retval, retval0 = -ENOENT;\
if (fw) *fw = xfw;\
retval = firmware_request_nowarn(&xfw, NONFREE_FIRMWARE, device);\ retval = firmware_request_nowarn(&xfw, NONFREE_FIRMWARE, device);\
if (!retval) {\ if (!retval) {\
release_firmware(xfw);\ release_firmware(xfw);\
...@@ -494,6 +507,7 @@ reject_firmware_direct(const struct firmware **fw,\ ...@@ -494,6 +507,7 @@ reject_firmware_direct(const struct firmware **fw,\
{\ {\
const struct firmware *xfw = NULL;\ const struct firmware *xfw = NULL;\
int retval, retval0;\ int retval, retval0;\
if (fw) *fw = xfw;\
retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\
retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\ retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\
if (!retval) {\ if (!retval) {\
...@@ -534,6 +548,7 @@ reject_firmware_into_buf(const struct firmware **firmware_p, const char *name,\ ...@@ -534,6 +548,7 @@ reject_firmware_into_buf(const struct firmware **firmware_p, const char *name,\
{\ {\
const struct firmware *xfw = NULL;\ const struct firmware *xfw = NULL;\
int retval, retval0;\ int retval, retval0;\
if (firmware_p) *firmware_p = xfw;\
retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\
retval = request_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size);\ retval = request_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size);\
if (!retval) {\ if (!retval) {\
...@@ -3580,6 +3595,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo ...@@ -3580,6 +3595,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo
if $errors; then if $errors; then
echo errors above were ignored because of --force >&2 echo errors above were ignored because of --force >&2
else
echo cleaning up has completed successfully, without verification >&2
# Verification is largely manual, comparing the changes with
# those of a previous known (presumed) good version, e.g.
# git merge the previous known good version onto the current base
# version, and then git diff with this cleaned-up version.
# Creating a tarball of this version, named linux-*.*.tar,
# and running deblob-check on it may also help catch cleaning-up
# errors: .../deblob-check --use-awk -B linux-*.*.tar.
fi fi
exit 0 exit 0
helpers/DATA/linux/deblob-check
View file @ 980fc52d
#! /bin/sh #! /bin/sh
   
# deblob-check version 2021-08-29 # deblob-check version 2021-08-29 r18269
# modified with 2022-01-27 r18550
# Inspired in gNewSense's find-firmware script. # Inspired in gNewSense's find-firmware script.
# Written by Alexandre Oliva <lxoliva@fsfla.org> # Written by Alexandre Oliva <lxoliva@fsfla.org>
   
# Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer
# versions. # versions.
   
# Copyright 2008-2021 Alexandre Oliva <lxoliva@fsfla.org> # Copyright 2008-2022 Alexandre Oliva <lxoliva@fsfla.org>
# #
# This program is part of GNU Linux-libre, a GNU project that # This program is part of GNU Linux-libre, a GNU project that
# publishes scripts to clean up Linux so as to make it suitable for # publishes scripts to clean up Linux so as to make it suitable for
...@@ -6280,6 +6281,9 @@ set_except () { ...@@ -6280,6 +6281,9 @@ set_except () {
accept 'ARM[ ]assembly[ ]source[ ]code[ ]available[ ]at[ ]https[:][/][/]linuxtv\.org[/]downloads[/]firmware[/]Boot\.S' firmware/WHENCE accept 'ARM[ ]assembly[ ]source[ ]code[ ]available[ ]at[ ]https[:][/][/]linuxtv\.org[/]downloads[/]firmware[/]Boot\.S' firmware/WHENCE
   
   
# New in 5.16.3, 5.15.17, 5.10.94, 5.4.174, 4.19.226, 4.14.263.
accept 'static[ ]struct[ ]dvb_usb_device_properties[ ]\(p1100\|s660\|p7500\)_properties[ ]=[ ][{][\n]\([ ]\.\(caps\|usb_ctrl\|size_of_priv\)[ ]*=[ ][^",]*,[\n]*\)*[ ]\.firmware[ ]*=[ ]' drivers/media/usb/dvb-usb/dw2102.c
;; ;;
   
*/*freedo*.patch | */*logo*.patch) */*freedo*.patch | */*logo*.patch)
......
helpers/DATA/linux/revert_iwlwifi_clear_firmware1.patch 0 → 100644
View file @ 980fc52d
reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1597,8 +1597,15 @@
* else from proceeding if the module fails to load
* or hangs loading.
*/
+ if (load_module) {
- if (load_module)
request_module("%s", op->name);
+#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
+ if (err)
+ IWL_ERR(drv,
+ "failed to load module %s (error %d), is dynamic loading enabled?\n",
+ op->name, err);
+#endif
+ }
failure = false;
goto free;
helpers/DATA/linux/revert_iwlwifi_clear_firmware2.patch 0 → 100644
View file @ 980fc52d
reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -130,9 +130,6 @@
for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
iwl_free_fw_img(drv, drv->fw.img + i);
-
- /* clear the data for the aborted load case */
- memset(&drv->fw, 0, sizeof(drv->fw));
}
static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,
@@ -1429,7 +1426,6 @@
int i;
bool load_module = false;
bool usniffer_images = false;
- bool failure = true;
fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;
fw->ucode_capa.standard_phy_calibration_size =
@@ -1699,7 +1695,6 @@
op->name, err);
#endif
}
- failure = false;
goto free;
try_again:
@@ -1715,9 +1710,6 @@
complete(&drv->request_firmware_complete);
device_release_driver(drv->trans->dev);
free:
- if (failure)
- iwl_dealloc_ucode(drv);
-
if (pieces) {
for (i = 0; i < ARRAY_SIZE(pieces->img); i++)
kfree(pieces->img[i].sec);
helpers/DATA/linux/revert_iwlwifi_clear_firmware3.patch 0 → 100644
View file @ 980fc52d
reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
diff -ru source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 16:10:11.883295769 -0400
+++ source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 20:13:06.568151229 -0400
@@ -1605,7 +1605,6 @@
complete(&drv->request_firmware_complete);
device_release_driver(drv->trans->dev);
/* drv has just been freed by the release */
- failure = false;
free:
if (pieces) {
for (i = 0; i < ARRAY_SIZE(pieces->img); i++)
helpers/DATA/linux/silent-accept-firmware.patch
View file @ 980fc52d
...@@ -1056,8 +1056,28 @@ diff -ur a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/ ...@@ -1056,8 +1056,28 @@ diff -ur a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/
if (iwl_trans_start_hw(priv->trans)) if (iwl_trans_start_hw(priv->trans))
goto out_free_hw; goto out_free_hw;
diff -ur a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c diff -ur a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2021-06-25 14:52:20.000000000 +0200 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 15:20:06.000000000 -0400
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2021-06-25 14:54:58.336092716 +0200 +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-05-13 15:40:28.252484852 -0400
@@ -237,19 +237,6 @@
if (drv->fw_index < cfg->ucode_api_min) {
IWL_ERR(drv, "no suitable firmware found!\n");
-
- if (cfg->ucode_api_min == cfg->ucode_api_max) {
- IWL_ERR(drv, "%s%d is required\n", cfg->fw_name_pre,
- cfg->ucode_api_max);
- } else {
- IWL_ERR(drv, "minimum version required: %s%d\n",
- cfg->fw_name_pre, cfg->ucode_api_min);
- IWL_ERR(drv, "maximum version supported: %s%d\n",
- cfg->fw_name_pre, cfg->ucode_api_max);
- }
-
- IWL_ERR(drv,
- "check git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git\n");
return -ENOENT;
}
@@ -253,8 +253,7 @@ @@ -253,8 +253,7 @@
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode", snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
cfg->fw_name_pre, tag); cfg->fw_name_pre, tag);
......
helpers/DATA/thunderbird/debug_brand/account-watermark-light.png
View replaced file @ 60bc04ac View file @ 980fc52d
helpers/DATA/thunderbird/debug_brand/account-watermark-light.png

38.5 KiB | W: 0px | H: 0px

helpers/DATA/thunderbird/debug_brand/account-watermark-light.png

43.6 KiB | W: 0px | H: 0px

helpers/DATA/thunderbird/debug_brand/account-watermark-light.png
helpers/DATA/thunderbird/debug_brand/account-watermark-light.png
helpers/DATA/thunderbird/debug_brand/account-watermark-light.png
helpers/DATA/thunderbird/debug_brand/account-watermark-light.png
  • 2-up
  • Swipe
  • Onion skin
helpers/DATA/thunderbird/debug_brand/account-watermark.png
View replaced file @ 60bc04ac View file @ 980fc52d
helpers/DATA/thunderbird/debug_brand/account-watermark.png

42.9 KiB | W: 0px | H: 0px

helpers/DATA/thunderbird/debug_brand/account-watermark.png

47.9 KiB | W: 0px | H: 0px

helpers/DATA/thunderbird/debug_brand/account-watermark.png
helpers/DATA/thunderbird/debug_brand/account-watermark.png
helpers/DATA/thunderbird/debug_brand/account-watermark.png
helpers/DATA/thunderbird/debug_brand/account-watermark.png
  • 2-up
  • Swipe
  • Onion skin
helpers/DATA/ubiquity/a11y-profile-manager-indicator__orca.patch 0 → 100644
View file @ 980fc52d
Start a11y-profile-manager-indicator only if not running already && Fixes issues starting orca patch fixing style issues.
--- source/ubiquity/frontend/gtk_ui.py.orig 2022-05-24 06:56:47.305813027 +0000
+++ source/ubiquity/frontend/gtk_ui.py 2022-05-24 06:56:50.509845089 +0000
@@ -166,7 +166,8 @@
# setting gets passed to the target system.
if (gsettings.get_boolean(key) and osextras.find_on_path('orca')):
# Enable
- subprocess.Popen(['orca', '--replace'], preexec_fn=misc.drop_all_privileges)
+ subprocess.Popen(['orca', '--replace'],
+ preexec_fn=misc.drop_all_privileges)
os.environ['UBIQUITY_A11Y_PROFILE'] = 'screen-reader'
elif 'UBIQUITY_A11Y_PROFILE' in os.environ:
# Disable
@@ -391,7 +392,8 @@
self.customize_installer()
# Put up the a11y indicator.
- if osextras.find_on_path('a11y-profile-manager-indicator') and (subprocess.run(['pgrep', '-f', 'a11y-profile-manager-indicator'], capture_output=True).returncode == 0):
+ if osextras.find_on_path('a11y-profile-manager-indicator') and (subprocess.run(
+ ['pgrep', '-f', 'a11y-profile-manager-indicator'], capture_output=True).returncode == 0):
try:
subprocess.Popen(['a11y-profile-manager-indicator',
'-i'], preexec_fn=misc.drop_all_privileges)
@@ -1125,7 +1127,9 @@
self.allow_go_backward(False)
misc.add_connection_watch(self.network_change)
- misc.add_connection_watch(self.set_connectivity_state, global_only=False)
+ misc.add_connection_watch(
+ self.set_connectivity_state,
+ global_only=False)
def set_window_hints(self, widget):
if (self.oem_user_config or
helpers/DATA/update-notifier/apt_check.py 0 → 100644
View file @ 980fc52d
#!/usr/bin/python3
# nice apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst
import apt
import apt_pkg
import os
import sys
from optparse import OptionParser
import re
import gettext
import distro_info
import subprocess
SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
OS_RELEASE_PATH = "/etc/os-release"
def _get_info_from_os_release(key):
" get info directly from os-release file "
if os.path.exists(OS_RELEASE_PATH):
with open(OS_RELEASE_PATH) as f:
search_res = re.search(
r"{}=(?P<name>.*)".format(key),
f.read()
)
if search_res:
return search_res.group("name")
else:
raise Exception(
"Could not find {} in {}".format(
key, OS_RELEASE_PATH
)
)
else:
raise Exception(
"File {} was not found on the system".format(
OS_RELEASE_PATH
)
)
def _get_output_from_lsb_release(lsb_option):
" get info from lsb_release output "
return subprocess.check_output(
["lsb_release", lsb_option, "-s"], universal_newlines=True
).strip()
def get_distro():
" get distro name "
try:
return _get_info_from_os_release(key="UBUNTU_CODENAME")
except Exception:
# If the system does not have os-release file or does not have the
# required entry in it, we will get the distro name from lsb_release
# command
return _get_output_from_lsb_release("-c")
DISTRO = get_distro()
def _(msg):
return gettext.dgettext("update-notifier", msg)
def _handleException(type, value, tb):
sys.stderr.write("E: " + _("Unknown Error: '%s' (%s)") % (type, value))
sys.exit(-1)
def get_distro_version():
" get distro version "
try:
return _get_info_from_os_release(key="VERSION_ID").replace('"', "")
except Exception:
# If the system does not have os-release file or does not have the
# required entry in it, we will get the distro name from lsb_release
# command
return _get_output_from_lsb_release("-r")
def clean(cache, depcache):
" unmark (clean) all changes from the given depcache "
# mvo: looping is too inefficient with the new auto-mark code
# for pkg in cache.Packages:
# depcache.MarkKeep(pkg)
depcache.init()
def saveDistUpgrade(cache, depcache):
""" this function mimics a upgrade but will never remove anything """
depcache.upgrade(True)
if depcache.del_count > 0:
clean(cache, depcache)
depcache.upgrade()
def isSecurityUpgrade(ver):
" check if the given version is a security update (or masks one) "
security_pockets = [("Ubuntu", "%s-security" % DISTRO),
("gNewSense", "%s-security" % DISTRO),
("Debian", "%s-updates" % DISTRO)]
for (file, index) in ver.file_list:
for origin, archive in security_pockets:
if (file.archive == archive and file.origin == origin):
return True
return False
def write_package_names(outstream, cache, depcache):
" write out package names that change to outstream "
pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg)
or depcache.marked_upgrade(pkg)]
outstream.write("\n".join([p.name for p in pkgs]))
def is_lts_distro():
" check if the current distro is LTS or not"
return distro_info.TrisquelDistroInfo().is_lts(DISTRO)
def write_human_readable_summary(outstream, upgrades, security_updates):
" write out human summary to outstream "
lts_distro = is_lts_distro()
outstream.write(
gettext.dngettext("update-notifier",
"%i update can be applied immediately.",
"%i updates can be applied immediately.",
upgrades) % upgrades
)
if security_updates > 0:
outstream.write("\n")
outstream.write(gettext.dngettext("update-notifier",
"%i of these updates is a "
"standard security update.",
"%i of these updates are "
"standard security updates.",
security_updates) %
security_updates)
def init():
" init the system, be nice "
# FIXME: do a ionice here too?
os.nice(19)
apt_pkg.init()
def run(options=None):
# we are run in "are security updates installed automatically?"
# question mode
if options.security_updates_unattended:
res = apt_pkg.config.find_i("APT::Periodic::Unattended-Upgrade", 0)
# print(res)
sys.exit(res)
# get caches
try:
cache = apt_pkg.Cache(apt.progress.base.OpProgress())
except SystemError as e:
sys.stderr.write("E: " + _("Error: Opening the cache (%s)") % e)
sys.exit(-1)
depcache = apt_pkg.DepCache(cache)
# read the synaptic pins too
if os.path.exists(SYNAPTIC_PINFILE):
depcache.read_pinfile(SYNAPTIC_PINFILE)
depcache.init()
if depcache.broken_count > 0:
sys.stderr.write("E: " + _("Error: BrokenCount > 0"))
sys.exit(-1)
# do the upgrade (not dist-upgrade!)
try:
saveDistUpgrade(cache, depcache)
except SystemError as e:
sys.stderr.write("E: " + _("Error: Marking the upgrade (%s)") % e)
sys.exit(-1)
# analyze the ugprade
upgrades = 0
security_updates = 0
# we need another cache that has more pkg details
with apt.Cache() as aptcache:
for pkg in cache.packages:
# skip packages that are not marked upgraded/installed
if not (depcache.marked_install(pkg)
or depcache.marked_upgrade(pkg)):
continue
# check if this is really a upgrade or a false positive
# (workaround for ubuntu #7907)
inst_ver = pkg.current_ver
cand_ver = depcache.get_candidate_ver(pkg)
if cand_ver == inst_ver:
continue
# check for security upgrades
if isSecurityUpgrade(cand_ver):
security_updates += 1
upgrades += 1
continue
# check to see if the update is a phased one
try:
from UpdateManager.Core.UpdateList import UpdateList
ul = UpdateList(None)
ignored = ul._is_ignored_phased_update(
aptcache[pkg.get_fullname()])
if ignored:
depcache.mark_keep(pkg)
continue
except ImportError:
pass
upgrades = upgrades + 1
# now check for security updates that are masked by a
# candidate version from another repo (-proposed or -updates)
for ver in pkg.version_list:
if (inst_ver
and apt_pkg.version_compare(ver.ver_str,
inst_ver.ver_str) <= 0):
continue
if isSecurityUpgrade(ver):
security_updates += 1
break
# print the number of upgrades
if options and options.show_package_names:
write_package_names(sys.stderr, cache, depcache)
elif options and options.readable_output:
write_human_readable_summary(sys.stdout, upgrades, security_updates)
else:
# print the number of regular upgrades and the number of
# security upgrades
sys.stderr.write("%s;%s" % (upgrades, security_updates))
# return the number of upgrades (if its used as a module)
return(upgrades, security_updates)
if __name__ == "__main__":
# setup a exception handler to make sure that uncaught stuff goes
# to the notifier
sys.excepthook = _handleException
# gettext
APP = "update-notifier"
DIR = "/usr/share/locale"
gettext.bindtextdomain(APP, DIR)
gettext.textdomain(APP)
# check arguments
parser = OptionParser()
parser.add_option("-p",
"--package-names",
action="store_true",
dest="show_package_names",
help=_("Show the packages that are "
"going to be installed/upgraded"))
parser.add_option("",
"--human-readable",
action="store_true",
dest="readable_output",
help=_("Show human readable output on stdout"))
parser.add_option("",
"--security-updates-unattended",
action="store_true",
help=_("Return the time in days when security updates "
"are installed unattended (0 means disabled)"))
(options, args) = parser.parse_args()
# run it
init()
run(options)
helpers/config
View file @ 980fc52d
...@@ -46,7 +46,7 @@ export DOMAIN=trisquel.info ...@@ -46,7 +46,7 @@ export DOMAIN=trisquel.info
export UPSTREAM=focal export UPSTREAM=focal
export UPSTREAMRELEASE=20.04 export UPSTREAMRELEASE=20.04
MIRROR=http://archive.ubuntu.com/ubuntu MIRROR=http://archive.ubuntu.com/ubuntu
LOCALMIRROR=https://archive.trisquel.org/trisquel LOCALMIRROR=http://archive.trisquel.org/trisquel
LOCAL_APT=`mktemp -d` LOCAL_APT=`mktemp -d`
if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then
...@@ -68,7 +68,12 @@ find ${@:3} -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -e ...@@ -68,7 +68,12 @@ find ${@:3} -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -e
changelog(){ changelog(){
head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
[ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports [ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports
#Name convention issue "+" breaking packages build like console-setup, using "-" instead.
if [ "$NAME_CI" = true ];then
echo | dch -D $REPO -v `pkgversion`-${REVISION}trisquel${VERSION} "$1"
else
echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1" echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1"
fi
# Make sure the changelog file is identical between archs # Make sure the changelog file is identical between archs
/bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog
......
helpers/make-a11y-profile-manager
View file @ 980fc52d
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=4 VERSION=5
. ./config . ./config
sed 's/OnlyShowIn=Unity;/OnlyShowIn=Unity;MATE;/' -i a11y-profile-manager-indicator-autostart.desktop.in sed 's/OnlyShowIn=Unity;/OnlyShowIn=Unity;MATE;/' -i a11y-profile-manager-indicator-autostart.desktop.in
sed 's/GSettings.*/GSettings org.mate.interface accessibility/' -i a11y-profile-manager-indicator-autostart.desktop.in
cat << EOF >> profiles/blindness/profile.gsettings cat << EOF >> profiles/blindness/profile.gsettings
......
helpers/make-base-files
View file @ 980fc52d
...@@ -17,11 +17,12 @@ ...@@ -17,11 +17,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=4 VERSION=5
. ./config . ./config
CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g") CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g")
POINT_RELEASE=".1"
# Disable dynamic motd # Disable dynamic motd
find -name *motd-news* -delete find -name *motd-news* -delete
...@@ -85,28 +86,28 @@ fi ...@@ -85,28 +86,28 @@ fi
EOF EOF
cat > etc/issue <<EOF cat > etc/issue <<EOF
Trisquel GNU/Linux $REVISION \n \l Trisquel GNU/Linux $REVISION$POINT_RELEASE \n \l
EOF EOF
cat > etc/issue.net <<EOF cat > etc/issue.net <<EOF
Trisquel GNU/Linux $REVISION Trisquel GNU/Linux $REVISION$POINT_RELEASE
EOF EOF
cat > etc/lsb-release <<EOF cat > etc/lsb-release <<EOF
DISTRIB_ID=Trisquel DISTRIB_ID=Trisquel
DISTRIB_RELEASE=$REVISION DISTRIB_RELEASE=$REVISION$POINT_RELEASE
DISTRIB_CODENAME=$CODENAME DISTRIB_CODENAME=$CODENAME
DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS" DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION$POINT_RELEASE, $CODENAMECAPS"
EOF EOF
cat > etc/os-release <<EOF cat > etc/os-release <<EOF
NAME="Trisquel GNU/Linux" NAME="Trisquel GNU/Linux"
VERSION="$REVISION, $CODENAMECAPS" VERSION="$REVISION$POINT_RELEASE, $CODENAMECAPS"
ID=trisquel ID=trisquel
ID_LIKE=debian ID_LIKE=debian
PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION)" PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION$POINT_RELEASE)"
VERSION_ID="$REVISION" VERSION_ID="$REVISION$POINT_RELEASE"
VERSION_CODENAME="$CODENAME" VERSION_CODENAME="$CODENAME"
UBUNTU_CODENAME="$UPSTREAM" UBUNTU_CODENAME="$UPSTREAM"
HOME_URL="https://trisquel.info/" HOME_URL="https://trisquel.info/"
......