Tony Mancill pushed to branch master at Debian Java Maintainers / dbus-java
Commits:
08a571aa by tony mancill at 2023-11-19T21:16:17-08:00
Update no-translations patch to allow building twice (Closes: #1044659)
- - - - -
0812075a by tony mancill at 2023-11-19T21:26:41-08:00
Bump Standards-Version to 4.6.2 (no changes)
- - - - -
8f591e2c by tony mancill at 2023-11-19T21:27:59-08:00
Set Rules-Requires-Root: no in debian/control
- - - - -
3bbb6b47 by tony mancill at 2023-11-19T21:29:58-08:00
Prepare changelog for upload
- - - - -
3 changed files:
- debian/changelog
- debian/control
- debian/patches/no-translations.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,18 @@
-dbus-java (2.8-11) UNRELEASED; urgency=medium
+dbus-java (2.8-11) unstable; urgency=medium
+ * Team upload
+
+ [ Vladimir Petko ]
* d/rules: use java_compat_level variable provided by java-common to
adjust -source/-target level to the minimum required by the default
Java (Closes: #1053021).
- -- Vladimir Petko <[email protected]> Mon, 20 Nov 2023 17:04:02
+1300
+ [ tony mancill ]
+ * Update no-translations patch to allow building twice (Closes: #1044659)
+ * Set Rules-Requires-Root: no in debian/control
+ * Bump Standards-Version to 4.6.2 (no changes)
+
+ -- tony mancill <[email protected]> Sun, 19 Nov 2023 21:17:30 -0800
dbus-java (2.8-10) unstable; urgency=medium
@@ -322,4 +330,3 @@ libdbus-java (0.1) unstable; urgency=low
* Initial Release.
-- Matthew Johnson <[email protected]> Mon, 19 Dec 2005 15:14:36 +0000
-
=====================================
debian/control
=====================================
@@ -11,10 +11,11 @@ Build-Depends:
javahelper (>= 0.42),
libmatthew-debug-java,
libunixsocket-java (>= 0.6),
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/dbus-java.git
Vcs-Browser: https://salsa.debian.org/java-team/dbus-java
Homepage: https://www.freedesktop.org/wiki/Software/DBusBindings
+Rules-Requires-Root: no
Package: libdbus-java
Architecture: all
@@ -29,4 +30,3 @@ Description: simple interprocess messaging system (Java
implementation)
This package provides an implementation of D-Bus in Java (Library).
.
See the dbus description for more information about D-Bus in general.
-
=====================================
debian/patches/no-translations.patch
=====================================
@@ -1,16 +1,15 @@
From: Markus Koschany <[email protected]>
Date: Wed, 20 Dec 2017 01:04:04 +0100
Subject: no translations
+Last-Update: 2023-11-19
---
Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
-Index: dbus-java/Makefile
-===================================================================
---- dbus-java.orig/Makefile
-+++ dbus-java/Makefile
-@@ -79,8 +79,6 @@ binclasses: .binclasses
+--- a/Makefile
++++ b/Makefile
+@@ -79,17 +79,15 @@
.classes: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java
$(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java translations/*.po
mkdir -p classes
$(JAVAC) -d classes -cp
classes:${JAVAUNIXJARDIR}/unix.jar:${JAVAUNIXJARDIR}/debug-$(DEBUG).jar:${JAVAUNIXJARDIR}/hexdump.jar:$(CLASSPATH)
$(JCFLAGS) $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java
$(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java
@@ -18,8 +17,12 @@ Index: dbus-java/Makefile
- $(MSGFMT) --java2 -r dbusjava_localized -d classes translations/en_GB.po
touch .classes
- translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java
$(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java
$(SRCDIR)/dbus/bin/*.java $(SRCDIR)/dbus/viewer/*.java
-@@ -89,7 +87,7 @@ translations/en_GB.po: $(SRCDIR)/*.java
+-translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java
$(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java
$(SRCDIR)/dbus/bin/*.java $(SRCDIR)/dbus/viewer/*.java
+- echo "#java-format" > $@
+- sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed
's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
++#translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java
$(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java
$(SRCDIR)/dbus/bin/*.java $(SRCDIR)/dbus/viewer/*.java
++# echo "#java-format" > $@
++# sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed
's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
libdbus-java-$(VERSION).jar: .classes
echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar
${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
@@ -28,11 +31,9 @@ Index: dbus-java/Makefile
dbus-java-test-$(VERSION).jar: .testclasses
echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
(cd classes; $(JAR) -cfm ../$@ ../Manifest
org/freedesktop/dbus/test/*.class)
-Index: dbus-java/org/freedesktop/dbus/Gettext.java
-===================================================================
---- dbus-java.orig/org/freedesktop/dbus/Gettext.java
-+++ dbus-java/org/freedesktop/dbus/Gettext.java
-@@ -22,9 +22,11 @@ import java.util.ResourceBundle;
+--- a/org/freedesktop/dbus/Gettext.java
++++ b/org/freedesktop/dbus/Gettext.java
+@@ -22,9 +22,11 @@
public class Gettext
{
View it on GitLab:
https://salsa.debian.org/java-team/dbus-java/-/compare/fde4b1723028b1966d2aa29bea73f92fff36f5b8...3bbb6b47b1ad4a9fb8469dc672ef48c4c30d5cd3
--
View it on GitLab:
https://salsa.debian.org/java-team/dbus-java/-/compare/fde4b1723028b1966d2aa29bea73f92fff36f5b8...3bbb6b47b1ad4a9fb8469dc672ef48c4c30d5cd3
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
