[Git][java-team/java-gnome][master] 3 commits: Import Debian changes 4.1.3-8.1
Tony Mancill
gitlab at salsa.debian.org
Wed Aug 5 06:58:19 BST 2020
Tony Mancill pushed to branch master at Debian Java Maintainers / java-gnome
Commits:
de20b958 by Paul Wise at 2020-08-04T22:45:28-07:00
Import Debian changes 4.1.3-8.1
java-gnome (4.1.3-8.1) unstable; urgency=medium
..
* Non-maintainer upload.
* Migrate from enchant 1 to enchant-2 (Closes: #951271)
- - - - -
24fac5d8 by tony mancill at 2020-08-04T22:49:03-07:00
Build-depend on python3 and update python patch (Closes: #967152)
- - - - -
2c09b3f9 by tony mancill at 2020-08-04T22:49:45-07:00
prepare for upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/02_build_python.diff
- + debian/patches/enchant_2.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+java-gnome (4.1.3-9) unstable; urgency=medium
+
+ * Team upload.
+ * Build-depend on python3 and update python patch (Closes: #967152)
+
+ -- tony mancill <tmancill at debian.org> Tue, 04 Aug 2020 22:49:34 -0700
+
+java-gnome (4.1.3-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Migrate from enchant 1 to enchant-2 (Closes: #951271)
+
+ -- Paul Wise <pabs at debian.org> Wed, 08 Jul 2020 00:01:41 +0800
+
java-gnome (4.1.3-8) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
junit,
libatk1.0-dev,
libcairo2-dev (>= 1.10),
- libenchant-dev,
+ libenchant-2-dev,
libglib2.0-dev (>= 2.28),
libgtk-3-dev (>= 3.4),
libgtksourceview-3.0-dev (>= 3.0),
@@ -22,7 +22,7 @@ Build-Depends:
libpango1.0-dev (>= 1.28),
librsvg2-dev (>= 2.32),
metacity,
- python,
+ python3,
xfonts-base,
xvfb
Standards-Version: 4.1.4
=====================================
debian/patches/02_build_python.diff
=====================================
@@ -1,12 +1,137 @@
## Description: python2 env variable not foundable
## Origin/Author: Guillaume Mazoyer
-Index: java-gnome-4.1.3/build/faster
-===================================================================
---- java-gnome-4.1.3.orig/build/faster 2013-05-09 16:40:43.034285172 +0200
-+++ java-gnome-4.1.3/build/faster 2013-05-09 16:42:59.802963352 +0200
+--- a/build/faster
++++ b/build/faster
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
-+#!/usr/bin/env python
++#!/usr/bin/python3
# vim: set fileencoding=UTF-8
#
# java-gnome, a UI library for writing GTK and GNOME programs from Java!
+@@ -49,7 +49,7 @@
+ # bring to the process when it lands, so it is a step in the right direction.
+ #
+
+-import os, hashlib, subprocess, cPickle, sys
++import os, hashlib, subprocess, pickle, sys
+ from os.path import *
+ from shutil import move
+
+@@ -85,7 +85,7 @@
+ flock(lock, LOCK_EX | LOCK_NB)
+ except IOError:
+ if not silent:
+- print "Inhibited: another build process already running"
++ print("Inhibited: another build process already running")
+ sys.stdout.flush()
+ sys.exit(0)
+
+@@ -109,16 +109,16 @@
+ def loadConfig():
+ global config
+ if ((not isfile(configFile)) or (getmtime(configFile) < getmtime(versionFile))):
+- print
+- print "You need to run ./configure to check prerequisites"
+- print "and setup preferences before you can build java-gnome."
++ print()
++ print("You need to run ./configure to check prerequisites")
++ print("and setup preferences before you can build java-gnome.")
+
+ if not os.access("configure", os.X_OK):
+- print "I'll make it executable for you."
+- print
++ print("I'll make it executable for you.")
++ print()
+ executeCommand("CHMOD", "configure", "chmod +x configure")
+ else:
+- print
++ print()
+
+ sys.exit(1)
+ try:
+@@ -132,7 +132,7 @@
+ cfg.close()
+
+ except (EOFError):
+- print "Error while trying to read .config"
++ print("Error while trying to read .config")
+ sys.exit(9)
+
+ config['GNOME_CCFLAGS'] = os.popen("pkg-config --cflags " + GNOME_MODULES).read().rstrip()
+@@ -144,10 +144,10 @@
+ if isfile(hashFile):
+ try:
+ db = open(hashFile, "rb")
+- hashes = cPickle.load(db)
++ hashes = pickle.load(db)
+ db.close()
+ except (EOFError, KeyError, IndexError):
+- print "build checksum cache corrupt; full rebuild forced"
++ print("build checksum cache corrupt; full rebuild forced")
+ hashes = {}
+
+
+@@ -159,7 +159,7 @@
+
+ def checkpointHashes():
+ db = open(hashFile + ".tmp", "wb")
+- cPickle.dump(hashes, db)
++ pickle.dump(hashes, db)
+ db.close()
+
+ move(hashFile + ".tmp", hashFile)
+@@ -217,7 +217,7 @@
+ #
+
+ def sourceChanged(file, hash):
+- if hashes.has_key(file):
++ if file in hashes:
+ if hashes[file] == hash:
+ return False
+ return True
+@@ -229,7 +229,7 @@
+
+ def debug(args):
+ if False:
+- print args,
++ print(args, end='')
+
+
+ def filesNeedBuilding(list, update=True):
+@@ -244,7 +244,7 @@
+ if not isfile(source):
+ sys.exit(source + " missing, abort")
+
+- f = open(source)
++ f = open(source, 'rb')
+ m = hashlib.md5(f.read())
+ f.close()
+ hash = m.hexdigest()
+@@ -331,9 +331,9 @@
+ def executeCommand(short, what, cmd, inDir=None):
+ sys.stderr.flush()
+ if not silent:
+- print short + "\t" + what
++ print(short + "\t" + what)
+ if verbose:
+- print cmd
++ print(cmd)
+ sys.stdout.flush()
+
+ status = subprocess.call(cmd, shell=True, cwd=inDir, bufsize=1)
+@@ -497,7 +497,7 @@
+ def compileCSourceToObject(source, target):
+ ensureDirectory(dirname(target))
+
+- if config.has_key('CCACHE'):
++ if 'CCACHE' in config:
+ cmd = config['CCACHE'] + " "
+ else:
+ cmd = ""
+@@ -739,5 +739,5 @@
+ try:
+ main()
+ except KeyboardInterrupt:
+- print
++ print()
+
=====================================
debian/patches/enchant_2.patch
=====================================
@@ -0,0 +1,30 @@
+Description: switch from Enchant 1 to 2
+Origin: https://aur.archlinux.org/cgit/aur.git/plain/enchant_2.patch?h=java-gnome
+Bug-Debian: https://bugs.debian.org/951271
+diff '--color=auto' -ur java-gnome-4.1.3/build/faster java-gnome-4.1.3_fixed/build/faster
+--- a/build/faster
++++ b/build/faster
+@@ -63,7 +63,7 @@
+ hashFile = "tmp/.hashes"
+ lockFile = "tmp/.build"
+
+-GNOME_MODULES = "gthread-2.0 glib-2.0 gtk+-3.0 gtk+-unix-print-3.0 gtksourceview-3.0 libnotify enchant librsvg-2.0"
++GNOME_MODULES = "gthread-2.0 glib-2.0 gtk+-3.0 gtk+-unix-print-3.0 gtksourceview-3.0 libnotify enchant-2 librsvg-2.0"
+
+ #
+ # Armour against multiple simultaneous invocations.
+--- a/configure
++++ b/configure
+@@ -897,9 +897,9 @@
+ "libgtksourceview-3.0-dev");
+
+ check_system_library(@gnomedev_libs,
+- "enchant",
+- "Enchant",
+- "libenchant-dev");
++ "enchant-2",
++ "Enchant 2",
++ "libenchant-2-dev");
+
+ # check_system_library(@gnomedev_libs,
+ # "gtkspell-3.0",
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
05_ppc64el_configure.patch
06_disable_java_check.patch
07_java10_compatibility.patch
+enchant_2.patch
View it on GitLab: https://salsa.debian.org/java-team/java-gnome/-/compare/d661bcc290e2eb8ec4608145fdd32d0c831b30ad...2c09b3f911ec5235dfb90ba07cd3321e390e2b5c
--
View it on GitLab: https://salsa.debian.org/java-team/java-gnome/-/compare/d661bcc290e2eb8ec4608145fdd32d0c831b30ad...2c09b3f911ec5235dfb90ba07cd3321e390e2b5c
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/20200805/664c8f07/attachment.html>
More information about the pkg-java-commits
mailing list