[med-svn] r6606 - in trunk/packages: . shim shim/trunk shim/trunk/debian shim/trunk/debian/patches shim/trunk/debian/source
Andreas Tille
tille at alioth.debian.org
Wed Apr 20 20:50:35 UTC 2011
Author: tille
Date: 2011-04-20 20:50:34 +0000 (Wed, 20 Apr 2011)
New Revision: 6606
Added:
trunk/packages/shim/
trunk/packages/shim/trunk/
trunk/packages/shim/trunk/debian/
trunk/packages/shim/trunk/debian/changelog
trunk/packages/shim/trunk/debian/compat
trunk/packages/shim/trunk/debian/control
trunk/packages/shim/trunk/debian/copyright
trunk/packages/shim/trunk/debian/dirs
trunk/packages/shim/trunk/debian/docs
trunk/packages/shim/trunk/debian/maven.cleanIgnoreRules
trunk/packages/shim/trunk/debian/maven.ignoreRules
trunk/packages/shim/trunk/debian/maven.publishedRules
trunk/packages/shim/trunk/debian/maven.rules
trunk/packages/shim/trunk/debian/patches/
trunk/packages/shim/trunk/debian/patches/no_maven-javadoc-plugin.patch
trunk/packages/shim/trunk/debian/patches/series
trunk/packages/shim/trunk/debian/patches/use_debian_maven_settings.patch
trunk/packages/shim/trunk/debian/rules
trunk/packages/shim/trunk/debian/shim.poms
trunk/packages/shim/trunk/debian/source/
trunk/packages/shim/trunk/debian/source/format
Log:
Inject Jeff Buchbinders work on shim package including my changes
Added: trunk/packages/shim/trunk/debian/changelog
===================================================================
--- trunk/packages/shim/trunk/debian/changelog (rev 0)
+++ trunk/packages/shim/trunk/debian/changelog 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,5 @@
+shim (0.1.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
+
+ -- Jeff Buchbinder <jeff at freemedsoftware.org> Wed, 20 Apr 2011 10:02:58 -0400
Added: trunk/packages/shim/trunk/debian/compat
===================================================================
--- trunk/packages/shim/trunk/debian/compat (rev 0)
+++ trunk/packages/shim/trunk/debian/compat 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1 @@
+8
Added: trunk/packages/shim/trunk/debian/control
===================================================================
--- trunk/packages/shim/trunk/debian/control (rev 0)
+++ trunk/packages/shim/trunk/debian/control 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,23 @@
+Source: shim
+Section: science
+Priority: extra
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+DM-Upload-Allowed: yes
+Uploaders: Jeff Buchbinder <jeff at freemedsoftware.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 8), openjdk-6-jdk, cdbs, maven-debian-helper,
+ maven2, librxtx-java, liblog4j1.2-java, libhsqldb-java
+Standards-Version: 3.9.2
+Homepage: http://freeshim.org/
+Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/shim/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/shim/trunk/?rev=0&sc=0
+
+Package: shim
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre-headless, librxtx-java
+Description: opensource electronic medical device interface
+ FreeSHIM is an opensource electronic medical device interface, which aims
+ to allow any EMR/PM system to talk to any medical device attached to a
+ workstation without having to install tons of pesky drivers or “reinvent
+ the wheel” for each additional device manufacturer.
+
Added: trunk/packages/shim/trunk/debian/copyright
===================================================================
--- trunk/packages/shim/trunk/debian/copyright (rev 0)
+++ trunk/packages/shim/trunk/debian/copyright 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,37 @@
+This work was packaged for Debian by:
+
+ Jeff Buchbinder <jeff at freemedsoftware.org> on Wed, 20 Apr 2011 10:02:58 -0400
+
+It was downloaded from:
+
+ <url://example.com>
+
+Upstream Author(s):
+
+ <put author's name and email here>
+ <likewise for another author>
+
+Copyright:
+
+ <Copyright (C) YYYY Firstname Lastname>
+ <likewise for another author>
+
+License:
+
+ <Put the license of the package here indented by 4 spaces>
+
+The Debian packaging is:
+
+ Copyright (C) 2011 Jeff Buchbinder <jeff at freemedsoftware.org>
+
+# Please chose a license for your packaging work. If the program you package
+# uses a mainstream license, using the same license is the safest choice.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+# If you just want it to be GPL version 3, leave the following lines in.
+
+and is licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
Added: trunk/packages/shim/trunk/debian/dirs
===================================================================
--- trunk/packages/shim/trunk/debian/dirs (rev 0)
+++ trunk/packages/shim/trunk/debian/dirs 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,2 @@
+etc
+var/lib/tomcat6/webapps/shim
Added: trunk/packages/shim/trunk/debian/docs
===================================================================
--- trunk/packages/shim/trunk/debian/docs (rev 0)
+++ trunk/packages/shim/trunk/debian/docs 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,2 @@
+README
+ChangeLog
Added: trunk/packages/shim/trunk/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/packages/shim/trunk/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/packages/shim/trunk/debian/maven.cleanIgnoreRules 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+# junit junit jar s/3\\..*/3.x/
+
Added: trunk/packages/shim/trunk/debian/maven.ignoreRules
===================================================================
--- trunk/packages/shim/trunk/debian/maven.ignoreRules (rev 0)
+++ trunk/packages/shim/trunk/debian/maven.ignoreRules 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,16 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
Added: trunk/packages/shim/trunk/debian/maven.publishedRules
===================================================================
--- trunk/packages/shim/trunk/debian/maven.publishedRules (rev 0)
+++ trunk/packages/shim/trunk/debian/maven.publishedRules 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
Added: trunk/packages/shim/trunk/debian/maven.rules
===================================================================
--- trunk/packages/shim/trunk/debian/maven.rules (rev 0)
+++ trunk/packages/shim/trunk/debian/maven.rules 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,21 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+junit junit jar s/4\..*/4.x/ * *
+log4j log4j jar s/1\.2\..*/1.2.x/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
Added: trunk/packages/shim/trunk/debian/patches/no_maven-javadoc-plugin.patch
===================================================================
--- trunk/packages/shim/trunk/debian/patches/no_maven-javadoc-plugin.patch (rev 0)
+++ trunk/packages/shim/trunk/debian/patches/no_maven-javadoc-plugin.patch 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,222 @@
+--- shim-0.1.1.orig/shim-library/pom.xml
++++ shim-0.1.1/shim-library/pom.xml
+@@ -69,19 +69,6 @@
+ </dependency>
+ </dependencies>
+
+- <reporting>
+- <plugins>
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+- </plugins>
+- </reporting>
+-
+ <build>
+ <plugins>
+ <!-- Compile -->
+@@ -95,14 +82,6 @@
+ </configuration>
+ </plugin>
+
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+
+--- shim-0.1.1.orig/shim-drivers/shim-driver-label-escpos/pom.xml
++++ shim-0.1.1/shim-drivers/shim-driver-label-escpos/pom.xml
+@@ -52,19 +52,6 @@
+ </dependency>
+ </dependencies>
+
+- <reporting>
+- <plugins>
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+- </plugins>
+- </reporting>
+-
+ <build>
+ <plugins>
+ <plugin>
+@@ -77,14 +64,6 @@
+ </configuration>
+ </plugin>
+
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+
+--- shim-0.1.1.orig/shim-drivers/shim-driver-lab-microlab3500/pom.xml
++++ shim-0.1.1/shim-drivers/shim-driver-lab-microlab3500/pom.xml
+@@ -46,19 +46,6 @@
+ </dependency>
+ </dependencies>
+
+- <reporting>
+- <plugins>
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+- </plugins>
+- </reporting>
+-
+ <build>
+ <plugins>
+ <plugin>
+@@ -71,14 +58,6 @@
+ </configuration>
+ </plugin>
+
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+
+--- shim-0.1.1.orig/shim-drivers/shim-driver-dosing-scilog/pom.xml
++++ shim-0.1.1/shim-drivers/shim-driver-dosing-scilog/pom.xml
+@@ -46,19 +46,6 @@
+ </dependency>
+ </dependencies>
+
+- <reporting>
+- <plugins>
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+- </plugins>
+- </reporting>
+-
+ <build>
+ <plugins>
+ <plugin>
+@@ -71,14 +58,6 @@
+ </configuration>
+ </plugin>
+
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+
+--- shim-0.1.1.orig/shim-drivers/shim-driver-signature-dummy/pom.xml
++++ shim-0.1.1/shim-drivers/shim-driver-signature-dummy/pom.xml
+@@ -38,19 +38,6 @@
+ </dependency>
+ </dependencies>
+
+- <reporting>
+- <plugins>
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+- </plugins>
+- </reporting>
+-
+ <build>
+ <plugins>
+ <plugin>
+@@ -63,14 +50,6 @@
+ </configuration>
+ </plugin>
+
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+
+--- shim-0.1.1.orig/shim-drivers/shim-driver-lab-clinitek50/pom.xml
++++ shim-0.1.1/shim-drivers/shim-driver-lab-clinitek50/pom.xml
+@@ -46,19 +46,6 @@
+ </dependency>
+ </dependencies>
+
+- <reporting>
+- <plugins>
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+- </plugins>
+- </reporting>
+-
+ <build>
+ <plugins>
+ <plugin>
+@@ -71,14 +58,6 @@
+ </configuration>
+ </plugin>
+
+- <!-- Build javadocs for this project -->
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-javadoc-plugin</artifactId>
+- <version>2.7</version>
+- <configuration>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+
Added: trunk/packages/shim/trunk/debian/patches/series
===================================================================
--- trunk/packages/shim/trunk/debian/patches/series (rev 0)
+++ trunk/packages/shim/trunk/debian/patches/series 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,2 @@
+use_debian_maven_settings.patch
+no_maven-javadoc-plugin.patch
Added: trunk/packages/shim/trunk/debian/patches/use_debian_maven_settings.patch
===================================================================
--- trunk/packages/shim/trunk/debian/patches/use_debian_maven_settings.patch (rev 0)
+++ trunk/packages/shim/trunk/debian/patches/use_debian_maven_settings.patch 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,11 @@
+--- shim-0.1.1.orig/shim-library/install-deps.sh
++++ shim-0.1.1/shim-library/install-deps.sh
+@@ -21,7 +21,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Suite 500, Boston, MA 02110, USA.
+
+-mvn install:install-file -DgroupId=org.rxtx -DartifactId=rxtx -Dversion=2.2pre2 -Dpackaging=jar -Dfile=deps/rxtx-2.2pre2.jar
++mvn -s ../debian/maven-settings.xml install:install-file -DgroupId=org.rxtx -DartifactId=rxtx -Dversion=2.2pre2 -Dpackaging=jar -Dfile=deps/rxtx-2.2pre2.jar
+
+ #mvn install:install-file -DgroupId=net.sf.extcos -DartifactId=extcos -Dversion=0.1.1b -Dpackaging=jar -Dfile=deps/extcos-0.1.1b.jar
+
Added: trunk/packages/shim/trunk/debian/rules
===================================================================
--- trunk/packages/shim/trunk/debian/rules (rev 0)
+++ trunk/packages/shim/trunk/debian/rules 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+
Property changes on: trunk/packages/shim/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/shim/trunk/debian/shim.poms
===================================================================
--- trunk/packages/shim/trunk/debian/shim.poms (rev 0)
+++ trunk/packages/shim/trunk/debian/shim.poms 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1,34 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM or
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar
+# it will be installed with mh_install.
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+# temporarily for certain artifacts such as Javadoc jars.
+#
+pom.xml
+shim-library/pom.xml
+shim-drivers/pom.xml
+shim-drivers/shim-driver-lab-clinitek50/pom.xml
+shim-drivers/shim-driver-lab-microlab3500/pom.xml
+shim-drivers/shim-driver-label-escpos/pom.xml
+shim-drivers/shim-driver-signature-dummy/pom.xml
+shim-drivers/shim-driver-dosing-scilog/pom.xml
+shim-webapp/pom.xml
Added: trunk/packages/shim/trunk/debian/source/format
===================================================================
--- trunk/packages/shim/trunk/debian/source/format (rev 0)
+++ trunk/packages/shim/trunk/debian/source/format 2011-04-20 20:50:34 UTC (rev 6606)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the debian-med-commit
mailing list