[Git][java-team/equinox-framework][master] 3 commits: Handle the conflict between libeclipse-osgi-java and libequinox-osgi-java (Closes: #907863)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / equinox-framework


Commits:
3668d826 by Emmanuel Bourg at 2018-09-05T13:20:32Z
Handle the conflict between libeclipse-osgi-java and libequinox-osgi-java (Closes: #907863)

- - - - -
ca208446 by Emmanuel Bourg at 2018-09-05T13:20:47Z
Standards-Version updated to 4.2.1

- - - - -
bd2d8265 by Emmanuel Bourg at 2018-09-05T13:23:09Z
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+equinox-framework (4.7.3-2) unstable; urgency=medium
+
+  * Handle the conflict between libeclipse-osgi-java and libequinox-osgi-java
+    (Closes: #907863)
+  * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 05 Sep 2018 15:23:04 +0200
+
 equinox-framework (4.7.3-1) unstable; urgency=medium
 
   * Initial release (Closes: #903617)


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends:
  libosgi-annotation-java,
  libservlet3.1-java,
  eclipse-debian-helper
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/equinox-framework.git
 Vcs-Browser: https://salsa.debian.org/java-team/equinox-framework
 Homepage: http://www.eclipse.org/equinox/framework/
@@ -17,6 +17,8 @@ Homepage: http://www.eclipse.org/equinox/framework/
 Package: libeclipse-osgi-java
 Architecture: all
 Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-annotation-java
+Breaks: libequinox-osgi-java
+Replaces: libequinox-osgi-java
 Description: Eclipse OSGi System Bundle
  The Equinox Framework component is tasked with being a full implementation
  to the OSGi Core Framework R4 specification. In addition, the Framework



View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/compare/22ee94889b836a4ccf5b3e579b686a4562439c7b...bd2d82652985a57909323c27cbfd96738cf3f336

-- 
View it on GitLab: https://salsa.debian.org/java-team/equinox-framework/compare/22ee94889b836a4ccf5b3e579b686a4562439c7b...bd2d82652985a57909323c27cbfd96738cf3f336
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/20180905/75caf3e9/attachment.html>