Author: tbooth-guest
Date: 2013-04-09 09:05:26 +0000 (Tue, 09 Apr 2013)
New Revision: 13273
Added:
trunk/packages/apache-derby/trunk/debian/apache-derby-demo.docs
trunk/packages/apache-derby/trunk/debian/apache-derby-javadoc.docs
Removed:
trunk/packages/apache-derby/trunk/debian/apache-derby-client.links
trunk/packages/apache-derby/trunk/debian/apache-derby-core.links
Modified:
trunk/packages/apache-derby/trunk/debian/apache-derby-client.install
trunk/packages/apache-derby/trunk/debian/apache-derby-common.docs
trunk/packages/apache-derby/trunk/debian/apache-derby-core.install
trunk/packages/apache-derby/trunk/debian/changelog
trunk/packages/apache-derby/trunk/debian/control
trunk/packages/apache-derby/trunk/debian/rules
Log:
Finished packaging and uploaded to Launchpad for Ubuntu.
This is ready for Debian if anyone wants it.
Modified: trunk/packages/apache-derby/trunk/debian/apache-derby-client.install
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-client.install
2013-04-09 06:12:35 UTC (rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-client.install
2013-04-09 09:05:26 UTC (rev 13273)
@@ -1 +1 @@
-jars/insane/derbyclient-*.jar /usr/share/java
+jars/*sane/derbyclient-*.jar /usr/share/apache-derby
Deleted: trunk/packages/apache-derby/trunk/debian/apache-derby-client.links
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-client.links
2013-04-09 06:12:35 UTC (rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-client.links
2013-04-09 09:05:26 UTC (rev 13273)
@@ -1 +0,0 @@
-/usr/share/java/derbyclient-*.jar /usr/share/java/derbyclient.jar
Modified: trunk/packages/apache-derby/trunk/debian/apache-derby-common.docs
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-common.docs
2013-04-09 06:12:35 UTC (rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-common.docs
2013-04-09 09:05:26 UTC (rev 13273)
@@ -1,3 +1,4 @@
+published_api_overview.html
releaseSummary.xml
README
NOTICE
Modified: trunk/packages/apache-derby/trunk/debian/apache-derby-core.install
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-core.install
2013-04-09 06:12:35 UTC (rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-core.install
2013-04-09 09:05:26 UTC (rev 13273)
@@ -1,2 +1,8 @@
-bin /usr/lib/apache-derby/
-jars/insane/derby-*.jar /usr/share/java
+bin/set*CP /usr/lib/apache-derby/bin
+generated/bin/* /usr/lib/apache-derby/bin
+jars/*sane/derby-*.jar /usr/share/apache-derby
+jars/*sane/derby.war /usr/share/apache-derby
+jars/*sane/derbyLocale*.jar /usr/share/apache-derby
+jars/*sane/derbynet.jar /usr/share/apache-derby
+jars/*sane/derbyrun.jar /usr/share/apache-derby
+jars/*sane/derbytools.jar /usr/share/apache-derby
Deleted: trunk/packages/apache-derby/trunk/debian/apache-derby-core.links
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-core.links
2013-04-09 06:12:35 UTC (rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-core.links
2013-04-09 09:05:26 UTC (rev 13273)
@@ -1 +0,0 @@
-/usr/share/java/derby-*.jar /usr/share/java/derby.jar
Added: trunk/packages/apache-derby/trunk/debian/apache-derby-demo.docs
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-demo.docs
(rev 0)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-demo.docs
2013-04-09 09:05:26 UTC (rev 13273)
@@ -0,0 +1 @@
+java/demo
Added: trunk/packages/apache-derby/trunk/debian/apache-derby-javadoc.docs
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-javadoc.docs
(rev 0)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-javadoc.docs
2013-04-09 09:05:26 UTC (rev 13273)
@@ -0,0 +1 @@
+javadoc
Modified: trunk/packages/apache-derby/trunk/debian/changelog
===================================================================
--- trunk/packages/apache-derby/trunk/debian/changelog 2013-04-09 06:12:35 UTC
(rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/changelog 2013-04-09 09:05:26 UTC
(rev 13273)
@@ -1,3 +1,9 @@
+apache-derby (10.9.1.0-0ubuntu2) precise; urgency=low
+
+ * Fix find invocation in cleanup
+
+ -- Tim Booth <[email protected]> Mon, 08 Apr 2013 18:24:56 +0100
+
apache-derby (10.9.1.0-0ubuntu1) precise; urgency=low
* Initial release (Closes: 617425)
@@ -2,5 +8,5 @@
* Pull from SVN by tag
- * Patch to work with newer javacc
+ * Patch to work with newer javacc (needs patched javacc)
* (TODO - remember to clean out tarball before upload)
- -- Tim Booth <[email protected]> Sun, 24 Feb 2013 09:02:48 +0000
+ -- Tim Booth <[email protected]> Fri, 05 Apr 2013 17:00:14 +0100
Modified: trunk/packages/apache-derby/trunk/debian/control
===================================================================
--- trunk/packages/apache-derby/trunk/debian/control 2013-04-09 06:12:35 UTC
(rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/control 2013-04-09 09:05:26 UTC
(rev 13273)
@@ -13,7 +13,7 @@
Architecture: all
Section: libs
Priority: optional
-Depends: apache-derby-common, default-jre | java6-runtime
+Depends: ${misc:Depends}, apache-derby-common, default-jre | java6-runtime
Description: Apache Derby client
Client for Apache Derby.
.
@@ -24,7 +24,8 @@
Package: apache-derby-common
Architecture: all
-Suggests: apache-derby-core, apache-derby-client, apache-derby-doc,
apache-derby-javadoc, apache-derby-demo
+Depends: ${misc:Depends}
+Suggests: apache-derby-core, apache-derby-client, apache-derby-javadoc,
apache-derby-demo
Description: Embeddable relational database for Java, common files
An open source relational database implemented entirely in Java.
* Derby has a small footprint -- about 2.6 megabytes for the base engine and
@@ -38,7 +39,7 @@
.
This package contains common information about Apache Derby. The file
index.html introduces the product and has references to further
- documentation, some of which is in the packages apache-derby-docs,
+ documentation, some of which is in the packages,
apache-derby-javadoc and apache-derby-demo.
.
This is a free version of the libraries provided by sun-javadb-common
@@ -46,7 +47,7 @@
Package: apache-derby-core
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common
-Suggests: apache-derby-client, apache-derby-doc, apache-derby-javadoc,
apache-derby-demo
+Suggests: apache-derby-client, apache-derby, apache-derby-javadoc,
apache-derby-demo
Description: Embeddable relational database for Java, core
An open source relational database implemented entirely in Java.
* Derby has a small footprint -- about 2.6 megabytes for the base engine and
@@ -67,7 +68,7 @@
Architecture: all
Section: devel
Priority: optional
-Depends: apache-derby-common, default-jre | java6-runtime
+Depends: ${misc:Depends}, apache-derby-common, default-jre | java6-runtime
Description: Apache Derby demo
Demo software for Apache Derby.
.
@@ -75,21 +76,22 @@
.
This is a free version of the libraries provided by sun-javadb-demo
-Package: apache-derby-doc
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common
-Description: Embeddable relational database for Java, documentation
- 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
+# Docs no longer in upstream tarball
+# Package: apache-derby-doc
+# Architecture: all
+# Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common
+# Description: Embeddable relational database for Java, documentation
+# 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: apache-derby-javadoc
Architecture: all
Section: devel
Priority: optional
-Depends: apache-derby-common
+Depends: ${misc:Depends}, apache-derby-common
Description: Apache Derby javadoc
javadoc for Apache Derby
.
Modified: trunk/packages/apache-derby/trunk/debian/rules
===================================================================
--- trunk/packages/apache-derby/trunk/debian/rules 2013-04-09 06:12:35 UTC
(rev 13272)
+++ trunk/packages/apache-derby/trunk/debian/rules 2013-04-09 09:05:26 UTC
(rev 13273)
@@ -13,33 +13,34 @@
override_dh_auto_clean:
ant clobber
- # Restore build.xml files
- find -name 'build.xml.orig' -execdir mv '{}' build.xml ';'
- # Totally remove jars directory
- rm -rf jars
+ # Totally remove jars and javadoc directory
+ rm -rf jars javadoc
# Remove any .jars or dot files
- find -name debian -prune -or -name '.svn' -execdir rm -rf '{}' ';'
-prune
- find -name debian -prune -or -name '.git*' -execdir rm -rf '{}' ';'
-prune
+ find -name debian -prune -or -name '.svn' -prune -execdir rm -rf '{}'
';'
+ find -name debian -prune -or -name '.git*' -prune -execdir rm -rf '{}'
';'
find -name debian -prune -or -name '*.jar' -execdir rm '{}' ';'
find -name debian -prune -or -name 'derby.log' -execdir rm '{}' ';'
+ # Other bits
+ rm -f *.log
+ cd java/demo/toursdb/ ; rm -rf *generated* ToursDB_schema.sql
loadTables.sql
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
- #Munge the build files.
- #Apparently not needed as javacc can be told to stay 1.4 compatible
- #sed -i.orig 's/"1.4"/"5"/g' `find -name build.xml`
#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/*/*.jar ; do \
+ for f in jars/*/derbyclient.jar jars/*/derby.jar ; do \
mv $$f `echo $$f | sed 's/\./-${version}./'` ; \
done
+ #And docs
+ ant javadoc
override_dh_install:
dh_install -X.bat
@@ -48,6 +49,17 @@
env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
java org.apache.derby.tools.sysinfo
ant all
+
+#Moved symlink stuff here so it works after version change
+override_dh_link:
+ dh_link -papache-derby-client
/usr/share/apache-derby/derbyclient-$(version).jar
/usr/share/java/derbyclient-$(version).jar
+ dh_link -papache-derby-client
/usr/share/java/derbyclient-$(version).jar /usr/share/java/derbyclient.jar
+ #.
+ dh_link -papache-derby-core
/usr/share/apache-derby/derby-$(version).jar
/usr/share/apache-derby/derby-$(version).jar
+ dh_link -papache-derby-core
/usr/share/apache-derby/derby-$(version).jar
/usr/share/java/derby-$(version).jar
+ dh_link -papache-derby-core /usr/share/java/derby-$(version).jar
/usr/share/java/derby.jar
+ #.
+ dh_link --verbose
get-orig-source:
. debian/get-orig-source
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
