Author: ebourg-guest
Date: 2013-06-07 08:46:38 +0000 (Fri, 07 Jun 2013)
New Revision: 16848
Added:
trunk/derby/debian/libderbyclient-java.poms
Removed:
trunk/derby/debian/derby-client.install
Modified:
trunk/derby/debian/changelog
trunk/derby/debian/control
trunk/derby/debian/rules
Log:
Renamed the derby-client package to libderbyclient-java
Installed Maven poms to /usr/share/maven-repo
Modified: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog 2013-06-07 07:49:36 UTC (rev 16847)
+++ trunk/derby/debian/changelog 2013-06-07 08:46:38 UTC (rev 16848)
@@ -8,6 +8,8 @@
* 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
Modified: trunk/derby/debian/control
===================================================================
--- trunk/derby/debian/control 2013-06-07 07:49:36 UTC (rev 16847)
+++ trunk/derby/debian/control 2013-06-07 08:46:38 UTC (rev 16848)
@@ -3,23 +3,24 @@
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
Deleted: trunk/derby/debian/derby-client.install
===================================================================
--- trunk/derby/debian/derby-client.install 2013-06-07 07:49:36 UTC (rev
16847)
+++ trunk/derby/debian/derby-client.install 2013-06-07 08:46:38 UTC (rev
16848)
@@ -1 +0,0 @@
-jars/*sane/derbyclient-*.jar /usr/share/derby
Added: trunk/derby/debian/libderbyclient-java.poms
===================================================================
--- trunk/derby/debian/libderbyclient-java.poms (rev 0)
+++ trunk/derby/debian/libderbyclient-java.poms 2013-06-07 08:46:38 UTC (rev
16848)
@@ -0,0 +1 @@
+maven2/client/pom.xml --no-parent
Modified: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules 2013-06-07 07:49:36 UTC (rev 16847)
+++ trunk/derby/debian/rules 2013-06-07 08:46:38 UTC (rev 16848)
@@ -12,9 +12,10 @@
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 @@
#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)
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
