[pkg-java] r19181 - in trunk/squirrel-sql/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2016-11-22 13:26:04 +0000 (Tue, 22 Nov 2016)
New Revision: 19181

Added:
   trunk/squirrel-sql/debian/patches/drop_parent_pom.patch
Modified:
   trunk/squirrel-sql/debian/changelog
   trunk/squirrel-sql/debian/patches/series
Log:
drop the parent POM reference, it gives build errors


Modified: trunk/squirrel-sql/debian/changelog
===================================================================
--- trunk/squirrel-sql/debian/changelog	2016-11-22 13:09:23 UTC (rev 19180)
+++ trunk/squirrel-sql/debian/changelog	2016-11-22 13:26:04 UTC (rev 19181)
@@ -1,5 +1,6 @@
 squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low
 
+  [ Vladimir Kotov ]
   * Initial release (Closes: #559867)
   * New upstream release
   * debian/control:
@@ -16,6 +17,9 @@
   * Add watch files
   * Add maven files
  
+  [ Thorsten Glaser ]
+  * Fixup for post-squeeze changes, git upstream, etc.
+
  -- Vladimir Kotov <vladimir at kotov.lv>  Wed, 09 Jan 2011 23:35:28 +0200
 
 squirrel-sql (3.0~ppa8) jaunty; urgency=low

Added: trunk/squirrel-sql/debian/patches/drop_parent_pom.patch
===================================================================
--- trunk/squirrel-sql/debian/patches/drop_parent_pom.patch	                        (rev 0)
+++ trunk/squirrel-sql/debian/patches/drop_parent_pom.patch	2016-11-22 13:26:04 UTC (rev 19181)
@@ -0,0 +1,16 @@
+# DP: remove the sonatype oss-parent which we don't use in Debian
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -5,11 +5,6 @@
+ 	<version>3.2.0</version>
+ 	<packaging>pom</packaging>
+ 
+-	<parent>
+-		<groupId>org.sonatype.oss</groupId>
+-		<artifactId>oss-parent</artifactId>
+-		<version>3</version>
+-	</parent>
+ 
+ 	<name>SQuirreL Root POM</name>
+ 	<description>

Modified: trunk/squirrel-sql/debian/patches/series
===================================================================
--- trunk/squirrel-sql/debian/patches/series	2016-11-22 13:09:23 UTC (rev 19180)
+++ trunk/squirrel-sql/debian/patches/series	2016-11-22 13:26:04 UTC (rev 19181)
@@ -8,3 +8,4 @@
 008-native2ascii.patch
 009-plugin-liclink.patch
 disable_autoupdate.dpatch
+drop_parent_pom.patch