Bug#1035630: clc-intercal: Update packaging to dh and new upstream version (fixes reproducibility issues!)
reopen 1035630
kthxbye
The BTS really is user hostile...
On Sat, May 06, 2023 at 02:24:24PM -0700, Vagrant Cascadian wrote:
> Package: clc-intercal
> Severity: wishlist
> Tags: patch
> User: reproducible-bui...@lists.alioth.debian.org
> Usertags: timestamps
> X-Debbugs-Cc: reproducible-b...@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
> 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 , Fri, 5 Nov 1999 16:18:20 +
> diff --git a/debian/build-fix b/debian/build-fix
> deleted file mode 100644
> index a7cf9b0..000
> --- 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.0 -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 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 Thu, 18 Nov 1999 19:32:18 +
> diff --git a/debian/clc-intercal.dirs b/debian/clc-intercal.dirs
> deleted file mode 100644
> index de8a730..000
> --- 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
>
Bug#1035630: clc-intercal: Update packaging to dh and new upstream version (fixes reproducibility issues!)
Package: clc-intercal
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: timestamps
X-Debbugs-Cc: reproducible-b...@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
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 , Fri, 5 Nov 1999 16:18:20 +
diff --git a/debian/build-fix b/debian/build-fix
deleted file mode 100644
index a7cf9b0..000
--- 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.0 -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 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 Thu, 18 Nov 1999 19:32:18 +
diff --git a/debian/clc-intercal.dirs b/debian/clc-intercal.dirs
deleted file mode 100644
index de8a730..000
--- 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
