[libxbean-java] 01/08: Removed the bootstrapping
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Sep 11 15:33:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxbean-java.
commit 9e617429f607a99ce1b2ff45fa12952828659177
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Aug 3 16:57:37 2017 +0200
Removed the bootstrapping
---
debian/bootstrap.properties | 3 --
debian/bootstrap.xml | 59 ----------------------------------
debian/changelog | 7 ++++
debian/control | 34 +++-----------------
debian/libxbean-java-doc.install | 1 +
debian/patches/bootstrap.diff | 26 ---------------
debian/patches/bootstrap.series | 5 ---
debian/patches/{full.series => series} | 0
debian/rules | 11 ++-----
debian/rules.bootstrap | 29 -----------------
debian/rules.full | 18 -----------
11 files changed, 15 insertions(+), 178 deletions(-)
diff --git a/debian/bootstrap.properties b/debian/bootstrap.properties
deleted file mode 100644
index 84e3e42..0000000
--- a/debian/bootstrap.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javadoc.dir=build/docs/api
-maven.test.skip=true
-build.javaVersion=1.5
diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml
deleted file mode 100644
index 6854f0b..0000000
--- a/debian/bootstrap.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="xbean" default="package" basedir="..">
-
- <property file="debian/bootstrap.properties"/>
- <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
- <macrodef name="cleanmodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="clean" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- </ant>
- </sequential>
- </macrodef>
-
- <macrodef name="packagemodule">
- <attribute name="dir"/>
- <attribute name="classpath" default="${classpath.compile}" />
- <sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- <property name="classpath.compile" value="@{classpath}"/>
- </ant>
- </sequential>
- </macrodef>
-
- <target name="clean">
- <delete dir="build"/>
- <!--cleanmodule dir="maven-xbean-plugin"/>
- <cleanmodule dir="xbean-classloader"/-->
- <cleanmodule dir="xbean-classpath"/>
- <cleanmodule dir="xbean-naming"/>
- <cleanmodule dir="xbean-reflect"/>
- <cleanmodule dir="xbean-telnet"/>
- </target>
-
- <!-- we do not build all modules yet -->
- <target name="package">
- <packagemodule dir=""/>
- <packagemodule dir="xbean-classpath"/>
- <packagemodule dir="xbean-naming"/>
- <packagemodule dir="xbean-reflect"/>
- <packagemodule dir="xbean-telnet"/>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="xbean-classpath/src/main/java/"/>
- <packageset dir="xbean-naming/src/main/java/"/>
- <packageset dir="xbean-reflect/src/main/java/"/>
- <packageset dir="xbean-telnet/src/main/java/"/>
- </javadoc>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 6aee1de..fc30412 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxbean-java (4.5-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Removed the bootstrapping
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 03 Aug 2017 15:54:39 +0200
+
libxbean-java (4.5-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 997b46c..fcaf40b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,11 @@ Uploaders:
Damien Raude-Morvan <drazzib at debian.org>,
Emmanuel Bourg <ebourg at apache.org>
Build-Depends:
- cdbs,
debhelper (>= 9),
default-jdk,
- maven-debian-helper (>= 1.4.4),
- quilt
+ maven-debian-helper (>= 2.2),
Build-Depends-Indep:
ant,
- ant-optional,
groovy,
junit4,
libasm-java (>= 5.0),
@@ -35,11 +32,7 @@ Build-Depends-Indep:
libspring-beans-java,
libspring-context-java,
libspring-core-java,
- libspring-web-java,
- maven-repo-helper,
- rdfind,
- symlinks,
- maven-ant-helper (>> 4)
+ libspring-web-java
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxbean-java.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxbean-java.git
@@ -47,24 +40,8 @@ Homepage: http://geronimo.apache.org/xbean/
Package: libxbean-java
Architecture: all
-Depends:
- ant,
- ${misc:Depends}
-Recommends:
- libasm-java (>= 5.0),
- libcommons-logging-java,
- liblog4j1.2-java
-Suggests:
- groovy,
- libequinox-osgi-java,
- libosgi-compendium-java,
- libosgi-core-java,
- libqdox-java,
- libslf4j-java,
- libspring-beans-java,
- libspring-context-java,
- libspring-core-java,
- libspring-web-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, libxbean-java-doc
Description: plugin based Java application server
The goal of XBean project is to created a plugin based server analogous to
Eclipse being a plugin based IDE. XBean will be able to discover, download and
@@ -76,8 +53,7 @@ Description: plugin based Java application server
Package: libxbean-java-doc
Section: doc
Architecture: all
-Depends:
- ${misc:Depends}
+Depends: ${misc:Depends}
Description: API documentation for XBean
The goal of XBean project is to created a plugin based server analogous to
Eclipse being a plugin based IDE. XBean will be able to discover, download and
diff --git a/debian/libxbean-java-doc.install b/debian/libxbean-java-doc.install
new file mode 100644
index 0000000..49dc750
--- /dev/null
+++ b/debian/libxbean-java-doc.install
@@ -0,0 +1 @@
+target/site/apidocs/* /usr/share/doc/libxbean-java/api/
diff --git a/debian/patches/bootstrap.diff b/debian/patches/bootstrap.diff
deleted file mode 100644
index 21cc069..0000000
--- a/debian/patches/bootstrap.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Change declared package of ASM when building in bootstrap mode
- as we don't have any "shading" Maven module.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-07-19
-Forwarded: not-needed
---- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
-+++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
-@@ -17,12 +17,12 @@
- */
- package org.apache.xbean.recipe;
-
--import org.apache.xbean.asm5.ClassReader;
--import org.apache.xbean.asm5.ClassVisitor;
--import org.apache.xbean.asm5.Label;
--import org.apache.xbean.asm5.MethodVisitor;
--import org.apache.xbean.asm5.Opcodes;
--import org.apache.xbean.asm5.Type;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-
- import java.io.IOException;
- import java.io.InputStream;
diff --git a/debian/patches/bootstrap.series b/debian/patches/bootstrap.series
deleted file mode 100644
index 4444f83..0000000
--- a/debian/patches/bootstrap.series
+++ /dev/null
@@ -1,5 +0,0 @@
-bootstrap.diff
-bundle.diff
-modules.diff
-DelegatingBundleContext.patch
-spring-compatibility.patch
diff --git a/debian/patches/full.series b/debian/patches/series
similarity index 100%
rename from debian/patches/full.series
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index c7acf39..5985cac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-VERSION := $(DEB_UPSTREAM_VERSION)
-
-ifneq (,$(findstring bootstrap, $(DEB_BUILD_OPTIONS)))
-include debian/rules.bootstrap
-else
-include debian/rules.full
-endif
+%:
+ dh $@
get-orig-source:
uscan --download-current-version --force-download --no-symlink
diff --git a/debian/rules.bootstrap b/debian/rules.bootstrap
deleted file mode 100644
index 9e5e392..0000000
--- a/debian/rules.bootstrap
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps commons-logging groovy log4j-1.2 asm asm-commons
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := debian/bootstrap.xml
-DEB_ANT_PROPERTYFILE := debian/bootstrap.properties
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
-MODULES := classpath naming reflect telnet
-
-DEB_PATCHDIRS := $(CURDIR)/debian/patches
-QUILT_SERIES := bootstrap.series
-export QUILT_SERIES
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- set -e; for MODULE in $(MODULES); do \
- mh_installjar -p$(PACKAGE) -l xbean-$$MODULE/pom.xml xbean-$$MODULE/build/xbean-$$MODULE-$(VERSION).jar; \
- done
-
-binary-post-install/$(PACKAGE)-doc::
- dh_install -p $(PACKAGE)-doc build/docs/api /usr/share/doc/$(PACKAGE)/
-
-clean::
- mh_clean
diff --git a/debian/rules.full b/debian/rules.full
deleted file mode 100755
index fae4f9e..0000000
--- a/debian/rules.full
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/maven.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:aggregate
-
-DEB_PATCHDIRS := $(CURDIR)/debian/patches
-QUILT_SERIES := full.series
-export QUILT_SERIES
-
-binary-post-install/$(PACKAGE)-doc::
- rdfind -outputname /dev/null -makesymlinks true target/site/apidocs
- symlinks -rsc target/site/apidocs
- dh_install -p $(PACKAGE)-doc target/site/apidocs/* /usr/share/doc/$(PACKAGE)/api/
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxbean-java.git
More information about the pkg-java-commits
mailing list