[simplyhtml] 03/04: import 0.16.16, drop gnu-regexp dependency

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository simplyhtml.

commit f9a1e43d443d464caed389726818f13153f4fa03
Author: Felix Natter <fnatter at gmx.net>
Date:   Fri Apr 15 14:30:00 2016 +0200

    import 0.16.16, drop gnu-regexp dependency
---
 debian/changelog               |  2 +-
 debian/control                 |  2 --
 debian/copyright               |  6 +++---
 debian/patches/01_build.patch  | 30 ++++++++++--------------------
 debian/simplyhtml-doc.doc-base |  4 ++--
 5 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f91e839..7b1f7b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-simplyhtml (0.16.15-1) UNRELEASED; urgency=medium
+simplyhtml (0.16.16-1) UNRELEASED; urgency=medium
 
   * New upstream version.
   * Use/patch new gradle build system.
diff --git a/debian/control b/debian/control
index ee3f8e7..4703f6a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Section: web
 Priority: optional
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: default-jdk,
-                     libgnu-regexp-java,
                      javahelp2,
                      libmnemonicsetter-java,
                      docbook-to-man,
@@ -20,7 +19,6 @@ Homepage: http://sf.net/projects/simplyhtml
 Package: simplyhtml
 Architecture: all
 Depends: default-jre | java7-runtime,
-         libgnu-regexp-java,
          libmnemonicsetter-java,
          ${misc:Depends}
 Recommends: javahelp2
diff --git a/debian/copyright b/debian/copyright
index 02ed203..b93047d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Source: http://simplyhtml.sf.net/
 Upstream-Contact: Felix Natter <fnatter at gmx.net>
 
 Files: *
-Copyright: 2006-2015 Dimitri Polivaev <dpolivaev at users.sourceforge.net>
-           2012-2015 Felix Natter <fnatter at gmx.net>
+Copyright: 2006-2016 Dimitri Polivaev <dpolivaev at users.sourceforge.net>
+           2012-2016 Felix Natter <fnatter at gmx.net>
            2002,2003 Ulrich Hilger <info at lightdev.com>
 License: GPL-2+
 
@@ -66,7 +66,7 @@ License: GPL-2+
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: debian/*
-Copyright: 2013-2015 Felix Natter <fnatter at gmx.net>
+Copyright: 2013-2016 Felix Natter <fnatter at gmx.net>
            2008-2012 Eric Lavarde <deb at zorglub.s.bawue.de>           
 License: GPL-2+ or BSD-2-clause
  This package is free software; you can redistribute it and/or modify
diff --git a/debian/patches/01_build.patch b/debian/patches/01_build.patch
index cb2d464..5da6a5d 100644
--- a/debian/patches/01_build.patch
+++ b/debian/patches/01_build.patch
@@ -15,18 +15,15 @@
 +apply plugin: 'maven'
  
  group 'com.lightdev.app.shtm.simplyhtml'
- version = '0.16.15'
-@@ -13,30 +14,16 @@
+ version = '0.16.16'
+@@ -13,24 +14,8 @@
  sourceCompatibility='1.7'
  
  repositories {
 -    jcenter()
 -	maven { url "http://dl.bintray.com/freeplane/freeplane" } 
-+   //jcenter()
-+   //	maven { url "http://dl.bintray.com/freeplane/freeplane" }
-+   flatDir name: '/usr/share/java', dir: '/usr/share/java'
- }
- 
+-}
+-
 -bintray {
 -    user = System.getenv('BINTRAY_USER')
 -    key = System.getenv('BINTRAY_KEY')
@@ -41,19 +38,12 @@
 -                name = project.version
 -		}
 -    }
--}
- 
- dependencies {
--	compile 'javax.help:javahelp:2.0.05',
--			'gnu-regexp:gnu-regexp:1.1.4',
--			'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'  
-+        compile 'javax.help:javahelp:2.0.05',
-+                'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'
-+        compile ':gnu-regexp'
++    //jcenter()
++    //	maven { url "http://dl.bintray.com/freeplane/freeplane" } 
  }
  
- sourceSets {  
-@@ -89,9 +76,7 @@
+ dependencies {
+@@ -88,9 +73,7 @@
      from sourceSets.main.allSource
  }
  
@@ -64,7 +54,7 @@
  publishing {
      publications {
          simplyhtml(MavenPublication) {
-@@ -104,6 +89,24 @@
+@@ -103,6 +86,24 @@
          }
      }
  }
@@ -89,7 +79,7 @@
  
  javadoc {
      enabled = true
-@@ -111,4 +114,8 @@
+@@ -110,4 +111,8 @@
      failOnError = false
  }
  
diff --git a/debian/simplyhtml-doc.doc-base b/debian/simplyhtml-doc.doc-base
index 43f77ce..5cc68e8 100644
--- a/debian/simplyhtml-doc.doc-base
+++ b/debian/simplyhtml-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: The programmer API of SimplyHTML, a Java
 Section: Programming/Java
 
 Format: HTML
-Index: /usr/share/doc/simplyhtml-doc/api/index.html
-Files: /usr/share/doc/simplyhtml-doc/api/*
+Index: /usr/share/doc/simplyhtml-doc/javadoc/index.html
+Files: /usr/share/doc/simplyhtml-doc/javadoc/*

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