[med-svn] [freeshim] 01/09: Inject Jeff Buchbinders work on shim package including my changes

Andreas Tille tille at debian.org
Wed Dec 27 23:20:50 UTC 2017


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository freeshim.

commit 561640a8eca1a44dab1bfaca0c092b514776335d
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 20 20:50:34 2011 +0000

    Inject Jeff Buchbinders work on shim package including my changes
---
 debian/changelog                               |   5 +
 debian/compat                                  |   1 +
 debian/control                                 |  23 +++
 debian/copyright                               |  37 +++++
 debian/dirs                                    |   2 +
 debian/docs                                    |   2 +
 debian/maven.cleanIgnoreRules                  |  17 ++
 debian/maven.ignoreRules                       |  16 ++
 debian/maven.publishedRules                    |  19 +++
 debian/maven.rules                             |  21 +++
 debian/patches/no_maven-javadoc-plugin.patch   | 222 +++++++++++++++++++++++++
 debian/patches/series                          |   2 +
 debian/patches/use_debian_maven_settings.patch |  11 ++
 debian/rules                                   |   8 +
 debian/shim.poms                               |  34 ++++
 debian/source/format                           |   1 +
 16 files changed, 421 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..15875c2
--- /dev/null
+++ b/debian/changelog
@@ -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
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d7dcbc7
--- /dev/null
+++ b/debian/control
@@ -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.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..b8165fa
--- /dev/null
+++ b/debian/copyright
@@ -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.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..d506f14
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+etc
+var/lib/tomcat6/webapps/shim
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..fc82724
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README
+ChangeLog
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..b47b61d
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -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/
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..0088a40
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -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/
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..822f087
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -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/
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..a534606
--- /dev/null
+++ b/debian/maven.rules
@@ -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/ * *
diff --git a/debian/patches/no_maven-javadoc-plugin.patch b/debian/patches/no_maven-javadoc-plugin.patch
new file mode 100644
index 0000000..89468eb
--- /dev/null
+++ b/debian/patches/no_maven-javadoc-plugin.patch
@@ -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>
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1269b7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+use_debian_maven_settings.patch
+no_maven-javadoc-plugin.patch
diff --git a/debian/patches/use_debian_maven_settings.patch b/debian/patches/use_debian_maven_settings.patch
new file mode 100644
index 0000000..2148b77
--- /dev/null
+++ b/debian/patches/use_debian_maven_settings.patch
@@ -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
+ 
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..7282961
--- /dev/null
+++ b/debian/rules
@@ -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
+
diff --git a/debian/shim.poms b/debian/shim.poms
new file mode 100644
index 0000000..31e2bdf
--- /dev/null
+++ b/debian/shim.poms
@@ -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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/freeshim.git



More information about the debian-med-commit mailing list