[Git][java-team/libnanoxml2-java][master] 4 commits: Fixed the symbolic name of the OSGi bundles

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libnanoxml2-java


Commits:
d888fad0 by Emmanuel Bourg at 2019-08-16T23:20:34Z
Fixed the symbolic name of the OSGi bundles

- - - - -
0cd7fd14 by Emmanuel Bourg at 2019-08-16T23:20:59Z
Improved the clean target

- - - - -
6ac65979 by Emmanuel Bourg at 2019-08-16T23:23:39Z
Wrap and sort

- - - - -
8c97b35e by Emmanuel Bourg at 2019-08-16T23:25:30Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/clean
- debian/control
- debian/copyright
- debian/libnanoxml2-java-doc.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libnanoxml2-java (2.2.3.dfsg-8) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the symbolic name of the OSGi bundles
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 17 Aug 2019 01:25:19 +0200
+
 libnanoxml2-java (2.2.3.dfsg-7) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -1,2 +1,6 @@
 Test/Lite/*.test_out
 Test/Java/*.test_out
+*.bar
+*.jar
+*.jar.tmp
+api/


=====================================
debian/control
=====================================
@@ -1,13 +1,14 @@
 Source: libnanoxml2-java
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 11~)
-Build-Depends-Indep: default-jdk,
-                     bnd (>= 2.1.0),
-                     perl,
-                     javahelper
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
+Build-Depends:
+ bnd (>= 2.1.0),
+ debhelper (>= 11~),
+ default-jdk,
+ javahelper,
+ perl
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/java-team/libnanoxml2-java
 Vcs-Git: https://salsa.debian.org/java-team/libnanoxml2-java.git
@@ -17,7 +18,7 @@ Package: libnanoxml2-java
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: libnanoxml2-java-doc
-Description: small XML parser for Java
+Description: Small XML parser for Java
  NanoXML is a (actually more than one) small XML parser for Java. It
  provides the Java packages net.n3.nanoxml.*, net.n3.nanoxml.sax.* and
  nanoxml.* in nanoxml2.jar, nanoxml2-sax.jar and nanoxml2-lite.jar.
@@ -27,8 +28,7 @@ Description: small XML parser for Java
 Package: libnanoxml2-java-doc
 Architecture: all
 Section: doc
-Depends: default-jdk-doc,
-         ${misc:Depends}
+Depends: ${misc:Depends}, default-jdk-doc
 Description: documentation for libnanoxml2-java
  NanoXML is a small XML parser for Java. This is the javadoc for it
  (the Java packages net.n3.nanoxml.*, net.n3.nanoxml.sax.* and nanoxml.*)


=====================================
debian/copyright
=====================================
@@ -11,15 +11,15 @@ License: zlib
  no event will the author be held liable for any damages arising from the use of
  this software.
  .
- Permission is granted to anyone to use this software for any purpose, including 
- commercial applications, and to alter it and redistribute it freely, subject to 
+ Permission is granted to anyone to use this software for any purpose, including
+ commercial applications, and to alter it and redistribute it freely, subject to
  the following restrictions:
  .
    1. The origin of this software must not be misrepresented; you must not claim
-      that you wrote the original software. If you use this software in a 
-      product, an acknowledgment in the product documentation would be 
+      that you wrote the original software. If you use this software in a
+      product, an acknowledgment in the product documentation would be
       appreciated but is not required.
-   2. Altered source versions must be plainly marked as such, and must not be 
+   2. Altered source versions must be plainly marked as such, and must not be
       misrepresented as being the original software.
    3. This notice may not be removed or altered from any source distribution.
 


=====================================
debian/libnanoxml2-java-doc.install
=====================================
@@ -1,2 +1 @@
 Examples/* /usr/share/doc/libnanoxml2-java/examples
-


=====================================
debian/rules
=====================================
@@ -25,9 +25,9 @@ override_dh_auto_build:
 	CLASSPATH=${NANOXML} jh_build --javacopts='${JFLAGS}' --no-javadoc ${SAX} Sources/SAX/
 	jh_manifest -c /usr/share/java/${NANOXML} ${SAX}
 
-	bnd wrap --output $(NANOXML).tmp $(NANOXML)
-	bnd wrap --output $(LITE).tmp $(LITE)
-	bnd wrap --output $(SAX).tmp $(SAX)
+	bnd wrap --bsn net.n3.nanoxml      --output $(NANOXML).tmp $(NANOXML)
+	bnd wrap --bsn net.n3.nanoxml.lite --output $(LITE).tmp $(LITE)
+	bnd wrap --bsn net.n3.nanoxml.sax  --output $(SAX).tmp $(SAX)
 	mv $(NANOXML).tmp $(NANOXML)
 	mv $(LITE).tmp $(LITE)
 	mv $(SAX).tmp $(SAX)
@@ -45,8 +45,6 @@ endif
 
 override_dh_clean:
 	jh_clean
-	rm ${SAX} ${NANOXML} ${LITE} *.bar || echo "no jars to remove"
-	rm -rf api
 	rm -rf Test/*/*.class
 	rm -rf debian/orig.tmp || echo "No failed source fetch"
 



View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/fa39570f9bf63b5e3faffead665a76ce92cf5bff...8c97b35e9c4966a3dc98d2e6d712b39cc7f124d2

-- 
View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/fa39570f9bf63b5e3faffead665a76ce92cf5bff...8c97b35e9c4966a3dc98d2e6d712b39cc7f124d2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190816/48cb6cf9/attachment.html>