From 20f3c03abf41e4927d07f3097b4a713e56330e39 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 22 Jul 2016 19:28:02 +0200 Subject: dbus-java: remove old package It was in staging for a year and nobody cared. Signed-off-by: Michael Olbrich --- ...RPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch | 37 --------- patches/dbus-java-2.7/series | 3 - rules/dbus-java.in | 30 ------- rules/dbus-java.make | 97 ---------------------- 4 files changed, 167 deletions(-) delete mode 100644 patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch delete mode 100644 patches/dbus-java-2.7/series delete mode 100644 rules/dbus-java.in delete mode 100644 rules/dbus-java.make diff --git a/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch b/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch deleted file mode 100644 index 9bf20acb6..000000000 --- a/patches/dbus-java-2.7/0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Michael Olbrich -Date: Wed, 19 Jan 2011 14:01:46 +0100 -Subject: [PATCH] HACK: use $JARPREFIX instead of $JAVAUNIXJARDIR to look for unix.jar at runtime. - -JAVAUNIXJARDIR cannot be used here because it is used at compile time and has -to start with $(SYSROOT). - -Signed-off-by: Michael Olbrich ---- - Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 65bff86..8ebb3d3 100644 ---- a/Makefile -+++ b/Makefile -@@ -88,7 +88,7 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc - 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 -+ echo "Class-Path: ${JARPREFIX}/unix.jar ${JARPREFIX}/hexdump.jar ${JARPREFIX}/debug-$(DEBUG).jar" > Manifest - (cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class) - dbus-java-test-$(VERSION).jar: .testclasses - echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest -@@ -141,7 +141,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc - $(DOCBOOKTOMAN) $< > $@ - - bin/%: %.sh .bin -- sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ -+ sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ - - win/%.bat: %.bat .win - sed 's,\%WINJARPATH\%,$(JARPREFIX),;s,\%WINUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),' < $< > $@ --- -1.7.2.3 - diff --git a/patches/dbus-java-2.7/series b/patches/dbus-java-2.7/series deleted file mode 100644 index cbca0a209..000000000 --- a/patches/dbus-java-2.7/series +++ /dev/null @@ -1,3 +0,0 @@ -# generated by git-ptx-patches -0001-HACK-use-JARPREFIX-instead-of-JAVAUNIXJARDIR-to-look.patch -# 7fe933df14af156789a1d628f11bef0b - git-ptx-patches magic diff --git a/rules/dbus-java.in b/rules/dbus-java.in deleted file mode 100644 index 55c659f68..000000000 --- a/rules/dbus-java.in +++ /dev/null @@ -1,30 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=middleware - -menuconfig DBUS_JAVA - tristate - prompt "dbus java bindings " - select HOST_GETTEXT - select LIBMATTHEW_JAVA - select LIBMATTHEW_JAVA_UNIX_SOCKETS - select LIBMATTHEW_JAVA_DEBUG - select LIBMATTHEW_JAVA_HEXDUMP - select CLASSPATH - select DBUS - help - Runtime shared native libraries and classes to make JAVA talking - with DBus. - - STAGING: remove in ptxdist-2016.08.0 - libmatthew-java's upstream is no longer available. - -if DBUS_JAVA - -config DBUS_JAVA_SCRIPTS - bool - prompt "Install scripts" - help - Install a few shell scripts, to run and test the JAVA classes. - -endif diff --git a/rules/dbus-java.make b/rules/dbus-java.make deleted file mode 100644 index 4acf47756..000000000 --- a/rules/dbus-java.make +++ /dev/null @@ -1,97 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2011 by Juergen Beisert -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_DBUS_JAVA) += dbus-java - -# -# Paths and names -# -DBUS_JAVA_VERSION := 2.7 -DBUS_JAVA_MD5 := 8b8470db5cd657591bac245e3b6e18e4 -DBUS_JAVA := dbus-java-$(DBUS_JAVA_VERSION) -DBUS_JAVA_SUFFIX := tar.gz -DBUS_JAVA_URL := http://dbus.freedesktop.org/releases/dbus-java/$(DBUS_JAVA).$(DBUS_JAVA_SUFFIX) -DBUS_JAVA_SOURCE := $(SRCDIR)/$(DBUS_JAVA).$(DBUS_JAVA_SUFFIX) -DBUS_JAVA_DIR := $(BUILDDIR)/$(DBUS_JAVA) -DBUS_JAVA_LICENSE := unknown - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -DBUS_JAVA_CONF_TOOL := NO - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -DBUS_JAVA_MAKE_PAR := NO - -DBUS_JAVA_MAKE_OPT := \ - $(CROSS_ENV_CC) \ - JAVA_HOME=$(PTXCONF_SETUP_JAVA_SDK) \ - CLASSPATH=$(PTXCONF_SETUP_JAVA_SDK)/jre/lib \ - JAVAC=$(PTXCONF_SETUP_JAVA_SDK)/bin/javac \ - JAVA=$(PTXCONF_SETUP_JAVA_SDK)/bin/java \ - JAR=$(PTXCONF_SETUP_JAVA_SDK)/bin/jar \ - JAVAUNIXJARDIR=$(SYSROOT)/usr/share/java \ - JAVAUNIXLIBDIR=/usr/lib \ - PREFIX=/usr \ - JARPREFIX=/usr/share/java \ - LIBDIR=/usr/lib \ - bin - -DBUS_JAVA_INSTALL_OPT := \ - $(CROSS_ENV_CC) \ - PREFIX=/usr \ - LIBDIR=/usr/lib \ - install-bin - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/dbus-java.targetinstall: - @$(call targetinfo) - - @$(call install_init, dbus-java) - @$(call install_fixup, dbus-java,PRIORITY,optional) - @$(call install_fixup, dbus-java,SECTION,base) - @$(call install_fixup, dbus-java,AUTHOR,"Juergen Beisert ") - @$(call install_fixup, dbus-java,DESCRIPTION,"JAVA-DBUS binding") - -ifdef PTXCONF_DBUS_JAVA_SCRIPTS - @$(call install_copy, dbus-java, 0, 0, 0755, -, /usr/bin/CreateInterface) - @$(call install_copy, dbus-java, 0, 0, 0755, -, /usr/bin/DBusCall) - @$(call install_copy, dbus-java, 0, 0, 0755, -, /usr/bin/DBusDaemon) - @$(call install_copy, dbus-java, 0, 0, 0755, -, /usr/bin/DBusViewer) - @$(call install_copy, dbus-java, 0, 0, 0755, -, /usr/bin/ListDBus) -endif - - @$(call install_copy, dbus-java, 0, 0, 0644, \ - $(DBUS_JAVA_PKGDIR)/usr/share/java/dbus-2.7.jar, \ - /usr/share/java/dbus.jar) - - @$(call install_copy, dbus-java, 0, 0, 0644, \ - $(DBUS_JAVA_PKGDIR)/usr/share/java/dbus-bin-2.7.jar, \ - /usr/share/java/dbus-bin.jar) - - @$(call install_copy, dbus-java, 0, 0, 0644, \ - $(DBUS_JAVA_PKGDIR)/usr/share/java/dbus-viewer-2.7.jar, \ - /usr/share/java/dbus-viewer.jar) - - @$(call install_finish, dbus-java) - - @$(call touch) - -# vim: syntax=make -- cgit v1.2.3