Merge branch 'scite-bump' into 'master'

scite 5.3.3 dpkg rc1

See merge request bgstack15/stackrpms!339

6 files changed, 82 insertions, 57 deletions

diff --git a/scite/debian/_service b/scite/debian/_service
index 6c8324c..51ecbaa 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">scite532.tgz</param>
-      <param name="filename">scite_5.3.2.orig.tar.gz</param>
+      <param name="path">scite533.tgz</param>
+      <param name="filename">scite_5.3.3.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 4072cdd..b90fa23 100644
--- a/scite/debian/changelog
+++ b/scite/debian/changelog
@@ -1,17 +1,17 @@
-scite (5.3.2-2+stackrpms) unstable; urgency=low
+scite (5.3.3-1+stackrpms) unstable; urgency=medium
 
-  * [dpkg]
-    * update scite globalproperties
-    * use stackrpms name now
+  * Add stackrpms lua script and customized global.properties
+  * Use lua 5.4.4
 
- -- B. Stack <bgstack15@gmail.com>  Mon, 09 Jan 2023 13:43:02 -0500
+ -- B. Stack <bgstack15@gmail.com>  Wed, 08 Feb 2023 10:22:16 -0500
 
-scite (5.3.2-1+devuan) unstable; urgency=medium
+scite (5.3.3-1) unstable; urgency=medium
 
-  * Add stackrpms lua script and customized global.properties
-  * Use lua 5.4.4
+  * New upstream version 5.3.3
+  * Update copyright year for debian packaging
+  * Upgrade Standards Version to 4.6.2 (No changes required)
 
- -- B. Stack <bgstack15@gmail.com>  Thu, 08 Dec 2022 09:00:05 -0500
+ -- Andreas Rönnquist <gusnan@debian.org>  Wed, 08 Feb 2023 00:11:51 +0100
 
 scite (5.3.2-1) unstable; urgency=medium
 
diff --git a/scite/debian/control b/scite/debian/control
index 6171004..9e6b8df 100644
--- a/scite/debian/control
+++ b/scite/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 13),
                libgtk-3-dev,
                libglib2.0-dev,
                liblua5.4-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian/scite
 Vcs-Git: https://salsa.debian.org/debian/scite.git
 Homepage: https://scintilla.org/SciTE.html
diff --git a/scite/debian/copyright b/scite/debian/copyright
index 4ed37b6..e9d9db8 100644
--- a/scite/debian/copyright
+++ b/scite/debian/copyright
@@ -10,7 +10,7 @@ Files: debian/*
 Copyright: 2000-2002, Aubin Paul <aubin@debian.org>
            2002-2013, Michael Vogt <mvo@debian.org>
            2013-2022, Antonio Valentino <antonio.valentino@tiscali.it>
-           2018-2022, Andreas Rönnquist <gusnan@debian.org>
+           2018-2023, Andreas Rönnquist <gusnan@debian.org>
 License: GPL-3.0+
 
 Files: scite/lua/*
diff --git a/scite/debian/scite+devuan.dsc b/scite/debian/scite+stackrpms.dsc
index 44433a5..bc2a3ee 100644
--- a/scite/debian/scite+devuan.dsc
+++ b/scite/debian/scite+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: scite
 Binary: scite
 Architecture: any
-Version: 5.3.2-2+stackrpms
+Version: 5.3.3-1+stackrpms
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://scintilla.org/SciTE.html
 Standards-Version: 4.6.0.1
@@ -13,5 +13,5 @@ Package-List:
  scite deb editors optional arch=any
 Files:
  00000000000000000000000000000000 1 scite.orig.tar.gz
- 00000000000000000000000000000000 1 scite+devuan.debian.tar.xz
+ 00000000000000000000000000000000 1 scite+stackrpms.debian.tar.xz
 Original-Maintainer: Michael Vogt <mvo@debian.org>
diff --git a/scite/stackrpms-5.2.4-1.diff b/scite/stackrpms-5.3.3-1.diff
index 8dc0bfc..d131ab9 100644
--- a/scite/stackrpms-5.2.4-1.diff
+++ b/scite/stackrpms-5.3.3-1.diff
@@ -1,20 +1,20 @@
 diff -x '.*.swp' -Naur scite.salsa/debian/changelog stackrpms/scite/debian/changelog
---- scite.salsa/debian/changelog	2022-07-11 14:49:34.810997853 -0400
-+++ stackrpms/scite/debian/changelog	2022-07-11 14:52:30.904832177 -0400
+--- scite.salsa/debian/changelog	2023-02-08 10:19:21.783042224 -0500
++++ stackrpms/scite/debian/changelog	2023-02-08 10:22:20.404653365 -0500
 @@ -1,3 +1,10 @@
-+scite (5.2.4-1+devuan) unstable; urgency=medium
++scite (5.3.3-1+stackrpms) unstable; urgency=medium
 +
 +  * Add stackrpms lua script and customized global.properties
 +  * Use lua 5.4.4
 +
-+ -- B. Stack <bgstack15@gmail.com>  Mon, 11 Jul 2022 14:53:34 -0400
++ -- B. Stack <bgstack15@gmail.com>  Wed, 08 Feb 2023 10:22:16 -0500
 +
- scite (5.2.4-1) unstable; urgency=medium
+ scite (5.3.3-1) unstable; urgency=medium
  
-   * New upstream version 5.2.4
+   * New upstream version 5.3.3
 diff -x '.*.swp' -Naur scite.salsa/debian/control stackrpms/scite/debian/control
---- scite.salsa/debian/control	2022-07-11 14:49:34.810997853 -0400
-+++ stackrpms/scite/debian/control	2022-07-11 14:54:15.081917359 -0400
+--- scite.salsa/debian/control	2023-02-08 10:19:21.783042224 -0500
++++ stackrpms/scite/debian/control	2023-02-08 10:22:59.845009106 -0500
 @@ -1,14 +1,13 @@
  Source: scite
 -Maintainer: Michael Vogt <mvo@debian.org>
@@ -30,12 +30,12 @@ diff -x '.*.swp' -Naur scite.salsa/debian/control stackrpms/scite/debian/control
                 libglib2.0-dev,
 -               liblua5.3-dev
 +               liblua5.4-dev
- Standards-Version: 4.6.1
+ 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 scite.salsa/debian/patches/0007-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
---- scite.salsa/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-04-05 09:49:25.955774896 -0400
-+++ stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-04-16 12:53:10.996710687 -0400
+--- scite.salsa/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-12-08 08:55:32.859493598 -0500
++++ stackrpms/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch	2022-12-16 21:03:24.736518692 -0500
 @@ -33,8 +33,8 @@
  -CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
  -CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
@@ -49,7 +49,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/0007-Build-with-Debian-package
   ifdef gnomeprefix
 diff -x '.*.swp' -Naur scite.salsa/debian/patches/series stackrpms/scite/debian/patches/series
 --- scite.salsa/debian/patches/series	2022-04-05 09:49:25.955774896 -0400
-+++ stackrpms/scite/debian/patches/series	2022-07-11 14:55:00.450389950 -0400
++++ stackrpms/scite/debian/patches/series	2022-04-18 14:47:52.918861806 -0400
 @@ -2,3 +2,4 @@
  0003-reproducible_build.patch
  0005-scite-desktop.patch
@@ -57,7 +57,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/series stackrpms/scite/debian/
 +use-lua5.4.4.patch
 diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/scite/debian/patches/use-lua5.4.4.patch
 --- scite.salsa/debian/patches/use-lua5.4.4.patch	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/patches/use-lua5.4.4.patch	2022-05-31 21:14:48.105330430 -0400
++++ stackrpms/scite/debian/patches/use-lua5.4.4.patch	2022-06-26 16:30:14.437640315 -0400
 @@ -0,0 +1,191 @@
 +Name: Patch scite to use distro package of lua, Devuan
 +Version: 5.2.3
@@ -252,7 +252,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/use-lua5.4.4.patch stackrpms/s
 +
 diff -x '.*.swp' -Naur scite.salsa/debian/rules stackrpms/scite/debian/rules
 --- scite.salsa/debian/rules	2022-07-11 14:49:34.810997853 -0400
-+++ stackrpms/scite/debian/rules	2022-07-11 15:00:30.993833168 -0400
++++ stackrpms/scite/debian/rules	2022-07-13 09:49:28.021934314 -0400
 @@ -43,6 +43,8 @@
  	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/
@@ -262,31 +262,10 @@ diff -x '.*.swp' -Naur scite.salsa/debian/rules stackrpms/scite/debian/rules
  	for f in $(CURDIR)/debian/scite/usr/share/doc/scite/*.html; do \
  		dh_link usr/share/doc/scite/$$(basename $$f) usr/share/scite/$$(basename $$f); \
  	done
-diff -x '.*.swp' -Naur scite.salsa/debian/scite+devuan.dsc stackrpms/scite/debian/scite+devuan.dsc
---- scite.salsa/debian/scite+devuan.dsc	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/scite+devuan.dsc	2022-05-31 21:14:48.105330430 -0400
-@@ -0,0 +1,17 @@
-+Format: 3.0 (quilt)
-+Source: scite
-+Binary: scite
-+Architecture: any
-+Version: 5.2.3-1+devuan
-+Maintainer: B. Stack <bgstack15@gmail.com>
-+Homepage: https://scintilla.org/SciTE.html
-+Standards-Version: 4.6.0.1
-+Vcs-Browser: https://salsa.debian.org/debian/scite
-+Vcs-Git: https://salsa.debian.org/debian/scite.git
-+Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libglib2.0-dev, liblua5.4-dev
-+Package-List:
-+ scite deb editors optional arch=any
-+Files:
-+ 00000000000000000000000000000000 1 scite.orig.tar.gz
-+ 00000000000000000000000000000000 1 scite+devuan.debian.tar.xz
-+Original-Maintainer: Michael Vogt <mvo@debian.org>
 diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite/debian/SciTEGlobal.properties
 --- scite.salsa/debian/SciTEGlobal.properties	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/SciTEGlobal.properties	2022-04-16 12:53:10.776708221 -0400
-@@ -0,0 +1,580 @@
++++ stackrpms/scite/debian/SciTEGlobal.properties	2023-01-09 13:42:13.487580146 -0500
+@@ -0,0 +1,597 @@
 +# SciTEGlobal.properties placed by scite package for stackrpms
 +# Global initialisation file for SciTE
 +# For Linux, place in $prefix/share/scite
@@ -338,6 +317,21 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +#magnification=-1
 +#output.magnification=-1
 +
++#change.history=3
++change.history=0
++#~ indicator.reverted.to.origin.insertion=style:squiggle,colour:#40A0BF
++#~ indicator.reverted.to.origin.deletion=style:point,colour:#40A0BF
++#~ indicator.saved.insertion=style:squiggle,colour:#60A060
++#~ indicator.saved.deletion=style:point,colour:#00A000
++#~ indicator.modified.insertion=style:squiggle,colour:#A0A060
++#~ indicator.modified.deletion=style:point,colour:#A0A000
++#~ indicator.reverted.to.modified.insertion=style:squiggle,colour:#FF8000
++#~ indicator.reverted.to.modified.deletion=style:point,colour:#FF8000
++#~ marker.reverted.to.origin=style:leftrect,fore:#40A0BF,back:#40A0BF
++#~ marker.saved=style:leftrect,fore:#00A000,back:#00A000
++#~ marker.modified=style:leftrect,fore:#A0A000,back:#A0A000
++#~ marker.reverted.to.modified=style:leftrect,fore:#FF8000,back:#FF8000
++
 +# Sizes and visibility in edit pane
 +line.margin.visible=1
 +line.margin.width=4
@@ -447,6 +441,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +title.full.path=1
 +#title.show.buffers=1
 +#pathbar.visible=1
++#pathbar.selectable=1
 +save.recent=1
 +save.session=1
 +#session.bookmarks=1
@@ -530,6 +525,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +#find.in.files.close.on.find=0
 +#find.in.dot=1
 +#find.in.binary=1
++#find.exclude=*.bak *.orig debug
 +#find.in.directory=
 +#find.close.on.find=0
 +#find.replace.matchcase=1
@@ -867,9 +863,38 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
 +font.embedded.base=$(font.monospace)
 +font.embedded.comment=$(font.monospace)
 +font.vbs=$(font.monospace)
+diff -x '.*.swp' -Naur scite.salsa/debian/scite.lintian-overrides stackrpms/scite/debian/scite.lintian-overrides
+--- scite.salsa/debian/scite.lintian-overrides	2022-09-06 20:31:38.343720623 -0400
++++ stackrpms/scite/debian/scite.lintian-overrides	2022-07-13 09:49:28.021934314 -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 scite.salsa/debian/scite+stackrpms.dsc stackrpms/scite/debian/scite+stackrpms.dsc
+--- scite.salsa/debian/scite+stackrpms.dsc	1969-12-31 19:00:00.000000000 -0500
++++ stackrpms/scite/debian/scite+stackrpms.dsc	2023-02-08 10:26:02.270654544 -0500
+@@ -0,0 +1,17 @@
++Format: 3.0 (quilt)
++Source: scite
++Binary: scite
++Architecture: any
++Version: 5.3.3-1+stackrpms
++Maintainer: B. Stack <bgstack15@gmail.com>
++Homepage: https://scintilla.org/SciTE.html
++Standards-Version: 4.6.0.1
++Vcs-Browser: https://salsa.debian.org/debian/scite
++Vcs-Git: https://salsa.debian.org/debian/scite.git
++Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libglib2.0-dev, liblua5.4-dev
++Package-List:
++ scite deb editors optional arch=any
++Files:
++ 00000000000000000000000000000000 1 scite.orig.tar.gz
++ 00000000000000000000000000000000 1 scite+stackrpms.debian.tar.xz
++Original-Maintainer: Michael Vogt <mvo@debian.org>
 diff -x '.*.swp' -Naur scite.salsa/debian/_service stackrpms/scite/debian/_service
 --- scite.salsa/debian/_service	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/_service	2022-07-11 15:07:55.534463848 -0400
++++ stackrpms/scite/debian/_service	2023-02-08 10:26:50.407088723 -0500
 @@ -0,0 +1,24 @@
 +<services>
 +   <service name="tar_scm">
@@ -887,8 +912,8 @@ diff -x '.*.swp' -Naur scite.salsa/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">scite524.tgz</param>
-+      <param name="filename">scite_5.2.4.orig.tar.gz</param>
++      <param name="path">scite533.tgz</param>
++      <param name="filename">scite_5.3.3.orig.tar.gz</param>
 +   </service>
 +   <service name="extract_file">
 +      <param name="archive">*.tar.xz</param>
@@ -897,7 +922,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/_service stackrpms/scite/debian/_servi
 +</services>
 diff -x '.*.swp' -Naur scite.salsa/debian/source/lintian-overrides stackrpms/scite/debian/source/lintian-overrides
 --- scite.salsa/debian/source/lintian-overrides	2022-07-11 14:49:34.810997853 -0400
-+++ stackrpms/scite/debian/source/lintian-overrides	2022-04-16 12:53:11.104711898 -0400
++++ stackrpms/scite/debian/source/lintian-overrides	2022-04-18 14:47:52.938861975 -0400
 @@ -1,4 +1,3 @@
 -scite source: source-is-missing [scintilla/doc/ScintillaDoc.html]
 -scite source: source-is-missing [scite/doc/PaneAPI.html]
@@ -908,7 +933,7 @@ diff -x '.*.swp' -Naur scite.salsa/debian/source/lintian-overrides stackrpms/sci
 +invalid-devuan-version
 diff -x '.*.swp' -Naur scite.salsa/debian/stackrpms.lua stackrpms/scite/debian/stackrpms.lua
 --- scite.salsa/debian/stackrpms.lua	1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/stackrpms.lua	2022-04-16 12:53:11.104711898 -0400
++++ stackrpms/scite/debian/stackrpms.lua	2022-04-18 14:47:52.938861975 -0400
 @@ -0,0 +1,278 @@
 +-- DESCRIPTION:
 +-- Unicode hexadecimal table: https://example.com/copied/unicode.html