[jabref] 376/459: Repacking framework: also remove the buildlib directory.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit 459ce7b3047e06aeedf0c922be10abd038c66f48
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jan 1 18:13:18 2013 +0100

    Repacking framework: also remove the buildlib directory.
---
 debian/copyright                 | 4 ++--
 debian/patches/debian_libs.patch | 6 ++++--
 debian/repack.local              | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 780572a..6f36bd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JabRef
 Upstream-Contact: Morten Alver, Nizar Batada
 Source: http://jabref.sourceforge.net/
-Comment: The +ds version is created by removing lib/:
- contains sourceless pre-compiled libraries which are not used anyway
+Comment: The +ds version is created by removing lib/ and buildlib/:
+ contain sourceless pre-compiled libraries which are not used anyway
 
 Files: *
 Copyright: 2003-2012, Morten Alver <mortenalver at users.sourceforge.net>
diff --git a/debian/patches/debian_libs.patch b/debian/patches/debian_libs.patch
index d1b18db..6da97cf 100644
--- a/debian/patches/debian_libs.patch
+++ b/debian/patches/debian_libs.patch
@@ -7,17 +7,19 @@ Last-Update: 2013-01-01
 
 --- a/build.xml
 +++ b/build.xml
-@@ -76,7 +76,9 @@
+@@ -76,8 +76,10 @@
  	<property name="help.dir" value="${src.dir}/help" />
  	<property name="extensions.dir" value="${src.dir}/extensions" />
  	<property name="layout.dir" value="${src.dir}/resource/layout" />
 -	<property name="lib.dir" value="lib" />
+-	<property name="buildlib.dir" value="buildlib" />
 +	<property name="lib.dir" value="/usr/share/java" />
 +	<property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />
 +	<property name="ure.dir" value="/usr/lib/ure/share/java" />
- 	<property name="buildlib.dir" value="buildlib" />
++	<property name="buildlib.dir" value="/usr/share/java" />
  	<property name="tests.dir" value="${src.dir}/tests" />
  
+ 	<property name="osxbin.dir" value="osx" />
 @@ -102,33 +104,35 @@
  
  	<fileset id="jarsFileset" dir="${lib.dir}">
diff --git a/debian/repack.local b/debian/repack.local
index f03c114..3e6d3a0 100644
--- a/debian/repack.local
+++ b/debian/repack.local
@@ -1,3 +1,4 @@
 requires_version 2
 SUFFIX=+ds
 rm lib
+rm buildlib

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