This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository derby.
commit 2c508815568ed1c0b3f1ec5ce9d5187735882663 Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 7 08:46:38 2013 +0000 Renamed the derby-client package to libderbyclient-java Installed Maven poms to /usr/share/maven-repo --- debian/changelog | 2 ++ debian/control | 19 ++++++++++--------- debian/derby-client.install | 1 - debian/libderbyclient-java.poms | 1 + debian/rules | 12 +++++++----- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54eaf8f..ca62ed4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ derby (10.10.1.1-1) UNRELEASED; urgency=low * debian/control: - Updated Standards-Version to 3.9.4 (no changes) - Removed the redundant Priority fields + * Renamed the derby-client package to libderbyclient-java + * Installed Maven poms to /usr/share/maven-repo -- Emmanuel Bourg <[email protected]> Fri, 07 Jun 2013 00:51:41 +0200 diff --git a/debian/control b/debian/control index 1b3a131..2ff1993 100644 --- a/debian/control +++ b/debian/control @@ -3,23 +3,24 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Tim Booth <[email protected]>, Emmanuel Bourg <[email protected]> -Build-Depends: debhelper (>= 9), default-jdk, javacc (>= 5.0-5), junit, liboro-java, ant (>= 1.7) +Build-Depends: debhelper (>= 9), default-jdk, javacc (>= 5.0-5), junit, liboro-java, ant (>= 1.7), maven-repo-helper Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/derby Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/derby Homepage: http://db.apache.org/derby/ -Package: derby-client +Package: libderbyclient-java Architecture: all -Section: libs -Depends: ${misc:Depends}, derby-common, default-jre | java6-runtime -Description: Apache Derby client - Client for Apache Derby. +Depends: ${misc:Depends} +Description: Apache Derby Client JDBC Driver + The Derby network client provides network connectivity to the Derby Network Server. + It is distributed as an additional jar file, derbyclient.jar, with an entirely + independent code base from the embedded driver. . - The client connects to a remote, local or embedded Apache Derby network server. - The server software comes with the derby-core package. + The Derby network client is a type 4, JDBC compliant Driver, which attempts to match + the Derby Embedded JDBC driver as much as possible. . - This is a free version of the libraries provided by sun-javadb-client + The Derby Network Server is provided by the derby-core package. Package: derby-common Architecture: all diff --git a/debian/derby-client.install b/debian/derby-client.install deleted file mode 100644 index 7727f81..0000000 --- a/debian/derby-client.install +++ /dev/null @@ -1 +0,0 @@ -jars/*sane/derbyclient-*.jar /usr/share/derby diff --git a/debian/libderbyclient-java.poms b/debian/libderbyclient-java.poms new file mode 100644 index 0000000..908d48e --- /dev/null +++ b/debian/libderbyclient-java.poms @@ -0,0 +1 @@ +maven2/client/pom.xml --no-parent diff --git a/debian/rules b/debian/rules index 7d2eb83..2b4b8b1 100755 --- a/debian/rules +++ b/debian/rules @@ -12,9 +12,10 @@ version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 dh $@ override_dh_auto_clean: + mh_clean ant clobber # Totally remove jars and javadoc directory - rm -rf jars javadoc + rm -rf jars javadoc tools/java/* # Other bits rm -f *.log cd java/demo/toursdb/ ; rm -rf *generated* ToursDB_schema.sql loadTables.sql @@ -48,14 +49,15 @@ override_dh_test: #Moved symlink stuff here so it works after version change override_dh_link: - dh_link -pderby-client /usr/share/derby/derbyclient-$(version).jar /usr/share/java/derbyclient-$(version).jar - dh_link -pderby-client /usr/share/java/derbyclient-$(version).jar /usr/share/java/derbyclient.jar - #. dh_link -pderby-core /usr/share/derby/derby-$(version).jar /usr/share/derby/derby-$(version).jar dh_link -pderby-core /usr/share/derby/derby-$(version).jar /usr/share/java/derby-$(version).jar dh_link -pderby-core /usr/share/java/derby-$(version).jar /usr/share/java/derby.jar #. dh_link --verbose - + +override_dh_auto_install: + mh_installpoms -plibderbyclient-java -e$(version) + mh_installjar -plibderbyclient-java --java-lib -nderbyclient maven2/client/pom.xml jars/insane/derbyclient-$(version).jar + get-orig-source: uscan --force-download --download-version $(version) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/derby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
