[Pkg-scicomp-commits] [SCM] glpk-java branch, master, updated. 3e43cb7652b3dd1c5eb8be6bbd57bfff9cfdc3f7

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit d415adcd501781b9a215ded967076e017d792aaa
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat Jun 6 12:15:24 2009 +0200

    Adapt for the new "real" upstream version 1.0
    
    The glpk-java upstream project has been moved to a separate area at
    SourceForge and its version numbering is starting now at 1.0.  Adapt
    debian/changelog and debian/watch accordingly.
    
    This new version has sane rules in the Makefiles, such that debian/dirs is
    not needed anymore.  Setting the prefix variable is now necessary when
    invoking "make all" and "make install".

diff --git a/debian/changelog b/debian/changelog
index 6e202a4..d216e56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-glpk-java (4.38-1) unstable; urgency=low
+glpk-java (1.0-1) unstable; urgency=low
 
   * Initial release
 
- -- Heinrich Schuchardt <xypron.debian at gmx.de>  Sun, 31 May 2009 21:33:10 +0200
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 06 Jun 2009 11:53:55 +0200
 
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 80d62e4..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java
-usr/lib/jni
diff --git a/debian/rules b/debian/rules
index 9b0d43a..8fd471a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
+DEB_MAKE_BUILD_TARGET = all prefix=/usr
 DEB_MAKE_CHECK_TARGET = test
-DEB_MAKE_INSTALL_TARGET = DESTDIR=$(CURDIR)/debian/libglpk-java install
+DEB_MAKE_INSTALL_TARGET = prefix=/usr DESTDIR=$(CURDIR)/debian/libglpk-java install
 DEB_DH_MAKESHLIBS_ARGS_ALL = --no-act
 
diff --git a/debian/watch b/debian/watch
index b60bb2f..1a419cf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/winglpk/glpk-java-(.*)\.tar\.gz
+http://sf.net/glpk-java/glpk-java-(.*)\.tar\.gz

-- 
glpk-java