[SCM] jvyamlb packaging branch, master, updated. debian/0.2.5-1-1-g60e8978

[Andrew Ross]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jvyamlb packaging".

The branch, master has been updated
       via  60e8978d52f9702eb6b8c888ec3e570402c082a6 (commit)
      from  565496f20856b6d31b6d92ac879948064a573ea1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60e8978d52f9702eb6b8c888ec3e570402c082a6
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Thu Jul 14 22:59:32 2011 +0100

    Update to depend only on packages in main.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    8 ++++++++
 debian/control   |   10 +++++-----
 debian/rules     |    5 +++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 924d7cb..a4b99d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jvyamlb (0.2.5-2) unstable; urgency=low
+
+  * Updated dependencies. We don't need all of jruby.
+  * Move to main since jvyamlb no longer needs a non-free package to build.
+  * Bump standards version to 3.9.2 (no changes needed).
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Tue, 12 Jul 2011 19:25:57 +0100
+
 jvyamlb (0.2.5-1) unstable; urgency=low
 
   [ Andres Mejia ]
diff --git a/debian/control b/debian/control
index fd727ea..445962c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: jvyamlb
-Section: contrib/java
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Andres Mejia <mcitadel at gmail.com>
+Uploaders: Andres Mejia <mcitadel at gmail.com>, Andrew Ross <ubuntu at rossfamily.co.uk>
 Build-Depends: debhelper (>= 7.0.50~), javahelper
-Build-Depends-Indep: ant, ant-optional, default-jdk, jruby, libjoda-time-java,
- junit4
-Standards-Version: 3.9.1
+Build-Depends-Indep: ant, ant-optional, default-jdk, 
+ libbytelist-java, libjoda-time-java, libjcodings-java, junit4
+Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/jvyamlb/
 Vcs-Git: git://git.debian.org/git/pkg-java/jvyamlb.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jvyamlb.git
diff --git a/debian/rules b/debian/rules
index 3398d48..76ee792 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
 #!/usr/bin/make -f
 
 JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/bytelist.jar:/usr/share/java/jcodings.jar:/usr/share/java/joda-time.jar
 
 %:
 	dh $@ --with javahelper
 
 override_dh_auto_configure:
 	mkdir lib
-	ln -sf /usr/share/java/jruby.jar lib/bytelist-0.1.jar
-	ln -sf /usr/share/java/joda-time.jar lib/joda-time-1.5.1.jar
+# We link junit rather than adding to the classpath above because we only 
+# need it for running the unit tests
 	ln -sf /usr/share/java/junit4.jar lib/junit.jar
 
 override_dh_clean:


hooks/post-receive
-- 
jvyamlb packaging