diff options
Diffstat (limited to 'scite')
-rw-r--r-- | scite/debian/_service | 4 | ||||
-rw-r--r-- | scite/debian/changelog | 17 | ||||
-rw-r--r-- | scite/debian/patches/0001-do_not_use_remote_logo.patch | 7 | ||||
-rw-r--r-- | scite/debian/patches/0002-reproducible_build.patch | 4 | ||||
-rw-r--r-- | scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch | 2 | ||||
-rw-r--r-- | scite/debian/scite+stackrpms.dsc | 2 | ||||
-rw-r--r-- | scite/stackrpms-5.4.1-1.diff (renamed from scite/stackrpms-5.3.6-1.diff) | 308 |
7 files changed, 285 insertions, 59 deletions
diff --git a/scite/debian/_service b/scite/debian/_service index a4fd393..6cdaf86 100644 --- a/scite/debian/_service +++ b/scite/debian/_service @@ -14,8 +14,8 @@ <service name="download_url"> <param name="protocol">https</param> <param name="host">www.scintilla.org</param> - <param name="path">scite540.tgz</param> - <param name="filename">scite_5.4.0.orig.tar.gz</param> + <param name="path">scite541.tgz</param> + <param name="filename">scite_5.4.1.orig.tar.gz</param> </service> <service name="extract_file"> <param name="archive">*.tar.xz</param> diff --git a/scite/debian/changelog b/scite/debian/changelog index 47a49f8..3ba3778 100644 --- a/scite/debian/changelog +++ b/scite/debian/changelog @@ -1,15 +1,18 @@ -scite (5.4.0-101+stackrpms) unstable; urgency=medium +scite (5.4.1-100+stackrpms) unstable; urgency=medium - * Fix stackrpms.lua date functions for lua float to int + * Add stackrpms lua script and customized global.properties + * Use lua 5.4.4 - -- B. Stack <bgstack15@gmail.com> Tue, 05 Dec 2023 10:48:03 -0500 + -- B. Stack <bgstack15@gmail.com> Sat, 30 Dec 2023 15:15:35 -0500 -scite (5.4.0-100+stackrpms) unstable; urgency=medium +scite (5.4.1-1) unstable; urgency=medium - * Add stackrpms lua script and customized global.properties - * Use lua 5.4.4 + * New upstream release. + * Update the d/copyright file. + * debian/patches: + - Refresh all patches. - -- B. Stack <bgstack15@gmail.com> Mon, 04 Dec 2023 15:35:16 -0500 + -- Antonio Valentino <antonio.valentino@tiscali.it> Thu, 28 Dec 2023 09:13:01 +0000 scite (5.4.0-1) unstable; urgency=medium diff --git a/scite/debian/patches/0001-do_not_use_remote_logo.patch b/scite/debian/patches/0001-do_not_use_remote_logo.patch index d6eeaac..6884d80 100644 --- a/scite/debian/patches/0001-do_not_use_remote_logo.patch +++ b/scite/debian/patches/0001-do_not_use_remote_logo.patch @@ -1,3 +1,4 @@ + From: Antonio Valentino <antonio.valentino@tiscali.it> Date: Sat, 14 Apr 2018 17:39:34 +0000 Subject: Fix the "privacy-breach-logo" error detected by lintian @@ -9,7 +10,7 @@ Subject: Fix the "privacy-breach-logo" error detected by lintian 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html -index 258df4a..0d4c8c4 100644 +index ef2dcfd..8a6c30e 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -177,20 +177,7 @@ if (!IsRemote()) { //if NOT remote... @@ -35,10 +36,10 @@ index 258df4a..0d4c8c4 100644 </html> diff --git a/scite/doc/SciTE.html b/scite/doc/SciTE.html -index 3e1709c..4f5017e 100644 +index 1444d0f..06a1665 100644 --- a/scite/doc/SciTE.html +++ b/scite/doc/SciTE.html -@@ -142,20 +142,7 @@ if (IsRemote()) { +@@ -141,20 +141,7 @@ if (IsRemote()) { <a href="https://sourceforge.net/project/showfiles.php?group_id=2439">the downloads page</a>. </p> There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a> hosted on diff --git a/scite/debian/patches/0002-reproducible_build.patch b/scite/debian/patches/0002-reproducible_build.patch index d91ff9b..717a6c0 100644 --- a/scite/debian/patches/0002-reproducible_build.patch +++ b/scite/debian/patches/0002-reproducible_build.patch @@ -8,10 +8,10 @@ Subject: Allow reproducible build 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scite/src/Credits.cxx b/scite/src/Credits.cxx -index 7489bf2..3e8ff89 100644 +index 19bf5d3..b20a895 100644 --- a/scite/src/Credits.cxx +++ b/scite/src/Credits.cxx -@@ -619,7 +619,7 @@ void SciTEBase::SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle +@@ -622,7 +622,7 @@ void SciTEBase::SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle } AddStyledText(wsci, GetTranslationToAbout("Version"), trsSty); AddStyledText(wsci, sVersion, 1); diff --git a/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch b/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch index b1ae8b7..5267ee0 100644 --- a/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch +++ b/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch @@ -9,7 +9,7 @@ Forwarded: not-needed 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/scite/gtk/deps.mak b/scite/gtk/deps.mak -index 919cba9..af4432a 100644 +index 5974f52..7ba925d 100644 --- a/scite/gtk/deps.mak +++ b/scite/gtk/deps.mak @@ -267,11 +267,7 @@ LuaExtension.o: \ diff --git a/scite/debian/scite+stackrpms.dsc b/scite/debian/scite+stackrpms.dsc index 2d9d335..555e862 100644 --- a/scite/debian/scite+stackrpms.dsc +++ b/scite/debian/scite+stackrpms.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: scite Binary: scite Architecture: any -Version: 5.4.0-101+stackrpms +Version: 5.4.1-101+stackrpms Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://scintilla.org/SciTE.html Standards-Version: 4.6.0.1 diff --git a/scite/stackrpms-5.3.6-1.diff b/scite/stackrpms-5.4.1-1.diff index 0dd4617..d5c128f 100644 --- a/scite/stackrpms-5.3.6-1.diff +++ b/scite/stackrpms-5.4.1-1.diff @@ -1,20 +1,20 @@ diff -x '.*.swp' -Naur salsa/scite/debian/changelog stackrpms/scite/debian/changelog ---- salsa/scite/debian/changelog 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/changelog 2023-07-31 11:43:29.887385771 -0400 +--- salsa/scite/debian/changelog 2023-12-30 15:10:24.740185203 -0500 ++++ stackrpms/scite/debian/changelog 2023-12-30 15:15:37.874140024 -0500 @@ -1,3 +1,10 @@ -+scite (5.3.6-1+stackrpms) unstable; urgency=medium ++scite (5.4.1-100+stackrpms) unstable; urgency=medium + + * Add stackrpms lua script and customized global.properties + * Use lua 5.4.4 + -+ -- B. Stack <bgstack15@gmail.com> Wed, 08 Feb 2023 10:22:16 -0500 ++ -- B. Stack <bgstack15@gmail.com> Sat, 30 Dec 2023 15:15:35 -0500 + - scite (5.3.6-1) unstable; urgency=medium + scite (5.4.1-1) unstable; urgency=medium - * Upload to unstable + * New upstream release. diff -x '.*.swp' -Naur salsa/scite/debian/control stackrpms/scite/debian/control --- salsa/scite/debian/control 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/control 2023-07-24 15:09:45.108793400 -0400 ++++ stackrpms/scite/debian/control 2023-08-19 17:16:15.202653929 -0400 @@ -1,14 +1,13 @@ Source: scite -Maintainer: Michael Vogt <mvo@debian.org> @@ -33,31 +33,260 @@ diff -x '.*.swp' -Naur salsa/scite/debian/control stackrpms/scite/debian/control Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/debian/scite Vcs-Git: https://salsa.debian.org/debian/scite.git -diff -x '.*.swp' -Naur salsa/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch ---- salsa/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch 2023-07-24 15:09:45.112793445 -0400 -@@ -33,8 +33,8 @@ +diff -x '.*.swp' -Naur salsa/scite/debian/copyright stackrpms/scite/debian/copyright +--- salsa/scite/debian/copyright 2023-12-30 15:10:24.740185203 -0500 ++++ stackrpms/scite/debian/copyright 2023-10-08 18:24:14.164347508 -0400 +@@ -4,26 +4,43 @@ + Source: http://scintilla.sourceforge.net/SciTEDownload.html + + Files: * +-Copyright: 1998-2022, Neil Hodgson <neilh@scintilla.org> ++Copyright: 1998-2014, Neil Hodgson <neilh@scintilla.org> + License: scintilla + + Files: debian/* + Copyright: 2000-2002, Aubin Paul <aubin@debian.org> + 2002-2013, Michael Vogt <mvo@debian.org> +- 2013-2023, Antonio Valentino <antonio.valentino@tiscali.it> ++ 2013-2022, Antonio Valentino <antonio.valentino@tiscali.it> + 2018-2023, Andreas Rönnquist <gusnan@debian.org> + License: GPL-3.0+ + + Files: scite/lua/* +-Copyright: 1994-2017, Tecgraf, PUC-Rio, Lua.org ++Copyright: 1994-2003, Tecgraf, PUC-Rio + License: Expat ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of this software and associated documentation files (the "Software"), to deal ++ in the Software without restriction, including without limitation the rights ++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ copies of the Software, and to permit persons to whom the Software is ++ furnished to do so, subject to the following conditions: ++ . ++ The above copyright notice and this permission notice shall be included in ++ all copies or substantial portions of the Software. ++ . ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++ THE SOFTWARE. + + Files: lexilla/lexers/LexRuby.cxx + Copyright: 2001-, Clemens Wyss <wys@helbling.ch> + License: scintilla + + Files: lexilla/lexers/LexBaan.cxx +-Copyright: 2001-, Vamsi Potluru <vamsi@who.net> ++Copyright: 2001-, Vamsi Potluru <vamsi@who.net>, + 2001-, Praveen Ambekar <ambekarpraveen@yahoo.com> + License: scintilla + +@@ -81,6 +98,11 @@ + Copyright: 2002, Scott Kirkwood + License: scintilla + ++Files: scite/src/Credits.cxx ++Copyright: 1998, Dean S. Jones ++ 1998-2011, Neil Hodgson <neilh@scintilla.org> ++License: scintilla ++ + Files: scite/gtk/pixmapsGNOME.h + Copyright: 1998, Dean S. Jones + License: scintilla +@@ -91,27 +113,20 @@ + + Files: scintilla/cocoa/PlatCocoa.h + scintilla/cocoa/InfoBarCommunicator.h +- scintilla/cocoa/ScintillaTest/AppController.* ++ scintilla/cocoa/ScintillaTest/AppController.h + scintilla/cocoa/ScintillaTest/main.m +- scintilla/cocoa/InfoBar.* ++ scintilla/cocoa/InfoBar.h + scintilla/cocoa/ScintillaCocoa.h + Copyright: 2009, Sun Microsystems, Inc. + License: LGPL-2.1 + +-Files: scintilla/cocoa/PlatCocoa.mm +- scintilla/cocoa/ScintillaCocoa.mm +-Copyright: 1998-2002, Neil Hodgson <neilh@scintilla.org> +- 2002-2003, Evan Jones <ejones@uwaterloo.ca> +- 2009-2010, Sun Microsystems, Inc. +-License: LGPL-2.1 +- +-Files: scintilla/cocoa/ScintillaView.* ++Files: scintilla/cocoa/ScintillaView.h + Copyright: 2009, 2011, Sun Microsystems, Inc. + 2011, 2013, Oracle and/or its affiliates + License: LGPL-2.1 + + Files: lexilla/lexers/LexPLM.cxx +-Copyright: 1990-2007, Scientific Toolworks, Inc. ++Copyright: 1990-2007, Scientific Toolworks, Inc + License: scintilla + + Files: scintilla/qt/ScintillaEditBase/PlatQt.* +@@ -165,7 +180,7 @@ + License: scintilla + + Files: lexilla/lexers/LexD.cxx +-Copyright: 1998-2005, Neil Hodgson <neilh@scintilla.org> ++Copyright: 1998-2005, by Neil Hodgson <neilh@scintilla.org> + 2006, Waldemar Augustyn <waldemar@wdmsys.com> + License: scintilla + +@@ -184,67 +199,17 @@ + License: scintilla + + Files: lexilla/lexers/LexProgress.cxx +-Copyright: 2006-2016, Yuval Papish <Yuval@YuvCom.com> ++Copyright: 2006-2007, Yuval Papish <Yuval@YuvCom.com> + License: scintilla + +-Files: scite/src/JobQueue.* ++Files: scite/src/JobQueue.cxx + Copyright: 1998-2003, Neil Hodgson <neilh@scintilla.org> +- 2007, Neil Hodgson <neilh@scintilla.org> ++ 2007, Neil Hodgson <neilh@scintilla.org>, + April White <april_white@sympatico.ca> + License: scintilla + +-Files: scintilla/gtk/ScintillaGTKAccessible.* +-Copyright: 2016, Colomban Wendling <colomban@geany.org> +-License: scintilla +- +-Files: lexilla/lexers/LexRaku.cxx +-Copyright: 1998-2005, Neil Hodgson <neilh@scintilla.org> +- 2019, Mark Reay <mark@reay.net.au> +-License: scintilla +- +-Files: lexilla/examples/CheckLexilla/CheckLexilla.c +- lexilla/examples/SimpleLexer/SimpleLexer.cxx +- lexilla/lexlib/StyleContext.* +-Copyright: 1998-2004, Neil Hodgson <neilh@scintilla.org> +- 2021, Neil Hodgson <neilh@scintilla.org> +-License: public-domain +- +-Files: lexilla/src/Lexilla/Info.plist +- scintilla/cocoa/Scintilla/Info.plist +-Copyright: 2020, Neil Hodgson. +-License: scintilla +- +-Files: lexilla/test/examples/inno/x.iss +- lexilla/test/examples/inno/x.iss.folded +-Copyright: 1999, app corporation +-License: scintilla +- +-Files: scintilla/src/RESearch.h +- scite/doc/SciTERegEx.html +-Copyright: 1998-2022, Neil Hodgson <neilh@scintilla.org> +-License: public-domain +- +-Files: lexilla/lexers/LexMaxima.cxx +-Copyright: 2018, Gunter K\xonigsmann <wxMaxima@physikbuch.de> +-License: scintilla +- +-Files: scite/doc/SciTELua.html +-Copyright: 1994-2007, Lua.org, PUC-Rio +-License: Expat +- +-Files: lexilla/lexers/LexFSharp.cxx +-Copyright: 2021, Robert Di Pardo <dipardo.r@gmail.com> +-License: scintilla +- +-Files: lexilla/lexers/LexBibTeX.cxx +-Copyright: 2008-2010, Sergiu Dotenco +-License: scintilla +- +-Files: lexilla/test/unit/* +- scintilla/test/unit/* +-Copyright: 2021, Two Blue Cubes Ltd. +-License: BSL-1.0 +- ++Files: scintilla/test/unit/catch.hpp ++Copyright: 2012, Two Blue Cubes Ltd. + License: BSL-1.0 + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by +@@ -315,31 +280,3 @@ + WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + OR PERFORMANCE OF THIS SOFTWARE. +- +-License: Expat +- Permission is hereby granted, free of charge, to any person obtaining a copy +- of this software and associated documentation files (the "Software"), to deal +- in the Software without restriction, including without limitation the rights +- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +- copies of the Software, and to permit persons to whom the Software is +- furnished to do so, subject to the following conditions: +- . +- The above copyright notice and this permission notice shall be included in +- all copies or substantial portions of the Software. +- . +- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +- THE SOFTWARE. +- +-License: public-domain +- This source code is offered for use in the public domain. You may +- use, modify or distribute it freely. +- . +- This code is distributed in the hope that it will be useful but +- WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY +- DISCLAIMED. This includes but is not limited to warranties of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +diff -x '.*.swp' -Naur salsa/scite/debian/.gitlab-ci.yml stackrpms/scite/debian/.gitlab-ci.yml +--- salsa/scite/debian/.gitlab-ci.yml 2023-12-04 15:32:55.368321693 -0500 ++++ stackrpms/scite/debian/.gitlab-ci.yml 1969-12-31 19:00:00.000000000 -0500 +@@ -1,6 +0,0 @@ +---- +-include: +- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml +- +-variables: +- SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1 +diff -x '.*.swp' -Naur salsa/scite/debian/patches/0001-do_not_use_remote_logo.patch stackrpms/scite/debian/patches/0001-do_not_use_remote_logo.patch +--- salsa/scite/debian/patches/0001-do_not_use_remote_logo.patch 2023-12-30 15:10:24.740185203 -0500 ++++ stackrpms/scite/debian/patches/0001-do_not_use_remote_logo.patch 2023-12-30 15:17:43.278909286 -0500 +@@ -1,3 +1,4 @@ ++ + From: Antonio Valentino <antonio.valentino@tiscali.it> + Date: Sat, 14 Apr 2018 17:39:34 +0000 + Subject: Fix the "privacy-breach-logo" error detected by lintian +diff -x '.*.swp' -Naur salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch +--- salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2023-12-30 15:10:24.740185203 -0500 ++++ stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2023-12-30 15:19:51.963698684 -0500 +@@ -36,9 +36,9 @@ + -# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. -CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) -CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) - +# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. +-+# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. -+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.3) -+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.3) +++# stackrpms,3 For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. ++CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.4) ++CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.4) gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null) ifndef prefix ifdef gnomeprefix diff -x '.*.swp' -Naur salsa/scite/debian/patches/series stackrpms/scite/debian/patches/series ---- salsa/scite/debian/patches/series 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/patches/series 2023-07-24 15:09:45.112793445 -0400 +--- salsa/scite/debian/patches/series 2023-12-04 15:32:55.372321741 -0500 ++++ stackrpms/scite/debian/patches/series 2023-12-04 15:38:46.404536881 -0500 @@ -2,3 +2,4 @@ - 0003-reproducible_build.patch - 0005-scite-desktop.patch - 0007-Build-with-Debian-packaged-Lua.patch + 0002-reproducible_build.patch + 0003-scite-desktop.patch + 0004-Build-with-Debian-packaged-Lua.patch +use-lua5.4.4.patch diff -x '.*.swp' -Naur salsa/scite/debian/patches/use-lua5.4.4.patch stackrpms/scite/debian/patches/use-lua5.4.4.patch --- salsa/scite/debian/patches/use-lua5.4.4.patch 1969-12-31 19:00:00.000000000 -0500 -+++ stackrpms/scite/debian/patches/use-lua5.4.4.patch 2023-07-24 15:09:45.112793445 -0400 ++++ stackrpms/scite/debian/patches/use-lua5.4.4.patch 2023-08-19 17:16:15.202653929 -0400 @@ -0,0 +1,191 @@ +Name: Patch scite to use distro package of lua, Devuan +Version: 5.2.3 @@ -252,11 +481,12 @@ diff -x '.*.swp' -Naur salsa/scite/debian/patches/use-lua5.4.4.patch stackrpms/s + diff -x '.*.swp' -Naur salsa/scite/debian/rules stackrpms/scite/debian/rules --- salsa/scite/debian/rules 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/rules 2023-07-24 15:09:45.112793445 -0400 -@@ -43,6 +43,8 @@ ++++ stackrpms/scite/debian/rules 2023-11-16 10:46:15.103687617 -0500 +@@ -43,6 +43,9 @@ mv -f $(CURDIR)/debian/scite/usr/share/scite/*.txt $(CURDIR)/debian/scite/usr/share/doc/scite/ mv -f $(CURDIR)/debian/scite/usr/share/scite/*.jpg $(CURDIR)/debian/scite/usr/share/doc/scite/ mv -f $(CURDIR)/debian/scite/usr/share/scite/*.png $(CURDIR)/debian/scite/usr/share/doc/scite/ ++ @#stackrpms,3 + cp -p debian/stackrpms.lua $(CURDIR)/debian/scite/usr/share/scite/ + install -D -p -m0666 debian/SciTEGlobal.properties $(CURDIR)/debian/scite/etc/scite/ for f in $(CURDIR)/debian/scite/usr/share/doc/scite/*.html; do \ @@ -264,7 +494,7 @@ diff -x '.*.swp' -Naur salsa/scite/debian/rules stackrpms/scite/debian/rules done diff -x '.*.swp' -Naur salsa/scite/debian/SciTEGlobal.properties stackrpms/scite/debian/SciTEGlobal.properties --- salsa/scite/debian/SciTEGlobal.properties 1969-12-31 19:00:00.000000000 -0500 -+++ stackrpms/scite/debian/SciTEGlobal.properties 2023-07-24 15:09:45.108793400 -0400 ++++ stackrpms/scite/debian/SciTEGlobal.properties 2023-08-19 17:16:15.202653929 -0400 @@ -0,0 +1,597 @@ +# SciTEGlobal.properties placed by scite package for stackrpms +# Global initialisation file for SciTE @@ -863,23 +1093,15 @@ diff -x '.*.swp' -Naur salsa/scite/debian/SciTEGlobal.properties stackrpms/scite +font.embedded.base=$(font.monospace) +font.embedded.comment=$(font.monospace) +font.vbs=$(font.monospace) -diff -x '.*.swp' -Naur salsa/scite/debian/scite.lintian-overrides stackrpms/scite/debian/scite.lintian-overrides ---- salsa/scite/debian/scite.lintian-overrides 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/scite.lintian-overrides 2023-07-24 15:09:45.112793445 -0400 -@@ -1,3 +1,4 @@ -+scite: spelling-error-in-binary afe safe [usr/lib/scite/liblexilla.so] - scite: spelling-error-in-binary Lables Labels [usr/lib/scite/liblexilla.so] - scite: national-encoding [etc/scite/SciTEGlobal.properties] - scite: national-encoding [etc/scite/rebol.properties] diff -x '.*.swp' -Naur salsa/scite/debian/scite+stackrpms.dsc stackrpms/scite/debian/scite+stackrpms.dsc --- salsa/scite/debian/scite+stackrpms.dsc 1969-12-31 19:00:00.000000000 -0500 -+++ stackrpms/scite/debian/scite+stackrpms.dsc 2023-07-31 11:39:01.959970617 -0400 ++++ stackrpms/scite/debian/scite+stackrpms.dsc 2023-12-30 15:13:07.653174943 -0500 @@ -0,0 +1,17 @@ +Format: 3.0 (quilt) +Source: scite +Binary: scite +Architecture: any -+Version: 5.3.6-1+stackrpms ++Version: 5.4.1-101+stackrpms +Maintainer: B. Stack <bgstack15@gmail.com> +Homepage: https://scintilla.org/SciTE.html +Standards-Version: 4.6.0.1 @@ -894,12 +1116,12 @@ diff -x '.*.swp' -Naur salsa/scite/debian/scite+stackrpms.dsc stackrpms/scite/de +Original-Maintainer: Michael Vogt <mvo@debian.org> diff -x '.*.swp' -Naur salsa/scite/debian/_service stackrpms/scite/debian/_service --- salsa/scite/debian/_service 1969-12-31 19:00:00.000000000 -0500 -+++ stackrpms/scite/debian/_service 2023-07-31 11:39:31.740350213 -0400 ++++ stackrpms/scite/debian/_service 2023-12-30 16:00:57.538977498 -0500 @@ -0,0 +1,24 @@ +<services> + <service name="tar_scm"> + <param name="scm">git</param> -+ <param name="url">https://bgstack15.ddns.net/git/stackrpms</param> ++ <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param> + <param name="subdir">scite/debian</param> + <param name="filename">debian</param> + <param name="revision">master</param> @@ -912,8 +1134,8 @@ diff -x '.*.swp' -Naur salsa/scite/debian/_service stackrpms/scite/debian/_servi + <service name="download_url"> + <param name="protocol">https</param> + <param name="host">www.scintilla.org</param> -+ <param name="path">scite536.tgz</param> -+ <param name="filename">scite_5.3.6.orig.tar.gz</param> ++ <param name="path">scite541.tgz</param> ++ <param name="filename">scite_5.4.1.orig.tar.gz</param> + </service> + <service name="extract_file"> + <param name="archive">*.tar.xz</param> @@ -922,18 +1144,18 @@ diff -x '.*.swp' -Naur salsa/scite/debian/_service stackrpms/scite/debian/_servi +</services> diff -x '.*.swp' -Naur salsa/scite/debian/source/lintian-overrides stackrpms/scite/debian/source/lintian-overrides --- salsa/scite/debian/source/lintian-overrides 2023-07-31 11:35:56.033600691 -0400 -+++ stackrpms/scite/debian/source/lintian-overrides 2023-07-24 15:09:45.112793445 -0400 -@@ -1,4 +1,3 @@ --scite source: source-is-missing [scintilla/doc/ScintillaDoc.html] --scite source: source-is-missing [scite/doc/PaneAPI.html] --scite source: source-is-missing [scite/doc/ScriptLexer.html] --scite source: source-is-missing [scintilla/doc/SciCoding.html] ++++ stackrpms/scite/debian/source/lintian-overrides 2023-11-16 10:48:03.029007946 -0500 +@@ -2,3 +2,7 @@ + scite source: source-is-missing [scite/doc/PaneAPI.html] + scite source: source-is-missing [scite/doc/ScriptLexer.html] + scite source: source-is-missing [scintilla/doc/SciCoding.html] ++# stackrpms,4 +national-encoding debian/SciTEGlobal.properties +invalid-field-for-derivative +invalid-devuan-version diff -x '.*.swp' -Naur salsa/scite/debian/stackrpms.lua stackrpms/scite/debian/stackrpms.lua --- salsa/scite/debian/stackrpms.lua 1969-12-31 19:00:00.000000000 -0500 -+++ stackrpms/scite/debian/stackrpms.lua 2023-07-24 15:09:45.112793445 -0400 ++++ stackrpms/scite/debian/stackrpms.lua 2023-12-05 10:46:44.350737070 -0500 @@ -0,0 +1,278 @@ +-- DESCRIPTION: +-- Unicode hexadecimal table: https://example.com/copied/unicode.html @@ -1204,7 +1426,7 @@ diff -x '.*.swp' -Naur salsa/scite/debian/stackrpms.lua stackrpms/scite/debian/s +-- %y two-digit year (98) [00-99] +-- %% the character '%' +function InsertDateAH() -+ local dow = tostring(os.date("%w") + 1) ++ local dow = tostring(math.floor(os.date("%w") + 1)) + local d1 = os.date("%Y-%m-%d-") + local d2 = os.date(" %H:%M") + editor:AddText(d1..dow..d2) |