Bug#1035630: clc-intercal: Update packaging to dh and new upstream version (fixes reproducibility issues!)
Vagrant Cascadian
vagrant at reproducible-builds.org
Sat May 6 22:24:24 BST 2023
Package: clc-intercal
Severity: wishlist
Tags: patch
User: reproducible-builds at lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-bugs at lists.alioth.debian.org
I baited myself into testing upstream claims that the new clc-intercal
builds reproducibly... and it indeed fixes the timestamps issues!
In order to test it, this required making some changes to the debian
packaging, and it seemed easier to just update to a more recent style...
So, attached is a patch updating to the new upstream version, as well as
updating to dh style debian/rules.
I have not tested that this actually works, only that it builds (there
may be an unresolved test suite failure...) and any changes to the
resulting .deb appear roughly reasonable, addressed a few lintian
issues, and that it builds reproducibly (at least with my local
testing)!
There might be a few other rough edges, but this is a start and figured
I would share what I had so far...
live well,
vagrant
-------------- next part --------------
diff --git a/debian/README.debian b/debian/README.debian
index dbef811..9bebdde 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -2,7 +2,7 @@ clc-intercal for Debian
-----------------------
Some sample programs have been included in the package. Further
-reference material and more sample INTERCAL programs are avalible with
+reference material and more sample INTERCAL programs are available with
the C-INTERCAL compiler in the intercal package.
-- Mark Brown <broonie at debian.org>, Fri, 5 Nov 1999 16:18:20 +0000
diff --git a/debian/build-fix b/debian/build-fix
deleted file mode 100644
index a7cf9b0..0000000
--- a/debian/build-fix
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up CLC-INTERCAL-1.-94.-2/CLC-INTERCAL-Base-1.-94.-2/INTERCAL/Sick.pm.orig CLC-INTERCAL-1.-94.-2/CLC-INTERCAL-Base-1.-94.-2/INTERCAL/Sick.pm
---- CLC-INTERCAL-1.-94.-2/CLC-INTERCAL-Base-1.-94.-2/INTERCAL/Sick.pm.orig 2008-03-29 11:09:06.000000000 -0600
-+++ CLC-INTERCAL-1.-94.-2/CLC-INTERCAL-Base-1.-94.-2/INTERCAL/Sick.pm 2013-08-02 13:55:41.952276530 -0600
-@@ -709,7 +709,7 @@ sub _guess_charset {
- my $count = 0;
- while ((my $line = $fh->write_binary(4096)) ne '') {
- my $cl = &$cnv($line);
-- $count++ while $line =~ /DO|PLEASE/ig;
-+ $count++ while $cl =~ /DO|PLEASE/ig;
- }
- $counts{$name} = $count;
- };
diff --git a/debian/changelog b/debian/changelog
index c905658..eb20b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clc-intercal (1:1.-94.-2.1-1~0) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * 1.-94.-2.1
+
+ -- Vagrant Cascadian <vagrant at debian.org> Sat, 06 May 2023 12:19:54 -0700
+
clc-intercal (1:1.0~4pre1.-94.-2-5.1) unstable; urgency=medium
* Non maintainer upload by the Reproducible Builds team.
@@ -133,8 +140,8 @@ clc-intercal (0.05-3) unstable; urgency=low
clc-intercal (0.05-2) unstable; urgency=low
* Don't install oo, ick man page. This means oo, ick is undocumented,
- but works around the fact that the cache building in man-db dies
- horribly when confronted with a man page with a space in the name,
+ but works around the fact that the cache building in man-db dies
+ horribly when confronted with a man page with a space in the name,
rendering man-db useless (fixes: #50455).
-- Mark Brown <broonie at debian.org> Thu, 18 Nov 1999 19:32:18 +0000
diff --git a/debian/clc-intercal.dirs b/debian/clc-intercal.dirs
deleted file mode 100644
index de8a730..0000000
--- a/debian/clc-intercal.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/doc/clc-intercal/examples
diff --git a/debian/clc-intercal.docs b/debian/clc-intercal.docs
index cf935a6..9184aa6 100644
--- a/debian/clc-intercal.docs
+++ b/debian/clc-intercal.docs
@@ -1,4 +1,4 @@
-README
-CLC-INTERCAL-Base-1.-94.-2/MISSING
-CLC-INTERCAL-Docs-1.-94.-2/doc/html
-CLC-INTERCAL-Docs-1.-94.-2/doc/INTERNET
+README.md
+CLC-INTERCAL-Base/MISSING
+CLC-INTERCAL-Docs/doc/html
+CLC-INTERCAL-Docs/doc/INTERNET
diff --git a/debian/clc-intercal.examples b/debian/clc-intercal.examples
index ed410a6..def9c9a 100644
--- a/debian/clc-intercal.examples
+++ b/debian/clc-intercal.examples
@@ -1,30 +1,30 @@
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/gcd.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/hello.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/threads.ti
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/syscall3.si
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/http-get.si
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/retrieve.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/reinstate-gerund.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/come-from.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/remember.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/forget.ni
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/write-in.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/give-up.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/learn.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/abstain-label.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/study.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/come-from-gerund.gi
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/reinstate-label.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/enslave.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/free.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/ignore.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/resume.ni
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/enrol.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/graduate.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/calculate.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/finish.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/stash.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/abstain-gerund.i
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/quantum/next.ni
-CLC-INTERCAL-Docs-1.-94.-2/doc/examples/syscall1.si
+CLC-INTERCAL-Docs/doc/examples/gcd.i
+CLC-INTERCAL-Docs/doc/examples/hello.i
+CLC-INTERCAL-Docs/doc/examples/threads.ti
+CLC-INTERCAL-Docs/doc/examples/syscall3.si
+CLC-INTERCAL-Docs/doc/examples/http-get.si
+CLC-INTERCAL-Docs/doc/examples/quantum
+CLC-INTERCAL-Docs/doc/examples/quantum/retrieve.i
+CLC-INTERCAL-Docs/doc/examples/quantum/reinstate-gerund.i
+CLC-INTERCAL-Docs/doc/examples/quantum/come-from.i
+CLC-INTERCAL-Docs/doc/examples/quantum/remember.i
+CLC-INTERCAL-Docs/doc/examples/quantum/forget.ni
+CLC-INTERCAL-Docs/doc/examples/quantum/write-in.i
+CLC-INTERCAL-Docs/doc/examples/quantum/give-up.i
+CLC-INTERCAL-Docs/doc/examples/quantum/learn.i
+CLC-INTERCAL-Docs/doc/examples/quantum/abstain-label.i
+CLC-INTERCAL-Docs/doc/examples/quantum/study.i
+CLC-INTERCAL-Docs/doc/examples/quantum/come-from-gerund.gi
+CLC-INTERCAL-Docs/doc/examples/quantum/reinstate-label.i
+CLC-INTERCAL-Docs/doc/examples/quantum/enslave.i
+CLC-INTERCAL-Docs/doc/examples/quantum/free.i
+CLC-INTERCAL-Docs/doc/examples/quantum/ignore.i
+CLC-INTERCAL-Docs/doc/examples/quantum/resume.ni
+CLC-INTERCAL-Docs/doc/examples/quantum/enrol.i
+CLC-INTERCAL-Docs/doc/examples/quantum/graduate.i
+CLC-INTERCAL-Docs/doc/examples/quantum/calculate.i
+CLC-INTERCAL-Docs/doc/examples/quantum/finish.i
+CLC-INTERCAL-Docs/doc/examples/quantum/stash.i
+CLC-INTERCAL-Docs/doc/examples/quantum/abstain-gerund.i
+CLC-INTERCAL-Docs/doc/examples/quantum/next.ni
+CLC-INTERCAL-Docs/doc/examples/syscall1.si
diff --git a/debian/clc-intercal.manpages b/debian/clc-intercal.manpages
deleted file mode 100644
index 13454a3..0000000
--- a/debian/clc-intercal.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-blib/man1/*
-blib/man3/*
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 e9334f9..6e432fd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,28 @@
Source: clc-intercal
Section: devel
-Priority: extra
+Priority: optional
Maintainer: Mark Brown <broonie at debian.org>
Standards-Version: 3.9.6
Homepage: http://clc.intercal.org.uk/
-Build-Depends: debhelper (>= 9), perl (>= 5.6.0-16), libcurses-perl
+Build-Depends: debhelper-compat (= 13),
+ libnet-interface-perl,
+ libsocket6-perl,
+ libio-socket-inet6-perl,
+ libterm-readline-gnu-perl,
+ libcurses-perl,
+ libgtk3-perl,
Package: clc-intercal
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, libnet-netmask-perl
-Recommends: libgtk2-perl
+Recommends: libgtk3-perl
Suggests: intercal
Description: Compiler for the INTERCAL language
This package provides a Perl-based compiler for the INTERCAL
programming language, usable either from the command line or as a
Perl module.
.
- CLC-INTERCAL is designed to be almost compatible with the original
+ CLC-INTERCAL is designed to be almost compatible with the original
(Princeton 1972) compiler. It also implements several extensions to
the original language, including support for object orientation,
operator overloading and quantum computing.
diff --git a/debian/copyright b/debian/copyright
index 42e54cc..ab8929c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Upstream Author: Claudio Calvelli
Copyright:
-Copyright (c) 2006 Claudio Calvelli <intercal at sdf.lonestar.org>
+Copyright (c) 2006-2008, 2023 Claudio Calvelli <compiler (whirlpool) intercal.org.uk>
In addition to the above, permission is hereby granted to use, misuse,
modify, distribute, break, fix again, etcetera CLC-INTERCAL-1.-94.-5
diff --git a/debian/rules b/debian/rules
index b234767..725503c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,86 +1,13 @@
#!/usr/bin/make -f
#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --no-parallel
-PACKAGE=$(shell dh_listpackages)
+override_dh_auto_test:
+ touch CLC-INTERCAL-INET/t/.skip-network CLC-INTERCAL-INET/t/.skip-localhost
+ dh_auto_test
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP =`pwd`/debian/$(PACKAGE)
-
-build: build-arch build-indep
-build-arch:
-build-indep: build-stamp
-build-stamp:
- dh_testdir
-
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- patch -p1 < debian/build-fix
- $(MAKE) OPTIMIZE="-O2 -g -Wall"
- # This may fail if a previous version is installed.
- -make test
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) realclean
- rm -f Makefile Makefile.old
- rm -f ./CLC-INTERCAL-*
-
- dh_clean
-
-install:
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(TMP)
- chmod +x $(TMP)/usr/bin/*
- rm -rf $(TMP)/usr/lib
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
-# dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installchangelogs Changes
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb --destdir=$(DESTDIR)
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_auto_clean:
+ rm -vf CLC-INTERCAL-INET/t/.skip-network CLC-INTERCAL-INET/t/.skip-localhost
+ dh_auto_clean
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/reproducible-bugs/attachments/20230506/2c25a9ca/attachment.sig>
More information about the Reproducible-bugs
mailing list