[Git][java-team/felix-bundlerepository][master] 6 commits: Wrap and sort

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / felix-bundlerepository


Commits:
57accd9b by Emmanuel Bourg at 2018-09-12T21:12:25Z
Wrap and sort

- - - - -
9603d447 by Emmanuel Bourg at 2018-09-12T21:13:06Z
Standards-Version updated to 4.2.1

- - - - -
7a46f62b by Emmanuel Bourg at 2018-09-12T21:31:16Z
Fixed the scope of the Easymock dependency (Closes: #866032)

- - - - -
453c32e2 by Emmanuel Bourg at 2018-09-12T21:40:05Z
Suggest the optional dependencies instead of recommending them

- - - - -
291bfe0d by Emmanuel Bourg at 2018-09-12T21:42:08Z
Use salsa.debian.org Vcs-* URLs

- - - - -
25016adf by Emmanuel Bourg at 2018-09-12T21:44:01Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix-easymock-dependency-scope.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+felix-bundlerepository (2.0.10-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the scope of the Easymock dependency (Closes: #866032)
+  * Suggest the optional dependencies instead of recommending them
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 12 Sep 2018 23:43:52 +0200
+
 felix-bundlerepository (2.0.10-3) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -2,12 +2,11 @@ Source: felix-bundlerepository
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Damien Raude-Morvan <drazzib at debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
  debhelper (>= 11),
- default-jdk-headless,
  default-jdk-doc,
+ default-jdk-headless,
  libeasymock-java,
  libfelix-gogo-runtime-java,
  libfelix-osgi-obr-java,
@@ -20,20 +19,15 @@ Build-Depends:
  libosgi-compendium-java (>= 6),
  libosgi-core-java (>= 5.0.0~),
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.1.3
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/felix-bundlerepository.git
+Vcs-Browser: https://salsa.debian.org/java-team/felix-bundlerepository
 Homepage: https://felix.apache.org/documentation/subprojects/apache-felix-osgi-bundle-repository.html
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/felix-bundlerepository.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/felix-bundlerepository.git
 
 Package: libfelix-bundlerepository-java
 Architecture: all
-Depends:
- ${maven:Depends},
- ${misc:Depends}
-Recommends:
- ${maven:OptionalDepends}
-Suggests:
- libfelix-bundlerepository-java-doc
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}, libfelix-bundlerepository-java-doc
 Description: Felix OSGi bundle repository service
  The Felix project is an implementation
  of the OSGi core framework specification.
@@ -48,13 +42,9 @@ Description: Felix OSGi bundle repository service
 Package: libfelix-bundlerepository-java-doc
 Architecture: all
 Section: doc
-Depends:
- ${maven:DocDepends},
- ${misc:Depends}
-Recommends:
- ${maven:DocOptionalDepends}
-Suggests:
- libfelix-bundlerepository-java
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libfelix-bundlerepository-java
 Description: Documentation for Felix OSGi bundle repository service
  The Felix project is an implementation
  of the OSGi core framework specification.


=====================================
debian/patches/fix-easymock-dependency-scope.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Exclude EasyMock from the runtime classpath
+Author: Mykola Nikishov <mn at mn.com.ua>
+Origin: backport, https://svn.apache.org/r1793018
+Bug: https://issues.apache.org/jira/browse/FELIX-5626
+--- a/pom.xml
++++ b/pom.xml
+@@ -98,6 +98,7 @@
+         <groupId>org.easymock</groupId>
+         <artifactId>easymock</artifactId>
+         <version>3.4</version>
++        <scope>test</scope>
+     </dependency>
+   </dependencies>
+   <build>


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 relax-Import-Package-requirements.patch
 osgi-compendium-6.patch
+fix-easymock-dependency-scope.patch


=====================================
debian/rules
=====================================
@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename --no-symlink



View it on GitLab: https://salsa.debian.org/java-team/felix-bundlerepository/compare/dde9e1d1bf3f2c6b40ab848a8d333cb326b5d66d...25016adfc2bddb1503db9e28865f5918b11fa99d

-- 
View it on GitLab: https://salsa.debian.org/java-team/felix-bundlerepository/compare/dde9e1d1bf3f2c6b40ab848a8d333cb326b5d66d...25016adfc2bddb1503db9e28865f5918b11fa99d
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/20180912/2b517538/attachment.html>