From: Michael McMahon Date: Wed, 27 Mar 2024 18:32:48 +0000 (-0400) Subject: Fix validation notices and GPL notices. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a5bab74e524ac90493d9f920a59f3cb2d6d8883b;p=libreplanet-static.git Fix validation notices and GPL notices. --- diff --git a/2016/Makefile b/2016/Makefile index ff13f6d7..154b957b 100644 --- a/2016/Makefile +++ b/2016/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Free Software Foundation +# Copyright (C) 2016 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff --git a/2017/Makefile b/2017/Makefile index f49075be..a59d3877 100644 --- a/2017/Makefile +++ b/2017/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Free Software Foundation +# Copyright (C) 2016-2017 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff --git a/2018/Makefile b/2018/Makefile index dff644a3..18a99364 100644 --- a/2018/Makefile +++ b/2018/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Free Software Foundation +# Copyright (C) 2016-2018 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff --git a/2019/Makefile b/2019/Makefile index 8da11212..0e9bd2dd 100644 --- a/2019/Makefile +++ b/2019/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Free Software Foundation +# Copyright (C) 2016-2019 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as diff --git a/2020/Makefile b/2020/Makefile index a3a9426b..741ed1ae 100644 --- a/2020/Makefile +++ b/2020/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2020 Free Software Foundation +# Copyright (C) 2016-2020 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -20,10 +20,10 @@ all: wikipages: $(shell ../markdown-convert.sh $<) -speakers: +speakers: curl -s https://my.fsf.org/lp-talk/30| sed -n 's=/lp-talk/30=/2020/speakers/=g; s=/lp-schedule-2020=/2020/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-bios.html -sessions: +sessions: curl -s https://my.fsf.org/lp-schedule-2020| sed -n 's=/lp-talk/30=/2020/speakers/=g; s=/lp-schedule-2020=/2020/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-sessions.html clean: diff --git a/2021/Makefile b/2021/Makefile index 88524142..b6041fc0 100644 --- a/2021/Makefile +++ b/2021/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2021 Free Software Foundation +# Copyright (C) 2016-2021 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -20,10 +20,10 @@ all: wikipages: $(shell ../markdown-convert.sh $<) -speakers: +speakers: curl -4 -s https://my.fsf.org/lp-talk/42| sed -n 's=/lp-talk/42=/2021/speakers/=g; s=/lp-schedule/42=/2021/program/=g; s=
=
=g; s=DSC_4706 copy=DSC_4706%20copy=g; s=sopkin (=sopkin%20(=g; s=speakerpic\" src=speakerpic\" alt\="Picture of speaker.\" src=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-bios.html -sessions: +sessions: curl -4 -s https://my.fsf.org/lp-schedule/42| sed -n 's=/lp-talk/42=/2021/speakers/=g; s=/lp-schedule/42=/2021/program/=g; s=
=
=g; s=DSC_4706 copy=DSC_4706%20copy=g; s=sopkin (=sopkin%20(=g; s=speakers/#5421=fun/#lightning-talks=g; s=speakerpic\" src=speakerpic\" alt\="Picture of speaker.\" src=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-sessions.html clean: diff --git a/2022/Makefile b/2022/Makefile index 1194c54a..2dd6b416 100644 --- a/2022/Makefile +++ b/2022/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2022 Free Software Foundation +# Copyright (C) 2016-2022 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -20,10 +20,10 @@ all: wikipages: $(shell ../markdown-convert.sh $<) -speakers: +speakers: curl -s https://my.fsf.org/lp-talk/47| sed -n 's=/lp-talk/47=/2022/speakers/=g; s=/lp-schedule/47=/2022/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-bios.html -sessions: +sessions: curl -s https://my.fsf.org/lp-schedule/| sed -n 's=/lp-talk/47=/2022/speakers/=g; s=/lp-schedule/47=/2022/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-sessions.html clean: diff --git a/2023/Makefile b/2023/Makefile index beadf8e8..1eff41f5 100644 --- a/2023/Makefile +++ b/2023/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2023 Free Software Foundation +# Copyright (C) 2016-2023 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -20,10 +20,10 @@ all: wikipages: $(shell ../markdown-convert.sh $<) -speakers: +speakers: curl -s https://my.fsf.org/lp-talk/55| sed -n 's=/lp-talk/55=/2023/speakers/=g; s=/lp-schedule/55=/2023/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' | sed -e '2,29d' > includes/generated-bios.html -sessions: +sessions: curl -s https://my.fsf.org/lp-schedule/| sed -n 's=/lp-talk/55=/2023/speakers/=g; s=/lp-schedule/55=/2023/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-sessions.html clean: diff --git a/2024/Makefile b/2024/Makefile index c21640f6..ce78ca68 100644 --- a/2024/Makefile +++ b/2024/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2024 Free Software Foundation +# Copyright (C) 2016-2024 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -21,7 +21,7 @@ wikipages: $(shell ../markdown-convert.sh $<) speakers: - curl -s https://my.fsf.org/lp-talk/62| sed -n 's=/lp-talk/55=/2024/speakers/=g; s=/lp-schedule/55=/2023/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' | sed -e '2,29d' > includes/generated-bios.html + curl -s https://my.fsf.org/lp-talk/62| sed -n 's=/lp-talk/55=/2024/speakers/=g; s=/lp-schedule/55=/2023/program/=g; s=
=
=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' | sed -e '2,29d' > includes/generated-bios.html sessions: curl -s https://my.fsf.org/lp-schedule/| sed -n 's=/lp-talk/62=/2024/speakers/=g; s=/lp-schedule/55=/2023/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-sessions.html diff --git a/2024/includes/join-list.html b/2024/includes/join-list.html index c691dfe5..296f9c85 100644 --- a/2024/includes/join-list.html +++ b/2024/includes/join-list.html @@ -5,11 +5,11 @@ method="post" name="Edit" id="Edit">
+ value="https://libreplanet.org/2024/confirmation.html"> - - + value="https://my.fsf.org/civicrm/profile?reset=1&gid=507"> + +
@@ -36,11 +36,11 @@
- +

diff --git a/2024/program/app.html b/2024/program/app.html index 0b17bef5..c9499970 100644 --- a/2024/program/app.html +++ b/2024/program/app.html @@ -6,13 +6,12 @@

Program Other ways to use the schedule

-

Install the Giggity app on Replicant or Android. The LibrePlanet 2024 schedule will appear at the top of the app's home screen.

+

Install the Giggity app on Replicant or Android. The LibrePlanet 2024 schedule will appear at the top of the app's home screen.

Download the calendar file (free iCal format) from https://libreplanet.org/2024/lp2024-schedule.ics and import it to any calendar program. On Replicant and Android devices, you can subscribe to the calendar file with Etar and ICSdroid (the Libreplanet schedule must show up in the “Agenda” view on Etar).

We recommend you install Android/Replicant apps from the F-Droid free software app repository instead of the Google Play store.

- -
+
diff --git a/2024/tv/index.html b/2024/tv/index.html index 001e0571..2d968304 100755 --- a/2024/tv/index.html +++ b/2024/tv/index.html @@ -1,11 +1,11 @@ - - + + Notice from #LibrePlanet - +