[SCM] Debian packaging for uimaj branch, master, updated. debian/2.3.1-2-11-gcd7a60b

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit e39feebe37241438a567ef75fdb9563147d3833a
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Wed Jan 18 00:20:08 2012 +0100

    Update install location.

diff --git a/debian/libuima-core-java.poms b/debian/libuima-core-java.poms
index 205e0dc..2f72480 100644
--- a/debian/libuima-core-java.poms
+++ b/debian/libuima-core-java.poms
@@ -33,21 +33,21 @@ uimaj-core/pom.xml --has-package-version --java-lib --artifact=uimaj-core/target
 uimaj-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-test-util/target/uimaj-test-util-*.jar
 uimaj-component-test-util/pom.xml --has-package-version --java-lib --artifact=uimaj-component-test-util/target/uimaj-component-test-util-*.jar
 
-uimaj-adapter-soap/pom.xml --has-package-version --package libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar
+uimaj-adapter-soap/pom.xml --has-package-version --package=libuima-adapter-soap-java --java-lib --artifact=uimaj-adapter-soap/target/uima-adapter-soap.jar
 
-uimaj-adapter-vinci/pom.xml --has-package-version --package libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar
+uimaj-adapter-vinci/pom.xml --has-package-version --package=libuima-adapter-vinci-java --java-lib --artifact=uimaj-adapter-vinci/target/uima-adapter-vinci.jar
 
-uimaj-cpe/pom.xml --has-package-version --package libuima-cpe-java --java-lib --artifact=uimaj-cpe/target/uima-cpe.jar
+uimaj-cpe/pom.xml --has-package-version --package=libuima-cpe-java --java-lib --artifact=uimaj-cpe/target/uima-cpe.jar
 
-uimaj-document-annotation/pom.xml --has-package-version --package libuima-document-annotation-java --java-lib --artifact=uimaj-document-annotation/target/uima-document-annotation.jar
+uimaj-document-annotation/pom.xml --has-package-version --package=libuima-document-annotation-java --java-lib --artifact=uimaj-document-annotation/target/uima-document-annotation.jar
 
-uimaj-tools/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-tools/target/uima-tools.jar
-uimaj-bootstrap/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
-PearPackagingMavenPlugin/pom.xml --has-package-version --package libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
+uimaj-tools/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=uimaj-tools/target/uima-tools.jar
+uimaj-bootstrap/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
+PearPackagingMavenPlugin/pom.xml --has-package-version --package=libuima-tools-java --java-lib --artifact=PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
 
-jVinci/pom.xml --has-package-version --package libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar
+jVinci/pom.xml --has-package-version --package=libuima-vinci-java --java-lib --artifact=jVinci/target/jVinci.jar
 
-uimaj-examples/pom.xml --has-package-version --package uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar
+uimaj-examples/pom.xml --has-package-version --package=uima-examples --java-lib --artifact=uimaj-examples/target/uima-examples.jar
 
 uima-docbook-overview-and-setup/pom.xml --ignore-pom
 uima-docbook-references/pom.xml --ignore-pom
diff --git a/debian/uima-doc.install b/debian/uima-doc.install
index 3662bb8..d6ae6c3 100644
--- a/debian/uima-doc.install
+++ b/debian/uima-doc.install
@@ -1,5 +1,5 @@
 # Install Javadoc HTML
-uimaj/target/site/apidocs/*			/usr/share/doc/uima/api/
+target/site/apidocs/*			/usr/share/doc/uima/api/
 # Copy common files
 #uima-docbook-tool/styles/uima-style/css/	/usr/share/doc/uima/manuals/
 #uima-docbooks/target/images			/usr/share/doc/uima/manuals/
diff --git a/debian/uima-utils.docs b/debian/uima-utils.docs
index 4a4dd76..97248fe 100644
--- a/debian/uima-utils.docs
+++ b/debian/uima-utils.docs
@@ -1,3 +1,3 @@
 NOTICE
-uimaj-distr/README
-uimaj-distr/RELEASE_NOTES.html
+README
+RELEASE_NOTES.html
diff --git a/debian/uima-utils.install b/debian/uima-utils.install
index 413aab9..0a05ee0 100644
--- a/debian/uima-utils.install
+++ b/debian/uima-utils.install
@@ -1,20 +1,20 @@
 # .sh are deleted thereafter in debian/rules
-uimaj-distr/src/main/scripts/annotationViewer.sh /usr/bin/
-uimaj-distr/src/main/scripts/cpeGui.sh /usr/bin/
-uimaj-distr/src/main/scripts/documentAnalyzer.sh /usr/bin/
-uimaj-distr/src/main/scripts/jcasgen.sh /usr/bin/
-uimaj-distr/src/main/scripts/runAE.sh /usr/bin/
-#uimaj-distr/src/main/scripts/runCPE.sh /usr/bin/
-uimaj-distr/src/main/scripts/runPearInstaller.sh /usr/bin/
-uimaj-distr/src/main/scripts/runPearMerger.sh /usr/bin/
-uimaj-distr/src/main/scripts/runPearPackager.sh /usr/bin/
-uimaj-distr/src/main/scripts/validateDescriptor.sh /usr/bin/
+src/main/scripts/annotationViewer.sh /usr/bin/
+src/main/scripts/cpeGui.sh /usr/bin/
+src/main/scripts/documentAnalyzer.sh /usr/bin/
+src/main/scripts/jcasgen.sh /usr/bin/
+src/main/scripts/runAE.sh /usr/bin/
+#src/main/scripts/runCPE.sh /usr/bin/
+src/main/scripts/runPearInstaller.sh /usr/bin/
+src/main/scripts/runPearMerger.sh /usr/bin/
+src/main/scripts/runPearPackager.sh /usr/bin/
+src/main/scripts/validateDescriptor.sh /usr/bin/
 
-uimaj-distr/src/main/scripts/runUimaClass.sh /usr/share/uima/bin/
-uimaj-distr/src/main/scripts/setUimaClassPath.sh /usr/share/uima/bin/
+src/main/scripts/runUimaClass.sh /usr/share/uima/bin/
+src/main/scripts/setUimaClassPath.sh /usr/share/uima/bin/
 
-uimaj-distr/src/main/properties/FileConsoleLogger.properties /etc/uima/
-uimaj-distr/src/main/properties/Logger.properties /etc/uima/
+src/main/properties/FileConsoleLogger.properties /etc/uima/
+src/main/properties/Logger.properties /etc/uima/
 
 # Menu entries
 debian/freedesktop/UIMA.xpm usr/share/pixmaps/

-- 
Debian packaging for uimaj