summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scite/debian/_service8
-rw-r--r--scite/debian/changelog12
-rw-r--r--scite/debian/scite+stackrpms.dsc2
-rw-r--r--scite/stackrpms-5.3.8-1.diff (renamed from scite/stackrpms-5.3.1-1.diff)147
4 files changed, 87 insertions, 82 deletions
diff --git a/scite/debian/_service b/scite/debian/_service
index cac3953..df219e0 100644
--- a/scite/debian/_service
+++ b/scite/debian/_service
@@ -1,10 +1,10 @@
<services>
<service name="tar_scm">
<param name="scm">git</param>
- <param name="url">https://bgstack15.ddns.net/cgit/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>
+ <param name="revision">scite-bump</param>
<param name="version">_none_</param>
</service>
<service name="recompress">
@@ -14,8 +14,8 @@
<service name="download_url">
<param name="protocol">https</param>
<param name="host">www.scintilla.org</param>
- <param name="path">scite537.tgz</param>
- <param name="filename">scite_5.3.7.orig.tar.gz</param>
+ <param name="path">scite538.tgz</param>
+ <param name="filename">scite_5.3.8.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 7c70aae..d192004 100644
--- a/scite/debian/changelog
+++ b/scite/debian/changelog
@@ -1,9 +1,17 @@
-scite (5.3.7-1+stackrpms) unstable; urgency=medium
+scite (5.3.8-1+stackrpms) unstable; urgency=medium
* Add stackrpms lua script and customized global.properties
* Use lua 5.4.4
- -- B. Stack <bgstack15@gmail.com> Mon, 25 Sep 2023 08:42:59 -0400
+ -- B. Stack <bgstack15@gmail.com> Tue, 03 Oct 2023 14:29:25 -0400
+
+scite (5.3.8-1) unstable; urgency=medium
+
+ * New upstream version 5.3.8
+ * Add d/conffiles file to remove obsolete conffile
+ /etc/scite/nimrod.properties properly (Closes: #1052403)
+
+ -- Andreas Rönnquist <gusnan@debian.org> Sat, 23 Sep 2023 02:09:13 +0200
scite (5.3.7-1) unstable; urgency=medium
diff --git a/scite/debian/scite+stackrpms.dsc b/scite/debian/scite+stackrpms.dsc
index 85a15ce..100ac83 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.3.7-1+stackrpms
+Version: 5.3.8-1+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.1-1.diff b/scite/stackrpms-5.3.8-1.diff
index dd5bf67..90948c0 100644
--- a/scite/stackrpms-5.3.1-1.diff
+++ b/scite/stackrpms-5.3.8-1.diff
@@ -1,20 +1,25 @@
-diff -x '.*.swp' -Naur scite.salsa/debian/changelog stackrpms/scite/debian/changelog
---- scite.salsa/debian/changelog 2022-10-16 16:35:01.550680576 -0400
-+++ stackrpms/scite/debian/changelog 2022-10-16 16:40:14.802212981 -0400
+diff -x '.*.swp' -Naur salsa/scite/debian/changelog stackrpms/scite/debian/changelog
+--- salsa/scite/debian/changelog 2023-10-03 14:28:15.989147350 -0400
++++ stackrpms/scite/debian/changelog 2023-10-03 14:29:27.758146483 -0400
@@ -1,3 +1,10 @@
-+scite (5.3.1-1+devuan) unstable; urgency=medium
++scite (5.3.8-1+stackrpms) unstable; urgency=medium
+
+ * Add stackrpms lua script and customized global.properties
+ * Use lua 5.4.4
+
-+ -- B. Stack <bgstack15@gmail.com> Sun, 16 Oct 2022 16:40:05 -0400
++ -- B. Stack <bgstack15@gmail.com> Tue, 03 Oct 2023 14:29:25 -0400
+
- scite (5.3.1-1) unstable; urgency=medium
+ scite (5.3.8-1) unstable; urgency=medium
- * New upstream version 5.3.1
-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-13 09:49:28.021934314 -0400
+ * New upstream version 5.3.8
+diff -x '.*.swp' -Naur salsa/scite/debian/conffiles stackrpms/scite/debian/conffiles
+--- salsa/scite/debian/conffiles 2023-10-03 14:28:15.989147350 -0400
++++ stackrpms/scite/debian/conffiles 1969-12-31 19:00:00.000000000 -0500
+@@ -1 +0,0 @@
+-remove-on-upgrade /etc/scite/nimrod.properties
+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-08-19 17:16:15.202653929 -0400
@@ -1,14 +1,13 @@
Source: scite
-Maintainer: Michael Vogt <mvo@debian.org>
@@ -30,12 +35,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-05-31 14:42:26.029549590 -0400
+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-08-19 17:16:15.202653929 -0400
@@ -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)
@@ -47,17 +52,17 @@ diff -x '.*.swp' -Naur scite.salsa/debian/patches/0007-Build-with-Debian-package
gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
ifndef prefix
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-04-18 14:47:52.918861806 -0400
+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-08-19 17:16:15.202653929 -0400
@@ -2,3 +2,4 @@
0003-reproducible_build.patch
0005-scite-desktop.patch
0007-Build-with-Debian-packaged-Lua.patch
+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-06-26 16:30:14.437640315 -0400
+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-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
@@ -250,9 +255,9 @@ 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-13 09:49:28.021934314 -0400
+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-08-19 17:16:15.202653929 -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 +267,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-10-16 16:41:29.431054544 -0400
-@@ -0,0 +1,17 @@
-+Format: 3.0 (quilt)
-+Source: scite
-+Binary: scite
-+Architecture: any
-+Version: 5.3.1-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-10-05 11:03:14.200880601 -0400
-@@ -0,0 +1,596 @@
+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-08-19 17:16:15.202653929 -0400
+@@ -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,7 +322,8 @@ diff -x '.*.swp' -Naur scite.salsa/debian/SciTEGlobal.properties stackrpms/scite
+#magnification=-1
+#output.magnification=-1
+
-+change.history=3
++#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
@@ -883,25 +868,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/_service stackrpms/scite/debian/_service
---- scite.salsa/debian/_service 1969-12-31 19:00:00.000000000 -0500
-+++ stackrpms/scite/debian/_service 2022-10-16 16:42:27.103704895 -0400
+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-10-03 14:27:06.988186754 -0400
+@@ -0,0 +1,17 @@
++Format: 3.0 (quilt)
++Source: scite
++Binary: scite
++Architecture: any
++Version: 5.3.8-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 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-10-03 14:27:12.764267166 -0400
@@ -0,0 +1,24 @@
+<services>
+ <service name="tar_scm">
+ <param name="scm">git</param>
-+ <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param>
++ <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param>
+ <param name="subdir">scite/debian</param>
+ <param name="filename">debian</param>
-+ <param name="revision">scite-bump</param>
++ <param name="revision">master</param>
+ <param name="version">_none_</param>
+ </service>
+ <service name="recompress">
@@ -911,28 +909,27 @@ 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">scite531.tgz</param>
-+ <param name="filename">scite_5.3.1.orig.tar.gz</param>
++ <param name="path">scite538.tgz</param>
++ <param name="filename">scite_5.3.8.orig.tar.gz</param>
+ </service>
+ <service name="extract_file">
+ <param name="archive">*.tar.xz</param>
+ <param name="files">*/*.dsc</param>
+ </service>
+</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-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]
--scite source: source-is-missing [scite/doc/ScriptLexer.html]
--scite source: source-is-missing [scintilla/doc/SciCoding.html]
+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-09-25 08:46:50.848733124 -0400
+@@ -2,3 +2,6 @@
+ 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]
+national-encoding debian/SciTEGlobal.properties
+invalid-field-for-derivative
+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-18 14:47:52.938861975 -0400
+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-08-19 17:16:15.202653929 -0400
@@ -0,0 +1,278 @@
+-- DESCRIPTION:
+-- Unicode hexadecimal table: https://example.com/copied/unicode.html
bgstack15