[felix-main] 01/02: Fix dependencies and clean target

Miguel Landaeta nomadium at moszumanska.debian.org
Fri Feb 20 22:24:03 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository felix-main.

commit 000a630d50af497b7d4586f28e923b39fd8a0e08
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri Feb 20 19:02:06 2015 -0300

    Fix dependencies and clean target
---
 debian/changelog | 12 ++++++++++--
 debian/control   |  6 +++---
 debian/rules     |  3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d849419..2034ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-felix-main (4.6.0-1) experimental; urgency=medium
+felix-main (4.6.0-1) UNRELEASED; urgency=medium
 
+  [ Markus Koschany ]
   * Team upload.
   * Imported Upstream version 4.6.0.
   * Declare compliance with Debian Policy 3.9.6.
@@ -9,7 +10,14 @@ felix-main (4.6.0-1) experimental; urgency=medium
   * Drop libfelix-main-java-doc.docs to avoid duplicate documentation files.
     The documentation is build from source anyway.
 
- -- Markus Koschany <apo at gambaru.de>  Fri, 06 Feb 2015 15:12:51 +0100
+  [ Miguel Landaeta ]
+  * Add missing versioned B-D on:
+    - libfelix-bundlerepository-java
+    - libfelix-gogo-runtime-java
+    - libfelix-gogo-command-java
+  * Fix clean target to allow twice in a row builds.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Fri, 20 Feb 2015 17:48:39 -0300
 
 felix-main (4.4.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index dc870da..919c338 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,11 @@ Build-Depends:
  cdbs,
  debhelper (>= 9),
  default-jdk,
- libfelix-bundlerepository-java,
+ libfelix-bundlerepository-java (>= 2.0.2~),
  libfelix-framework-java,
- libfelix-gogo-command-java,
+ libfelix-gogo-command-java (>= 0.14.0~),
  libfelix-gogo-command-java-doc,
- libfelix-gogo-runtime-java,
+ libfelix-gogo-runtime-java (>= 0.14.0~),
  libfelix-gogo-runtime-java-doc,
  libfelix-gogo-shell-java,
  libfelix-gogo-shell-java-doc,
diff --git a/debian/rules b/debian/rules
index 029e135..3823986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@ DEB_DESTDIR = $(CURDIR)/debian/felix-main
 install/felix-main::
 	install -m 755 -D debian/felix-framework.sh $(DEB_DESTDIR)/usr/bin/felix-framework
 
+clean::
+	-rm -rf $(CURDIR)/bundle $(CURDIR)/bin $(CURDIR)/conf
+
 get-orig-source:
 	uscan \
 		--no-symlink \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-main.git



More information about the pkg-java-commits mailing list