[SCM] felix-framework packaging branch, master, updated. debian/2.0.5-3-9-g45790a6

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit b78f0c6b0728349986ecdb8d1b5f078df5776bd0
Author: Damien Raude-Morvan draz...@debian.org
Date:   Sat Nov 5 14:26:28 2011 +0100

d/watch: fix for upstream tarball new name.

diff --git a/debian/changelog b/debian/changelog
index bec40bb..c3e757b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ felix-framework (2.0.5-3) unstable; urgency=low
 
   [ Damien Raude-Morvan ]
   * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
+  * d/watch: fix for upstream tarball new name.
 
- -- Damien Raude-Morvan draz...@debian.org  Thu, 06 Oct 2011 00:58:37 +0200
+ -- Damien Raude-Morvan draz...@debian.org  Sat, 05 Nov 2011 14:26:04 +0100
 
 felix-framework (2.0.5-2) unstable; urgency=low
 
diff --git a/debian/watch b/debian/watch
index 443440c..fc843d2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/felix/ 
org.apache.felix.framework-(.+)-project\.tar\.gz debian debian/orig-tar.sh
+http://www.apache.org/dist/felix/ 
org.apache.felix.framework-(.+)-source-release\.tar\.gz debian 
debian/orig-tar.sh

-- 
felix-framework packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] felix-framework packaging branch, master, updated. debian/2.0.5-3-9-g45790a6

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 70830df579355cd88d2bcf0c9914320bac8f9e39
Author: Damien Raude-Morvan draz...@debian.org
Date:   Sat Nov 5 14:30:54 2011 +0100

d/rules: Set VERSION

diff --git a/debian/rules b/debian/rules
index bbe9a99..3c07322 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
+VERSION := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME := /usr/lib/jvm/default-java
 
 get-orig-source:
uscan \
-   --verbose \
--no-symlink \
--upstream-version $(VERSION) \
--download-version $(VERSION) \

-- 
felix-framework packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] felix-framework packaging branch, master, updated. debian/2.0.5-3-9-g45790a6

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 45790a61d8b7f84eb77f0d3ac7ce162cc82cf734
Author: Damien Raude-Morvan draz...@debian.org
Date:   Sun Nov 6 20:00:36 2011 +0100

Wrap-and-sort

diff --git a/debian/control b/debian/control
index 437cffe..558c2cd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,16 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
pkg-java-maintainers@lists.alioth.debian.org
 Uploaders: Yulia Novozhilova yulia.novozhil...@sun.com,
- Andres Mejia ame...@debian.org, Damien Raude-Morvan draz...@debian.org
-Build-Depends: debhelper (= 7), cdbs, default-jdk, maven-debian-helper (= 
1.4),
- libosgi-core-java, libosgi-compendium-java, libmaven-bundle-plugin-java,
- libmaven-javadoc-plugin-java
+   Andres Mejia ame...@debian.org,
+   Damien Raude-Morvan draz...@debian.org
+Build-Depends: cdbs,
+   debhelper (= 7),
+   default-jdk,
+   libmaven-bundle-plugin-java,
+   libmaven-javadoc-plugin-java,
+   libosgi-compendium-java,
+   libosgi-core-java,
+   maven-debian-helper (= 1.4)
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/site/apache-felix-framework.html
 Vcs-Git: git://git.debian.org/git/pkg-java/felix-framework.git
@@ -14,19 +20,19 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-java/felix-framework.git
 
 Package: libfelix-framework-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libfelix-framework-java-doc
-Description: The Felix Framework subproject 
- The Felix Framework subproject is an implementation 
+Description: The Felix Framework subproject
+ The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
 
 Package: libfelix-framework-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
-Description: Javadoc API documentation for the Felix Framework subproject 
- The Felix Framework subproject is an implementation 
+Description: Javadoc API documentation for the Felix Framework subproject
+ The Felix Framework subproject is an implementation
  of the OSGi R4.2 core framework specification.
  This package contains Javadoc API documentation.
diff --git a/debian/copyright b/debian/copyright
index faaef3d..4cb30a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,10 +13,9 @@ License: GPL-2
 
 
 License: Apache-2.0
- On Debian systems, the complete text of the Apache License Version 2.0, 
+ On Debian systems, the complete text of the Apache License Version 2.0,
  can be found in /usr/share/common-licenses/Apache-2.0.
 
 License: GPL-2
  On Debian systems, the complete text of the GNU General Public
  License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-

-- 
felix-framework packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits