Merge branch 'scite-bump' into 'master'

scite 5.2.4

See merge request bgstack15/stackrpms!309

7 files changed, 52 insertions, 15 deletions

diff --git a/scite/debian/_service b/scite/debian/_service
new file mode 100644
index 0000000..969560d
--- /dev/null
+++ b/scite/debian/_service
@@ -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="subdir">scite/debian</param>
+      <param name="filename">debian</param>
+      <param name="revision">scite-bump</param>
+      <param name="version">_none_</param>
+   </service>
+   <service name="recompress">
+      <param name="file">*.tar</param>
+      <param name="compression">xz</param>
+   </service>
+   <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>
+   </service>
+   <service name="extract_file">
+      <param name="archive">*.tar.xz</param>
+      <param name="files">*/*.dsc</param>
+   </service>
+</services>
diff --git a/scite/debian/changelog b/scite/debian/changelog
index fc5ebf7..2d1bd24 100644
--- a/scite/debian/changelog
+++ b/scite/debian/changelog
@@ -1,9 +1,21 @@
-scite (5.2.3-1+devuan) obs; urgency=medium
+scite (5.2.4-1+devuan) unstable; urgency=medium
 
   * Add stackrpms lua script and customized global.properties
   * Use lua 5.4.4
 
- -- B. Stack <bgstack15@gmail.com>  Tue, 31 May 2022 10:31:51 -0400
+ -- B. Stack <bgstack15@gmail.com>  Mon, 11 Jul 2022 14:53:34 -0400
+
+scite (5.2.4-1) unstable; urgency=medium
+
+  * New upstream version 5.2.4
+  * Upgrade Standards Version to 4.6.1 (No changes required)
+  * Make sure in clean targets that we use GTK3 flag to avoid warnings
+  * Add lintian source override for source-is-missing tags
+  * Use square brackets in lintian override
+  * Fix spelling-error-in-binary override order
+  * Update copyright years for Debian packaging
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Sun, 10 Jul 2022 19:18:17 +0200
 
 scite (5.2.3-1) unstable; urgency=medium
 
diff --git a/scite/debian/control b/scite/debian/control
index 682ad5e..6171004 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.0.1
+Standards-Version: 4.6.1
 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 8a923bb..5bd547c 100644
--- a/scite/debian/copyright
+++ b/scite/debian/copyright
@@ -7,7 +7,10 @@ Copyright: 1998-2014 Neil Hodgson <neilh@scintilla.org>
 License: scintilla
 
 Files: debian/*
-Copyright: 2000 Aubin Paul <aubin@debian.org>
+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>
 License: GPL-3.0+
 
 Files: scite/lua/*
diff --git a/scite/debian/rules b/scite/debian/rules
index f6cbeda..d879c47 100755
--- a/scite/debian/rules
+++ b/scite/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-#export DEB_BUILD_OPTIONS=noautodbgsym
 
 include /usr/share/dpkg/pkg-info.mk
 BUILD_DATE ?= $(shell date --utc --date="@$(SOURCE_DATE_EPOCH)" "+%b %d %Y %T")
@@ -17,10 +16,10 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	$(MAKE) -C scintilla/gtk clean
+	GTK3=1 $(MAKE) -C scintilla/gtk clean
 	rm -f scintilla/bin/scintilla.a
-	$(MAKE) -C scite/gtk clean
-	$(MAKE) -C lexilla/src clean
+	GTK3=1 $(MAKE) -C scite/gtk clean
+	GTK3=1 $(MAKE) -C lexilla/src clean
 	rm -f scite/bin/liblexilla.so
 	rm -f scite/bin/libscintilla.so
 
@@ -45,7 +44,6 @@ override_dh_install:
 	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/
 	cp -p debian/stackrpms.lua $(CURDIR)/debian/scite/usr/share/scite/
-	@#install -d -m0755 $(CURDIR)/debian/scite/etc/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 \
 		dh_link usr/share/doc/scite/$$(basename $$f) usr/share/scite/$$(basename $$f); \
diff --git a/scite/debian/scite+devuan.dsc b/scite/debian/scite+devuan.dsc
index 8bb7a97..48f2214 100644
--- a/scite/debian/scite+devuan.dsc
+++ b/scite/debian/scite+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: scite
 Binary: scite
 Architecture: any
-Version: 5.2.3-1+devuan
+Version: 5.2.4-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://scintilla.org/SciTE.html
 Standards-Version: 4.6.0.1
diff --git a/scite/debian/scite.lintian-overrides b/scite/debian/scite.lintian-overrides
index 8314915..f863f6f 100644
--- a/scite/debian/scite.lintian-overrides
+++ b/scite/debian/scite.lintian-overrides
@@ -1,5 +1,5 @@
-scite: spelling-error-in-binary usr/lib/scite/liblexilla.so afe safe
-scite: spelling-error-in-binary usr/lib/scite/liblexilla.so Lables Labels
-scite: national-encoding etc/scite/SciTEGlobal.properties
-scite: national-encoding etc/scite/rebol.properties
-scite: national-encoding etc/scite/css.properties
+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]
+scite: national-encoding [etc/scite/css.properties]