[SCM] Java datatype interface for RELAX NG branch, master, updated. debian/1.0+ds1-2-8-g588c259

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 122a15299dddba5f458067e068b480732f6c46f4
Merge: 8ad4005e1bdcd67ed628aea6787515b1b9121e11 31124040d1ffd82961c5afbb59a083f46be850f8
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed May 22 11:14:37 2013 +0200

    Merge branch 'master' of git.debian.org:/git/pkg-java/librelaxng-datatype-java
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index e441ceb,cf237a6..b5b4936
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,17 @@@
 -librelaxng-datatype-java (1.0+ds1-3) experimental; urgency=low
 +librelaxng-datatype-java (1.0+ds1-3) UNRELEASED; urgency=low
  
 -  * Team upload.
++  [ Giovanni Mascellani ]
 +  * Upload to unstable.
 +  * Fix a few lintian issues.
 +    + Bump Standards-Version to 3.9.4 (no changes required).
 +    + Remove useless dependency on JRE.
 +    + Refer to new official debian/copyright format.
 +    + Use canonical Vcs-* URLs.
 +
++  [ Emmanuel Bourg ]
+   * Removed the dependency on ${shlibs:Depends}
 -  * Removed the dependency on the JRE (not required for libraries)
 -  * Updated Standards-Version to 3.9.4 (no changes)
 -  * Updated the Format URI in debian/copyright
+ 
 - -- Emmanuel Bourg <ebourg at apache.org>  Tue, 16 Apr 2013 12:16:36 +0200
 + -- Giovanni Mascellani <gio at debian.org>  Wed, 22 May 2013 10:35:20 +0200
  
  librelaxng-datatype-java (1.0+ds1-2) experimental; urgency=low
  
diff --combined debian/control
index de2aaae,11f1809..4933a9a
--- a/debian/control
+++ b/debian/control
@@@ -2,16 -2,16 +2,16 @@@ Source: librelaxng-datatype-jav
  Section: java
  Priority: extra
  Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
- Uploaders: Giovanni Mascellani <gio at debian.org>
+ Uploaders: Giovanni Mascellani <gio at debian.org>, Emmanuel Bourg <ebourg at apache.org>
  Build-Depends: debhelper (>= 7.0.50~), ant, maven-repo-helper (>= 1.5), default-jdk
  Standards-Version: 3.9.4
  Homepage: http://sourceforge.net/projects/relaxng/
 -Vcs-Git: git://git.debian.org/pkg-java/librelaxng-datatype-java.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-java/librelaxng-datatype-java.git;a=summary
 +Vcs-Git: git://anonscm.debian.org/pkg-java/librelaxng-datatype-java.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/librelaxng-datatype-java.git;a=summary
  
  Package: librelaxng-datatype-java
  Architecture: all
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${misc:Depends}
  Description: Java datatype interface for RELAX NG
   RELAX NG is a schema language for XML. This library is a Java interface
   for describing datatypes within RELAX NG.
diff --combined debian/copyright
index aaa5b9d,c6433f7..e85a69f
--- a/debian/copyright
+++ b/debian/copyright
@@@ -35,20 -35,7 +35,7 @@@ License: BS
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
  Files: debian/*
 -Copyright: 2011, Giovanni Mascellani <gio at debian.org>
 +Copyright: 2011-2013, Giovanni Mascellani <gio at debian.org>
  License: GPL-2+
-  This package is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  .
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  .
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>
-  .
   On Debian systems, the complete text of the GNU General
   Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
Java datatype interface for RELAX NG