[felix-framework] 05/05: Upload to unstable
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Sep 27 11:25:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository felix-framework.
commit cd17b7b26634ef1afe9db7816e2e786e9758326a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Sep 27 13:23:53 2016 +0200
Upload to unstable
---
debian/README.source | 5 +++--
debian/changelog | 4 ++--
debian/control | 17 +++++------------
debian/maven.cleanIgnoreRules | 17 -----------------
debian/maven.publishedRules | 19 -------------------
5 files changed, 10 insertions(+), 52 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 49b3097..0a2a095 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
Information about felix-framework
-------------------------------
+---------------------------------
The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
@@ -7,7 +7,8 @@ the Debian policy.
Bootstrapping felix-framework
-------------------------------------
+-----------------------------
+
Since libfelix-framework-java Build-Depends on libmaven-bundle-plugin-java
and libmaven-bundle-plugin-java also Build-Depends on libfelix-framework-java
we need a way to bootstrap this.
diff --git a/debian/changelog b/debian/changelog
index 000ffc7..96f617e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-felix-framework (4.6.1-2) UNRELEASED; urgency=medium
+felix-framework (4.6.1-2) unstable; urgency=medium
* Team upload.
* Depend on libasm-java (>= 5.0) instead of libasm4-java
@@ -6,7 +6,7 @@ felix-framework (4.6.1-2) UNRELEASED; urgency=medium
* Standards-Version updated to 3.9.8
* Use secure Vcs-* URLs
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 27 Sep 2016 12:27:27 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 27 Sep 2016 13:22:32 +0200
felix-framework (4.6.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 74d89b2..2ffc3d7 100644
--- a/debian/control
+++ b/debian/control
@@ -23,13 +23,9 @@ Homepage: http://felix.apache.org/site/apache-felix-framework.html
Package: libfelix-framework-java
Architecture: all
-Depends:
- ${maven:Depends},
- ${misc:Depends}
-Recommends:
- ${maven:OptionalDepends}
-Suggests:
- libfelix-framework-java-doc
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libfelix-framework-java-doc
Description: Felix Framework subproject
The Felix Framework subproject is an implementation
of the OSGi R4.2 core framework specification.
@@ -37,11 +33,8 @@ Description: Felix Framework subproject
Package: libfelix-framework-java-doc
Architecture: all
Section: doc
-Depends:
- ${maven:DocDepends},
- ${misc:Depends}
-Recommends:
- ${maven:DocOptionalDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
Description: Javadoc API documentation for the Felix Framework subproject
The Felix Framework subproject is an implementation
of the OSGi R4.2 core framework specification.
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index d9825b6..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-# junit junit jar s/3\..*/3.x/
-
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 77aa245..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\..*/3.x/
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-framework.git
More information about the pkg-java-commits
mailing list