This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository derby.
commit 8c68b40f53eb9a05dd67b37d6161d6ddcf7d2c3d Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 6 22:54:30 2013 +0000 Renamed the package --- debian/apache-derby-client.install | 1 - debian/apache-derby-core.install | 8 ------ debian/changelog | 8 ++++++ debian/control | 32 +++++++++++----------- debian/derby-client.install | 1 + ...{apache-derby-common.docs => derby-common.docs} | 0 debian/derby-core.install | 8 ++++++ debian/{apache-derby-demo.docs => derby-demo.docs} | 0 ...pache-derby-javadoc.docs => derby-javadoc.docs} | 0 debian/rules | 12 ++++---- 10 files changed, 39 insertions(+), 31 deletions(-) diff --git a/debian/apache-derby-client.install b/debian/apache-derby-client.install deleted file mode 100644 index b66f5ae..0000000 --- a/debian/apache-derby-client.install +++ /dev/null @@ -1 +0,0 @@ -jars/*sane/derbyclient-*.jar /usr/share/apache-derby diff --git a/debian/apache-derby-core.install b/debian/apache-derby-core.install deleted file mode 100644 index 70a53f0..0000000 --- a/debian/apache-derby-core.install +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/debian/changelog b/debian/changelog index 71b7b6c..cdc0789 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +derby (10.10.1.1-1) UNRELEASED; urgency=low + + * Initial release (Closes: #617425) + * Renamed the package to 'derby' + * Transfered the maintenance to the Java Team + + -- Emmanuel Bourg <[email protected]> Fri, 07 Jun 2013 00:51:41 +0200 + apache-derby (10.10.1.1+repack-0ubuntu2) precise; urgency=low * New upstream diff --git a/debian/control b/debian/control index 91baeb4..df21ed7 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: apache-derby +Source: derby Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> @@ -9,23 +9,23 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/derby Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/derby Homepage: http://db.apache.org/derby/ -Package: apache-derby-client +Package: derby-client Architecture: all Section: libs Priority: optional -Depends: ${misc:Depends}, apache-derby-common, default-jre | java6-runtime +Depends: ${misc:Depends}, derby-common, default-jre | java6-runtime Description: Apache Derby client Client for Apache Derby. . The client connects to a remote, local or embedded Apache Derby network server. - The server software comes with the apache-derby-core package. + The server software comes with the derby-core package. . This is a free version of the libraries provided by sun-javadb-client -Package: apache-derby-common +Package: derby-common Architecture: all Depends: ${misc:Depends} -Suggests: apache-derby-core, apache-derby-client, apache-derby-javadoc, apache-derby-demo +Suggests: derby-core, derby-client, derby-javadoc, 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 @@ -40,14 +40,14 @@ Description: Embeddable relational database for Java, common files 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-javadoc and apache-derby-demo. + derby-javadoc and derby-demo. . This is a free version of the libraries provided by sun-javadb-common -Package: apache-derby-core +Package: derby-core Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common -Suggests: apache-derby-client, apache-derby, apache-derby-javadoc, apache-derby-demo +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. * Derby has a small footprint -- about 2.6 megabytes for the base engine and @@ -64,11 +64,11 @@ Description: Embeddable relational database for Java, core . This is a free version of the libraries provided by sun-javadb-core -Package: apache-derby-demo +Package: derby-demo Architecture: all Section: devel Priority: optional -Depends: ${misc:Depends}, apache-derby-common, default-jre | java6-runtime +Depends: ${misc:Depends}, derby-common, default-jre | java6-runtime Description: Apache Derby demo Demo software for Apache Derby. . @@ -76,9 +76,9 @@ Description: Apache Derby demo . This is a free version of the libraries provided by sun-javadb-demo -#Package: apache-derby-doc +#Package: derby-doc #Architecture: all -#Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common +#Depends: ${shlibs:Depends}, ${misc:Depends}, derby-common #Description: Embeddable relational database for Java, documentation # Documentation for Apache Derby. # . @@ -86,11 +86,11 @@ Description: Apache Derby demo # . # This is a free version of the libraries provided by sun-javadb-doc -Package: apache-derby-javadoc +Package: derby-javadoc Architecture: all Section: devel Priority: optional -Depends: ${misc:Depends}, apache-derby-common +Depends: ${misc:Depends}, derby-common Description: Apache Derby javadoc javadoc for Apache Derby . diff --git a/debian/derby-client.install b/debian/derby-client.install new file mode 100644 index 0000000..7727f81 --- /dev/null +++ b/debian/derby-client.install @@ -0,0 +1 @@ +jars/*sane/derbyclient-*.jar /usr/share/derby diff --git a/debian/apache-derby-common.docs b/debian/derby-common.docs similarity index 100% rename from debian/apache-derby-common.docs rename to debian/derby-common.docs diff --git a/debian/derby-core.install b/debian/derby-core.install new file mode 100644 index 0000000..4b80cad --- /dev/null +++ b/debian/derby-core.install @@ -0,0 +1,8 @@ +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/apache-derby-demo.docs b/debian/derby-demo.docs similarity index 100% rename from debian/apache-derby-demo.docs rename to debian/derby-demo.docs diff --git a/debian/apache-derby-javadoc.docs b/debian/derby-javadoc.docs similarity index 100% rename from debian/apache-derby-javadoc.docs rename to debian/derby-javadoc.docs diff --git a/debian/rules b/debian/rules index b5e309b..9c6ce76 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ override_dh_auto_build: override_dh_install: dh_install -X.bat - chmod a+x debian/apache-derby-core/usr/lib/apache-derby/bin/* + chmod a+x debian/derby-core/usr/lib/derby/bin/* override_dh_test: env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \ @@ -53,12 +53,12 @@ override_dh_test: #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 -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 -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 -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 -- 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
