[Git][java-team/antlr][master] 4 commits: Update python3 patch to remove python3-six (Closes: #1080028)

Tony Mancill (@tmancill) gitlab at salsa.debian.org
Sat Aug 31 21:22:23 BST 2024



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


Commits:
37a8f7aa by tony mancill at 2024-08-31T13:00:23-07:00
Update python3 patch to remove python3-six (Closes: #1080028)

Thank you to Alexandre Detiste for the bug report and patch.

- - - - -
5794ed44 by tony mancill at 2024-08-31T13:14:28-07:00
Freshen years in debian/copyright

- - - - -
fb349ec7 by tony mancill at 2024-08-31T13:14:28-07:00
Bump Standards-Version to 4.7.0

- - - - -
c5bcb8d7 by tony mancill at 2024-08-31T13:14:34-07:00
Prepare changelog for upload

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/patches/python3-compat.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+antlr (2.7.7+dfsg-14) unstable; urgency=medium
+
+  * Update python3 patch to remove python3-six (Closes: #1080028)
+    Thank you to Alexandre Detiste for the bug report and patch.
+  * Freshen years in debian/copyright
+  * Bump Standards-Version to 4.7.0
+
+ -- tony mancill <tmancill at debian.org>  Sat, 31 Aug 2024 13:13:43 -0700
+
 antlr (2.7.7+dfsg-13) unstable; urgency=medium
 
   * Fix FTBFS with Java 21 (Closes: #1057488)


=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
  python3-all-dev,
  python3-setuptools,
  sharutils,
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Vcs-Git: https://salsa.debian.org/java-team/antlr.git
 Vcs-Browser: https://salsa.debian.org/java-team/antlr
 Homepage: https://www.antlr2.org
@@ -86,7 +86,6 @@ Package: python3-antlr
 Section: python
 Architecture: all
 Depends:
- python3-six,
  ${misc:Depends},
  ${python3:Depends},
 Description: language tool for constructing recognizers, compilers etc - Python 3.x


=====================================
debian/copyright
=====================================
@@ -90,18 +90,18 @@ License: GPL-3+
  License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: debian/*
-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>
+Copyright: 2000-2024, John Leuner <jewel at debian.org>
+           2004-2024, Arnaud Vandyck <avdyk at debian.org>
+           2005-2024, Michael Koch <konqueror at gmx.de>
+           2005-2024, Barry Hawkins <barry at bytemason.org>
+           2008-2024, Matthias Klose <doko at debian.org>
+           2009-2024, Torsten Werner <twerner at debian.org>
+           2009-2024, Ludovic Claude <ludovic.claude at laposte.net>
+           2010-2024, Niels Thykier <niels at thykier.net>
+           2011-2024, tony mancill <tmancill at debian.org>
+           2013-2024, Emmanuel Bourg <ebourg at apache.org>
+           2017-2024, Thomas Goirand <zigo at debian.org>
+           2019-2024, 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/python3-compat.patch
=====================================
@@ -18,8 +18,8 @@ Last-Update: 2017-10-24
 -    False = 0
 -if version < '2.3':
 -    True = not False
-+import six
-+from six.moves import range
++
++
  
  ###xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx###
  ###                     global symbols                             ###
@@ -37,7 +37,7 @@ Last-Update: 2017-10-24
  
  def is_string_type(x):
 -    return  (isinstance(x,str) or isinstance(x,unicode))
-+    return  (isinstance(x,str) or isinstance(x,six.text_type))
++    return  (isinstance(x,str) or isinstance(x,str))
  
  def assert_string_type(x):
      assert is_string_type(x)



View it on GitLab: https://salsa.debian.org/java-team/antlr/-/compare/447271224a73187ed22885d9333e0142893e7277...c5bcb8d799f66106305c21a168ebba7e2fa65f06

-- 
View it on GitLab: https://salsa.debian.org/java-team/antlr/-/compare/447271224a73187ed22885d9333e0142893e7277...c5bcb8d799f66106305c21a168ebba7e2fa65f06
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/20240831/0735e5af/attachment.htm>


More information about the pkg-java-commits mailing list