[Git][java-team/antlr][master] 10 commits: debian/rules: Do not install example Makefiles (Closes: #991104)

Tony Mancill (@tmancill) gitlab at salsa.debian.org
Wed Aug 11 04:56:41 BST 2021



Tony Mancill pushed to branch master at Debian Java Maintainers / antlr


Commits:
e28c91f1 by tony mancill at 2021-08-10T19:55:55-07:00
debian/rules: Do not install example Makefiles (Closes: #991104)

- - - - -
e180ba89 by tony mancill at 2021-08-10T20:00:12-07:00
add patches for reproducible builds (timestamps in .jar file) (Closes: #991106)

- - - - -
02788f3f by tony mancill at 2021-08-10T20:02:49-07:00
Add myself to Uploaders

- - - - -
49746a36 by tony mancill at 2021-08-10T20:03:16-07:00
Bump Standards-Version to 4.5.1

- - - - -
0c0cab9a by tony mancill at 2021-08-10T20:03:34-07:00
Use debhelper-compat 13

- - - - -
a26ab372 by tony mancill at 2021-08-10T20:05:09-07:00
antlr-doc and libantlr-java are Multi-Arch: foreign

- - - - -
6a3eb8f6 by tony mancill at 2021-08-10T20:13:46-07:00
Freshen debian/copyright

- - - - -
a960ca37 by tony mancill at 2021-08-10T20:14:36-07:00
order build-deps

- - - - -
9ed974aa by tony mancill at 2021-08-10T20:53:49-07:00
Update version in debian/watch

- - - - -
d1eed670 by tony mancill at 2021-08-10T20:53:49-07:00
interim changelog

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0002-configure.in-Set-timestamp-from-SOURCE_DATE_EPOCH-va.patch
- + debian/patches/0003-Makefile.in-Set-timestamp-from-SOURCE_DATE_PEOCH-env.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+antlr (2.7.7+dfsg-11) UNRELEASED; urgency=medium
+
+  * Add patches for reproducible builds:
+    - Do not install example Makefiles (Closes: #991104)
+    - Predictable timestamps in .jar file (Closes: #991106)
+    Thanks to Vagrant Cascadian for the patches.
+  * antlr-doc and libantlr-java are Multi-Arch: foreign
+  * Bump Standards-Version to 4.5.1
+  * Use debhelper-compat 13
+  * Freshen debian/copyright
+  * Add myself to Uploaders
+
+ -- tony mancill <tmancill at debian.org>  Tue, 10 Aug 2021 20:14:38 -0700
+
 antlr (2.7.7+dfsg-10) unstable; urgency=medium
 
   * Team upload.
@@ -394,7 +408,7 @@ antlr (2.7.5-8) unstable; urgency=low
 
 antlr (2.7.5-7) unstable; urgency=low
 
-  * Change to default packages for gcj and libgcj-dev to build 
+  * Change to default packages for gcj and libgcj-dev to build
     native version
   * Updated standards version to 3.6.2
 
@@ -503,7 +517,7 @@ antlr (2.7.3-1) unstable; urgency=low
 antlr (2.7.2-6) unstable; urgency=low
 
   * changed debhelper compatibility level to 4
-  * added versioned dependency on debhelper 
+  * added versioned dependency on debhelper
 
  -- John Leuner <jewel at debian.org>  Sat,  1 Nov 2003 10:44:41 +0200
 
@@ -511,21 +525,21 @@ antlr (2.7.2-5) unstable; urgency=low
 
   * Changed C++ library dependency from libstdc++ 2.10
     to libstdc++ 5
-   (Closes: #214155) 
+   (Closes: #214155)
 
  -- John Leuner <jewel at debian.org>  Thu, 16 Oct 2003 18:47:35 +0200
 
 antlr (2.7.2-4) unstable; urgency=low
 
   * Built on sid with gcc 3.3.2
-   (Closes: #214155) 
+   (Closes: #214155)
 
  -- John Leuner <jewel at debian.org>  Sun, 12 Oct 2003 14:44:20 +0200
 
 antlr (2.7.2-3) unstable; urgency=low
 
   * Applied patch from Kristian G. Kvilekval which fixes
-    a behaviour change from 2.7.1 to 2.7.2. 
+    a behaviour change from 2.7.1 to 2.7.2.
     (Closes: #206489)
 
  -- John Leuner <jewel at debian.org>  Thu,  4 Sep 2003 19:19:56 +0200
@@ -539,7 +553,7 @@ antlr (2.7.2-2) unstable; urgency=low
 
 antlr (2.7.2-1) unstable; urgency=low
 
-  * New upstream version 
+  * New upstream version
   * No longer builds libantlr.la (upstream build system has changed)
   * antlr package is now for all architectures
 
@@ -574,19 +588,19 @@ antlr (2.7.1-10) unstable; urgency=low
 
 antlr (2.7.1-9) unstable; urgency=low
 
-  * Created shell script in /usr/bin that will run antlr.Tool 
+  * Created shell script in /usr/bin that will run antlr.Tool
 
  -- John Leuner <jewel at debian.org>  Fri,  4 Jan 2002 14:10:52 +0000
 
 antlr (2.7.1-8) unstable; urgency=low
 
-  * Changed install to not set execute permissions on jar files 
+  * Changed install to not set execute permissions on jar files
 
  -- John Leuner <jewel at debian.org>  Thu,  3 Jan 2002 18:07:00 +0000
 
 antlr (2.7.1-7) unstable; urgency=low
 
-  * Applied man page formatting patch by Richard Tibbet 
+  * Applied man page formatting patch by Richard Tibbet
 
  -- John Leuner <jewel at debian.org>  Thu,  3 Jan 2002 17:54:29 +0000
 


=====================================
debian/control
=====================================
@@ -4,15 +4,16 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
  Torsten Werner <twerner at debian.org>,
+ tony mancill <tmancill at debian.org>
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  default-jdk,
  dh-python,
+ maven-repo-helper,
  python3-all-dev,
  python3-setuptools,
  sharutils,
- maven-repo-helper,
-Standards-Version: 4.4.0
+Standards-Version: 4.5.1
 Vcs-Git: https://salsa.debian.org/java-team/antlr.git
 Vcs-Browser: https://salsa.debian.org/java-team/antlr
 Homepage: https://www.antlr2.org
@@ -42,6 +43,7 @@ Description: language tool for constructing recognizers, compilers etc
 Package: antlr-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Description: language tool for constructing recognizers, compilers etc
@@ -71,6 +73,7 @@ Description: language tool for constructing recognizers, compilers etc
 
 Package: libantlr-java
 Architecture: all
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Description: language tool for constructing recognizers, compilers etc (java library)


=====================================
debian/copyright
=====================================
@@ -90,15 +90,18 @@ License: GPL-3+
  License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: debian/*
-Copyright: 2000-2011, John Leuner <jewel at debian.org>
-           2004-2011, Arnaud Vandyck <avdyk at debian.org>
-           2005-2011, Michael Koch <konqueror at gmx.de>
-           2005-2011, Barry Hawkins <barry at bytemason.org>
-           2008-2011, Matthias Klose <doko at debian.org>
-           2009-2011, Torsten Werner <twerner at debian.org>
-           2009-2011, Ludovic Claude <ludovic.claude at laposte.net>
-           2010-2011, Niels Thykier <niels at thykier.net>
-           2011, tony mancill <tmancill at debian.org>
+Copyright: 2000-2021, John Leuner <jewel at debian.org>
+           2004-2021, Arnaud Vandyck <avdyk at debian.org>
+           2005-2021, Michael Koch <konqueror at gmx.de>
+           2005-2021, Barry Hawkins <barry at bytemason.org>
+           2008-2021, Matthias Klose <doko at debian.org>
+           2009-2021, Torsten Werner <twerner at debian.org>
+           2009-2021, Ludovic Claude <ludovic.claude at laposte.net>
+           2010-2021, Niels Thykier <niels at thykier.net>
+           2011-2021, tony mancill <tmancill at debian.org>
+           2013-2021, Emmanuel Bourg <ebourg at apache.org>
+           2017-2021, Thomas Goirand <zigo at debian.org>
+           2019-2021, Stephen Kitt <skitt at debian.org>
 License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file


=====================================
debian/patches/0002-configure.in-Set-timestamp-from-SOURCE_DATE_EPOCH-va.patch
=====================================
@@ -0,0 +1,31 @@
+From 720ef9012317fd3254c5f4624fc076627d7ad434 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant at reproducible-builds.org>
+Date: Wed, 14 Jul 2021 14:25:12 +0000
+Subject: [PATCH 2/3] configure.in: Set timestamp from SOURCE_DATE_EPOCH
+ variable.
+
+https://reproducible-builds.org/docs/source-date-epoch/
+---
+ configure.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 8100f62a..c9aa8db0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -111,7 +111,11 @@ AC_SUBST([APTC])
+ VERSION=`echo $PACKAGE_VERSION | cut -d . -f 1`
+ SUBVERSION=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PATCHLEVEL=`echo $PACKAGE_VERSION | cut -d . -f 3`
+-TIMESTAMP=`date +%Y%m%d`
++# Set TIMESTAMP from SOURCE_DATE_EPOCH
++# https://reproducible-builds.org/docs/source-date-epoch/
++SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
++DATE_FMT="+%Y%m%d"
++TIMESTAMP=`date -u -d "@$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u "$DATE_FMT"`
+ 
+ ## @abs_this_builddir@  - absolute path to top of build directory.
+ ## According to GNU autoconf we can rely on that there's a proper
+-- 
+2.32.0
+


=====================================
debian/patches/0003-Makefile.in-Set-timestamp-from-SOURCE_DATE_PEOCH-env.patch
=====================================
@@ -0,0 +1,34 @@
+From 70f31c66e4e8b0d3a2b9a66a3edfed74f991c2a4 Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <vagrant at reproducible-builds.org>
+Date: Wed, 14 Jul 2021 14:27:53 +0000
+Subject: [PATCH 3/3] Makefile.in: Set timestamp from SOURCE_DATE_PEOCH
+ environment variable.
+
+https://reproducible-builds.org/docs/source-date-epoch/
+---
+ Makefile.in | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8fa86d69..e44ca4b8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,14 @@ maintainer-clean: distclean
+ # Rule to make a tarball exclusive all kinds of fluff
+ #
+ 
+-TIMESTAMP       = $(shell date +%Y%m%d)
++# Set TIMESTAMP from SOURCE_DATE_EPOCH
++# https://reproducible-builds.org/docs/source-date-epoch/
++DATE_FMT = +%Y%m%d
++ifdef SOURCE_DATE_EPOCH
++    TIMESTAMP ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)")
++else
++    TIMESTAMP ?= $(shell date "$(DATE_FMT)")
++endif
+ TAR_DIR         = $(versioneddir)
+ TAR_FILE	      = $(versioneddir).tar
+ 
+-- 
+2.32.0
+


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,5 @@ gcc.diff
 bin___antlr.diff
 antlr-config.patch
 python3-compat.patch
+0002-configure.in-Set-timestamp-from-SOURCE_DATE_EPOCH-va.patch
+0003-Makefile.in-Set-timestamp-from-SOURCE_DATE_PEOCH-env.patch


=====================================
debian/rules
=====================================
@@ -46,6 +46,8 @@ override_dh_installdocs:
 override_dh_installexamples:
 	dh_installexamples
 	find debian/antlr-doc/usr/share/doc/antlr/examples -type f -print | xargs -r chmod 0644
+	# Remove example Makefiles containing build paths and binary paths
+	find debian/antlr-doc/usr/share/doc/antlr/examples -name Makefile -print -delete
 	rm -rf debian/antlr-doc/usr/share/doc/antlr/examples/csharp
 
 override_dh_auto_clean:


=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
-version=3
+version=4
 opts=dversionmangle=s/(\d)[\+\.\-~](?:dfsg|debian|ds|repack)\.?\d*$/$1/ \
 https://www.antlr2.org/download.html \
 (?:.*/|.*=|)antlr[\-\._](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)(?:/\S*)?



View it on GitLab: https://salsa.debian.org/java-team/antlr/-/compare/22507f4aaed1dadfa9f37d80939bb681a60fe052...d1eed670ebe2b1133bcee20e55bfe284b67a7609

-- 
View it on GitLab: https://salsa.debian.org/java-team/antlr/-/compare/22507f4aaed1dadfa9f37d80939bb681a60fe052...d1eed670ebe2b1133bcee20e55bfe284b67a7609
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210811/8a2fa0e6/attachment.htm>


More information about the pkg-java-commits mailing list