uncommitted - xotcl

Ready changes

Summary

Import uploads missing from VCS:

Diff

diff --git a/debian/changelog b/debian/changelog
index 47eb9ee..809df2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xotcl (1.6.8-5) unstable; urgency=medium
+
+  * Team upload.
+  * Convert the source package to 3.0 (quilt) format (closes: #1007532).
+  * Point debian/watch to the SourceForge download site.
+  * Bump the debhelper compatibility level to 12.
+  * Bump the standards version to 4.6.0.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 15 Mar 2022 12:08:33 +0300
+
 xotcl (1.6.8-4.1) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 7e5bae9..3f8c92c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel@lists.alioth.debian.org>
 Uploaders: Stefan Sobernig <stefan.sobernig@wu-wien.ac.at>
-Build-Depends: debhelper (>= 9), quilt,  autotools-dev, tcl-dev (>= 8.6), tk-dev (>= 8.6), libexpat1-dev
-Standards-Version: 4.1.3
+Build-Depends: debhelper-compat (= 12), tcl-dev (>= 8.6), tk-dev (>= 8.6), libexpat1-dev
+Standards-Version: 4.6.0
 Homepage: http://www.xotcl.org/
 Vcs-Browser: https://salsa.debian.org/tcltk-team/xotcl
 Vcs-Git: https://salsa.debian.org/tcltk-team/xotcl.git
diff --git a/debian/patches/01_reproducible_fix.diff b/debian/patches/01_reproducible_fix.diff
index 82908b1..60afbb2 100644
--- a/debian/patches/01_reproducible_fix.diff
+++ b/debian/patches/01_reproducible_fix.diff
@@ -1,8 +1,8 @@
 Description: Make build agnostic about filesystem ordering
 Author: Chris Lamb <lamby@debian.org>
 Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797543
---- a/Makefile.in	2015-08-31 13:52:41.718674028 +0100
---- b/Makefile.in	2015-08-31 14:02:06.180689605 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -58,7 +58,7 @@
  	$(src_lib_dir)/lib/*.xotcl \
  	$(src_lib_dir)/store/*.xotcl \
diff --git a/debian/patches/02_reproducible_makeDoc.diff b/debian/patches/02_reproducible_makeDoc.diff
index 458b8ef..7287bc8 100644
--- a/debian/patches/02_reproducible_makeDoc.diff
+++ b/debian/patches/02_reproducible_makeDoc.diff
@@ -1,8 +1,8 @@
 Description: Fix ordering of file list
 Author: Chris Lamb <lamby@debian.org>
 Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840155
---- xotcl-1.6.8.orig/library/lib/makeDoc.xotcl	2013-06-23 17:30:40.000000000 +0200
-+++ xotcl-1.6.8/library/lib/makeDoc.xotcl	2017-01-24 00:22:45.475082867 +0100
+--- a/library/lib/makeDoc.xotcl
++++ b/library/lib/makeDoc.xotcl
 @@ -38,7 +38,7 @@
  set filesHtml ""
  set filesDir ""
diff --git a/debian/rules b/debian/rules
index 5df3bea..d1ce5bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,14 +17,11 @@
 # Environement
 #
 
-# include /usr/share/quilt/quilt.make
-
 SHELL=/bin/sh
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 TARGET=$(CURDIR)/debian/tmp
 
-
 #
 # Extract version information from autoconf meta-data
 #
@@ -60,7 +57,6 @@ DOCDIR=$(DOC)/usr/share/doc/xotcl-doc
 config.status: configure
 
 	dh_testdir
-	dh_quilt_patch
 	./configure --prefix=/usr \
 		--exec-prefix=/usr \
 		$(shell dpkg-buildflags --export=configure) \
@@ -82,7 +78,6 @@ build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
 
-# build-stamp: $(QUILT_STAMPFN) config.status
 build-stamp: config.status
 	dh_testdir
 
@@ -96,7 +91,6 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_quilt_unpatch
 	find . -name '*.o' -type f -delete
 	find . -name '*.so' -type f -delete
 	dh_clean config.log config.status config.cache config.guess
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/substvars b/debian/substvars
deleted file mode 100644
index 36e5a58..0000000
--- a/debian/substvars
+++ /dev/null
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.7-1)
diff --git a/debian/watch b/debian/watch
index 57f7b06..36a6911 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://media.wu-wien.ac.at/download/xotcl-(1\.\d\.\d+).tar.gz
\ No newline at end of file
+http://sf.net/xotcl/xotcl-(1\.\d\.\d+)\.tar\.gz

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/06/d6e0dfff2bb641e27fc1dcead80729efec50ea.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/49/865ab7ed3eaf32891039dcad4f589154f2d386.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/9b/ecd14d06c2a2065f78dcc4051e53dc2d9dd425.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/a1/bb98ceab171dd0fff06dff8c7422fb75993149.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c9/eef42a9e7ec0b641af8a8d695fcf6969796276.debug
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/univ/UNIVERSAL.rdf
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/scripts/parameter.xotcl
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/scripts/soccerClub.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/AgentClient.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/FormsWithState.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/MC.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/univ/UNIVERSAL.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/comm/get-regression-nb.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/comm/get-regression.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/comm/link-checker.xotcl
-rwxr-xr-x  root/root   /usr/share/doc/xotcl-doc/examples/utils/xo-daemon

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/0e/f5e0881f936c3c573b7fa28437e3af007fb637.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/14/9ca666c79a7a3eb05f61ffc0caa9b611440858.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c7/22f62194e9ace94effe307972e09e1f72fad0c.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f2/1ea5293f2ed7977dbf0da54df8c27c475badd7.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f3/25dc2d22f4c5117111770fee9116b7883fbb7a.debug
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/AgentClient.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/FormsWithState.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/MC.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/univ/UNIVERSAL.rdf.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/actiweb/univ/UNIVERSAL.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/comm/get-regression-nb.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/comm/get-regression.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/comm/link-checker.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/scripts/parameter.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/scripts/soccerClub.xotcl.gz
-rw-r--r--  root/root   /usr/share/doc/xotcl-doc/examples/utils/xo-daemon.gz

No differences were encountered between the control files of package xotcl

Control files of package xotcl-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 149ca666c79a7a3eb05f61ffc0caa9b611440858 c722f62194e9ace94effe307972e09e1f72fad0c f21ea5293f2ed7977dbf0da54df8c27c475badd7 06d6e0dfff2bb641e27fc1dcead80729efec50ea 9becd14d06c2a2065f78dcc4051e53dc2d9dd425 c9eef42a9e7ec0b641af8a8d695fcf6969796276

No differences were encountered between the control files of package xotcl-dev

No differences were encountered between the control files of package xotcl-doc

No differences were encountered between the control files of package xotcl-shells

Control files of package xotcl-shells-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 0ef5e0881f936c3c573b7fa28437e3af007fb637 f325dc2d22f4c5117111770fee9116b7883fbb7a 49865ab7ed3eaf32891039dcad4f589154f2d386 a1bb98ceab171dd0fff06dff8c7422fb75993149

Run locally

More details

Full run details