This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository derby.
commit 1432df52e4c5dbaf0590a004f558e4e5471b9700
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jun 7 11:15:48 2013 +0000
Renamed the derby-core package to libderby-java
Installed Maven poms to /usr/share/maven-repo
---
debian/changelog | 3 ++-
debian/control | 24 +++++++-----------------
debian/derby-core.install | 8 --------
debian/libderby-java.install | 2 ++
debian/libderby-java.poms | 16 ++++++++++++++++
debian/rules | 39 +++++++++++++++++++++++----------------
6 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ca62ed4..65d225b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
derby (10.10.1.1-1) UNRELEASED; urgency=low
* Initial release (Closes: #617425)
- * Renamed the package to 'derby'
+ * Renamed the source package to 'derby'
* Transferred the maintenance to the Java Team
* debian/watch: Updated to point to the official Apache archive
* Replaced debian/get-orig-source with debian/orig-tar.sh
* debian/control:
- Updated Standards-Version to 3.9.4 (no changes)
- Removed the redundant Priority fields
+ * Renamed the derby-core package to libderby-java
* Renamed the derby-client package to libderbyclient-java
* Installed Maven poms to /usr/share/maven-repo
diff --git a/debian/control b/debian/control
index 2ff1993..9c0a104 100644
--- a/debian/control
+++ b/debian/control
@@ -41,15 +41,13 @@ Description: Embeddable relational database for Java, common files
index.html introduces the product and has references to further
documentation, some of which is in the packages,
derby-javadoc and derby-demo.
- .
- This is a free version of the libraries provided by sun-javadb-common
-Package: derby-core
+Package: libderby-java
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, derby-common
-Suggests: derby-client, derby, derby-javadoc, derby-demo
-Description: Embeddable relational database for Java, core
- An open source relational database implemented entirely in Java.
+Depends: ${misc:Depends}
+Suggests: libderbyclient-java, derby-javadoc, derby-demo
+Description: Apache Derby Database Engine and Embedded JDBC Driver
+ Apache Derby is an open source relational database implemented entirely in Java.
* Derby has a small footprint -- about 2.6 megabytes for the base engine and
embedded JDBC driver.
* Derby is based on the Java, JDBC, and SQL standards.
@@ -59,10 +57,8 @@ Description: Embeddable relational database for Java, core
Network Client JDBC driver and Derby Network Server.
* Derby is easy to install, deploy, and use.
.
- This package includes the database server, the JDBC driver, utilities and
- localisations.
- .
- This is a free version of the libraries provided by sun-javadb-core
+ This package includes the database server, the embedded JDBC driver, utilities
+ and localisations.
Package: derby-demo
Architecture: all
@@ -72,8 +68,6 @@ Description: Apache Derby demo
Demo software for Apache Derby.
.
This package contains sample programs, database and templates.
- .
- This is a free version of the libraries provided by sun-javadb-demo
#Package: derby-doc
#Architecture: all
@@ -82,8 +76,6 @@ Description: Apache Derby demo
# Documentation for Apache Derby.
# .
# This package contains user documentation in both HTML and PDF formats.
-# .
-# This is a free version of the libraries provided by sun-javadb-doc
Package: derby-javadoc
Architecture: all
@@ -93,5 +85,3 @@ Description: Apache Derby javadoc
javadoc for Apache Derby
.
This package documents the API for JDBC.
- .
- This is a free version of the library provided by sun-javadb-javadoc
diff --git a/debian/derby-core.install b/debian/derby-core.install
deleted file mode 100644
index 4b80cad..0000000
--- a/debian/derby-core.install
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/set*CP /usr/lib/derby/bin
-generated/bin/* /usr/lib/derby/bin
-jars/*sane/derby-*.jar /usr/share/derby
-jars/*sane/derby.war /usr/share/derby
-jars/*sane/derbyLocale*.jar /usr/share/derby
-jars/*sane/derbynet.jar /usr/share/derby
-jars/*sane/derbyrun.jar /usr/share/derby
-jars/*sane/derbytools.jar /usr/share/derby
diff --git a/debian/libderby-java.install b/debian/libderby-java.install
new file mode 100644
index 0000000..f7404b1
--- /dev/null
+++ b/debian/libderby-java.install
@@ -0,0 +1,2 @@
+bin/set*CP /usr/lib/derby/bin
+generated/bin/* /usr/lib/derby/bin
diff --git a/debian/libderby-java.poms b/debian/libderby-java.poms
new file mode 100644
index 0000000..7eae9b0
--- /dev/null
+++ b/debian/libderby-java.poms
@@ -0,0 +1,16 @@
+maven2/engine/pom.xml --no-parent
+maven2/net/pom.xml --no-parent
+maven2/tools/pom.xml --no-parent
+maven2/derbyLocale_cs/pom.xml --no-parent
+maven2/derbyLocale_de_DE/pom.xml --no-parent
+maven2/derbyLocale_es/pom.xml --no-parent
+maven2/derbyLocale_fr/pom.xml --no-parent
+maven2/derbyLocale_hu/pom.xml --no-parent
+maven2/derbyLocale_it/pom.xml --no-parent
+maven2/derbyLocale_ja_JP/pom.xml --no-parent
+maven2/derbyLocale_ko_KR/pom.xml --no-parent
+maven2/derbyLocale_pl/pom.xml --no-parent
+maven2/derbyLocale_pt_BR/pom.xml --no-parent
+maven2/derbyLocale_ru/pom.xml --no-parent
+maven2/derbyLocale_zh_CN/pom.xml --no-parent
+maven2/derbyLocale_zh_TW/pom.xml --no-parent
diff --git a/debian/rules b/debian/rules
index 2b4b8b1..0bf6850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,28 +19,21 @@ override_dh_auto_clean:
# Other bits
rm -f *.log
cd java/demo/toursdb/ ; rm -rf *generated* ToursDB_schema.sql loadTables.sql
+ rm -f java/engine/org/apache/derby/impl/sql/compile/Token.java
override_dh_auto_build:
#Put .jar files in place
cat /usr/share/java/oro.jar > tools/java/jakarta-oro-2.0.8.jar
cat /usr/share/java/javacc.jar > tools/java/javacc.jar
cat /usr/share/java/junit.jar > tools/java/junit.jar
- #Remove file that breaks the build
- rm -f java/engine/org/apache/derby/impl/sql/compile/Token.java
- #And build
- ant buildsource
- ant buildjars
- ant binscripts
- #Rename jars with versions
- for f in jars/*/derbyclient.jar jars/*/derby.jar ; do \
- mv $$f `echo $$f | sed 's/\./-${version}./'` ; \
- done
+
+ ant buildsource buildjars binscripts
#And docs
ant javadoc
override_dh_install:
dh_install -X.bat
- chmod a+x debian/derby-core/usr/lib/derby/bin/*
+ chmod a+x debian/libderby-java/usr/lib/derby/bin/*
override_dh_test:
env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
@@ -49,15 +42,29 @@ override_dh_test:
#Moved symlink stuff here so it works after version change
override_dh_link:
- 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
+ mh_installjar -plibderbyclient-java --java-lib -nderbyclient maven2/client/pom.xml jars/insane/derbyclient.jar
+
+ mh_installpoms -plibderby-java -e$(version)
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/engine/pom.xml jars/insane/derby.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/net/pom.xml jars/insane/derbynet.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/tools/pom.xml jars/insane/derbytools.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_cs/pom.xml jars/insane/derbyLocale_cs.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_de_DE/pom.xml jars/insane/derbyLocale_de_DE.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_es/pom.xml jars/insane/derbyLocale_es.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_fr/pom.xml jars/insane/derbyLocale_fr.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_hu/pom.xml jars/insane/derbyLocale_hu.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_it/pom.xml jars/insane/derbyLocale_it.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_ja_JP/pom.xml jars/insane/derbyLocale_ja_JP.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_ko_KR/pom.xml jars/insane/derbyLocale_ko_KR.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_pl/pom.xml jars/insane/derbyLocale_pl.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_pt_BR/pom.xml jars/insane/derbyLocale_pt_BR.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_ru/pom.xml jars/insane/derbyLocale_ru.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_zh_CN/pom.xml jars/insane/derbyLocale_zh_CN.jar
+ mh_installjar -plibderby-java -e$(version) --java-lib maven2/derbyLocale_zh_TW/pom.xml jars/insane/derbyLocale_zh_TW.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