[osmosis] 03/03: Revert "Add basic pom.xml for osmosis-core, install pom and jar with maven-repo-helper."

Bas Couwenberg sebastic at xs4all.nl
Sat Oct 25 16:59:56 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository osmosis.

commit a9b015b7a36e1a271ed09f432449d68907073a5f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 25 18:55:59 2014 +0200

    Revert "Add basic pom.xml for osmosis-core, install pom and jar with maven-repo-helper."
    
    This reverts commit fac65c2d6acc0fb267b6c4cbc93ccb375b5c22fe.
---
 debian/changelog |  2 --
 debian/pom.xml   | 39 ---------------------------------------
 debian/rules     | 10 ----------
 3 files changed, 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac1206c..18212d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ osmosis (0.43.1-3) UNRELEASED; urgency=medium
 
   * Update watch file to use github tags instead of the deprecated
     githubredir service.
-  * Add basic pom.xml for osmosis-core, install pom and jar with maven-
-    repo-helper.
   * Bump Standards-Version to 3.9.6, no changes.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 03 Oct 2014 23:38:53 +0200
diff --git a/debian/pom.xml b/debian/pom.xml
deleted file mode 100644
index 778364f..0000000
--- a/debian/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <!-- The Basics -->
-  <groupId>org.openstreetmap.osmosis</groupId>
-  <artifactId>osmosis-core</artifactId>
-  <version>0.43.1</version>
-  <packaging>jar</packaging>
-
-  <!-- More Project Information -->
-  <name>Osmosis</name>
-  <description>Osmosis is a Java application and library for processing OSM data.</description>
-  <url>http://wiki.openstreetmap.org/wiki/Osmosis</url>
-
-  <licenses>
-    <license>
-      <name>Public Domain</name>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>brett</id>
-      <name>Brett Henderson</name>
-      <email>brett at bretth.com</email>
-    </developer>
-  </developers>
-
-  <!-- Environment Settings -->
-  <scm>
-    <url>https://github.com/openstreetmap/osmosis</url>
-    <connection>scm:git:git://github.com/openstreetmap/osmosis.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/openstreetmap/osmosis.git</developerConnection>
-  </scm>
-
-</project>
diff --git a/debian/rules b/debian/rules
index 81c42f0..fafa81b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-OSMOSIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
 export JAVA_HOME := /usr/lib/jvm/default-java/
 
 DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
@@ -36,14 +34,6 @@ override_dh_clean:
 	dh_clean osmosis-core/src/main/java/org/openstreetmap/osmosis/core/OsmosisConstants.java \
 	         osmosis-core/src/main/resources/org/openstreetmap/osmosis/core/plugin/plugin.xml
 
-	mh_clean
-
-override_dh_install:
-	dh_install
-
-	mh_installjar -posmosis -l debian/pom.xml package/lib/default/osmosis-core-$(OSMOSIS_VERSION).jar
-	mh_installpom -posmosis debian/pom.xml
-
 override_dh_installchangelogs:
 	dh_installchangelogs -- package/changes.txt
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git



More information about the Pkg-grass-devel mailing list