Author: kumanna-guest Date: 2007-10-15 18:23:54 +0000 (Mon, 15 Oct 2007) New Revision: 4424
Added: trunk/jmagick/debian/ trunk/jmagick/debian/README.Debian trunk/jmagick/debian/README.Debian-source trunk/jmagick/debian/changelog trunk/jmagick/debian/compat trunk/jmagick/debian/control trunk/jmagick/debian/copyright trunk/jmagick/debian/examples/ trunk/jmagick/debian/examples/Makefile trunk/jmagick/debian/libjmagick6-java.docs trunk/jmagick/debian/libjmagick6-java.examples trunk/jmagick/debian/orig-tar.exclude trunk/jmagick/debian/orig-tar.sh trunk/jmagick/debian/patches/ trunk/jmagick/debian/patches/01_fix_load_jnilib.patch trunk/jmagick/debian/rules trunk/jmagick/debian/watch Log: Import JMagick into Debian Java. Added: trunk/jmagick/debian/README.Debian =================================================================== --- trunk/jmagick/debian/README.Debian (rev 0) +++ trunk/jmagick/debian/README.Debian 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,9 @@ +JMagick for Debian +================== + +The upstream provided test cases have been made available as examples +in the `examples' directory. To run them, just copy all files to a +directory called `test', edit the Makefile if needed, and run make +test and make test2. Beware that test2 runs a while(true) loop. + + -- Kumar Appaiah <[EMAIL PROTECTED]>, Sun, 14 Oct 2007 11:54:08 +0530 Added: trunk/jmagick/debian/README.Debian-source =================================================================== --- trunk/jmagick/debian/README.Debian-source (rev 0) +++ trunk/jmagick/debian/README.Debian-source 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,12 @@ +JMagick for Debian +================== + +The upstream supplied source package contains the remains of their +builds. Therefore, to get a clean deb, I repackage the upstream +tarball. + +Use the rules/get-orig-source target to create the orig.tar.gz. +For more details on repackaging of upstream sources please see the +debian/orig-tar.sh file. + + -- Kumar Appaiah <[EMAIL PROTECTED]>, Sun, 14 Oct 2007 08:34:38 +0530 Added: trunk/jmagick/debian/changelog =================================================================== --- trunk/jmagick/debian/changelog (rev 0) +++ trunk/jmagick/debian/changelog 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,49 @@ +jmagick (6.2.6-0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Now binNMU safe (Closes: #437486). + + The Debian Java maintainers adopt the package, + taken over from Adam Heath (Closes: #429794). + + Add Varun Hiremath and Kumar Appaiah as uploaders. + + Add Homepage field. + + Updated to use GCJ to build (Closes: #329104, #349564). + * debian/rules: + + Fully refactor to make it use cdbs. + * debian/patches/01_fix_load_jnilib.patch + + Ensure that the JNI interface is loaded. + * debian/watch: Added. + * debian/orig-tar.sh, debian/orig-tar.exclude: + + Repackage scripts to remove unclean upstream tarball. + * debian/README.Debian-source: + + Explain why and how we are repackaging. + * debian/copyright: Total rewrite. + * debian/libjmagick6-java.examples: + + Provide two test cases as examples. + * debian/examples/Makefile: + + To build and run the examples. + * debian/README.Debian: + + Directions on how to run the examples. + + -- Kumar Appaiah <[EMAIL PROTECTED]> Sun, 14 Oct 2007 09:39:07 +0530 + +jmagick (6.2.4-1-1) unstable; urgency=low + + * New upstream version. + * Add kaffe-dev to Build-Depends. Closes: #329104. + * No longer use find to clean the dirs. Closes: #325411 + + -- Adam Heath <[EMAIL PROTECTED]> Sun, 15 Jan 2006 23:30:17 -0600 + +jmagick (6.0.4-0-2) unstable; urgency=low + + * Fix problem when JMagick is not loaded thru the system classloader. + + -- Adam Heath <[EMAIL PROTECTED]> Wed, 17 Aug 2005 14:53:00 -0500 + +jmagick (6.0.4-0-1) unstable; urgency=low + + * Initial release. + + -- Adam Heath <[EMAIL PROTECTED]> Wed, 17 Aug 2005 14:27:52 -0500 + Added: trunk/jmagick/debian/compat =================================================================== --- trunk/jmagick/debian/compat (rev 0) +++ trunk/jmagick/debian/compat 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1 @@ +5 Added: trunk/jmagick/debian/control =================================================================== --- trunk/jmagick/debian/control (rev 0) +++ trunk/jmagick/debian/control 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,62 @@ +Source: jmagick +Maintainer: Debian Java maintainers <[EMAIL PROTECTED]> +Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Kumar Appaiah <[EMAIL PROTECTED]> +Section: graphics +Priority: optional +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), cdbs, java-gcj-compat-dev, libmagick9-dev, autotools-dev, chrpath +Homepage: http://www.yeo.id.au/jmagick/ + +Package: libjmagick6-java +Architecture: all +Depends: libjmagick6-jni (>= ${source:Version}), java-gcj-compat | java-virtual-machine +Provides: jmagick +Description: A java interface to ImageMagick - java classes + JMagick is an open source Java interface of ImageMagick. It is + implemented in the form of Java Native Interface (JNI) into the + ImageMagick API. + . + JMagick does not attempt to make the ImageMagick API + object-oriented. It is merely a thin interface layer into the + ImageMagick API. + . + JMagick currently only implements a subset of ImageMagick APIs. + Should you require unimplemented features in JMagick, please join the + mailing list and make a request. + +Package: jmagick6-docs +Architecture: all +Provides: jmagick-docs +Description: A java interface to ImageMagick - api documentation + JMagick is an open source Java interface of ImageMagick. It is + implemented in the form of Java Native Interface (JNI) into the + ImageMagick API. + . + JMagick does not attempt to make the ImageMagick API + object-oriented. It is merely a thin interface layer into the + ImageMagick API. + . + JMagick currently only implements a subset of ImageMagick APIs. + Should you require unimplemented features in JMagick, please join the + mailing list and make a request. + . + This package contains javadoc generated documentation. + +Package: libjmagick6-jni +Architecture: any +Depends: ${shlibs:Depends} +Description: A java interface to ImageMagick - native library + JMagick is an open source Java interface of ImageMagick. It is + implemented in the form of Java Native Interface (JNI) into the + ImageMagick API. + . + JMagick does not attempt to make the ImageMagick API + object-oriented. It is merely a thin interface layer into the + ImageMagick API. + . + JMagick currently only implements a subset of ImageMagick APIs. + Should you require unimplemented features in JMagick, please join the + mailing list and make a request. + . + This package contains the native interface to ImageMagick. It is + loaded at runtime into the Java Virtual Machine (JVM). Added: trunk/jmagick/debian/copyright =================================================================== --- trunk/jmagick/debian/copyright (rev 0) +++ trunk/jmagick/debian/copyright 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,46 @@ +This package was debianized by Adam Heath on +Wed, 17 Aug 2005 14:27:52 -0500 + +It was downloaded from http://www.yeo.id.au/jmagick/ + +Upstream Authors: + Original author: Eric Yeo <[EMAIL PROTECTED]> + +Contributors: + Abdulbaset Gaddah <[EMAIL PROTECTED]> + Jin Zhao <[EMAIL PROTECTED]> + Ibrahim Tannir <[EMAIL PROTECTED]> + Susan Dorr <[EMAIL PROTECTED]> + Adam Heath <[EMAIL PROTECTED]> + Max Kollegov <[EMAIL PROTECTED]> + Tim Griffin <[EMAIL PROTECTED]> + Elizabeth Barham <[EMAIL PROTECTED]> + Susan Dorr <[EMAIL PROTECTED]> + Mike Edmonds <[EMAIL PROTECTED]> + +Copyright: (C) 1998-2007 Eric Yeo + +License: + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General Public +License can be found in `/usr/share/common-licenses/LGPL-2.1'. + +The Debian packaging is (C) 2005, 2006 Adam Heath +<[EMAIL PROTECTED]> and (C) 2007 Kumar Appaiah +<[EMAIL PROTECTED]> and is licensed under the GPL. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. Added: trunk/jmagick/debian/examples/Makefile =================================================================== --- trunk/jmagick/debian/examples/Makefile (rev 0) +++ trunk/jmagick/debian/examples/Makefile 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,21 @@ +JAVA_SRC_FILES = MagickWindow.java Test.java Loop.java +CLEAN_LIST = copy.jpg blank.jpg copy_pics.jpg rotated.jpg \ + sheared.jpg quantized.png scaled.jpg cropped.jpg \ + chopped.jpg sharpened.jpg despeckled.jpg \ + convolved.jpg blob.jpg montage.jpg average.jpg \ + blob.gif transparent.png border.jpg raised.jpg \ + clone.jpg + +# For Solaris and Linux, LD_LIBRARY_PATH sets the shared library path +# For Mac OS X, DYLD_LIBRARY_PATH sets the shared library path +JAVA=/usr/lib/jvm/java-gcj/bin/java +JAVAC=/usr/lib/jvm/java-gcj/bin/javac + +build: + $(JAVAC) -cp ..:/usr/share/java/jmagick6.jar *.java + +test: build + LD_LIBRARY_PATH=/usr/lib/jni/ DYLD_LIBRARY_PATH=/usr/lib/jni $(JAVA) -cp ..:/usr/share/java/jmagick6.jar test.Test + +test2: build + LD_LIBRARY_PATH=/usr/lib/jni/ DYLD_LIBRARY_PATH=/usr/lib/jni $(JAVA) -cp ..:/usr/share/java/jmagick6.jar test.Loop pics.jpg Added: trunk/jmagick/debian/libjmagick6-java.docs =================================================================== --- trunk/jmagick/debian/libjmagick6-java.docs (rev 0) +++ trunk/jmagick/debian/libjmagick6-java.docs 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1 @@ +debian/README.Debian Added: trunk/jmagick/debian/libjmagick6-java.examples =================================================================== --- trunk/jmagick/debian/libjmagick6-java.examples (rev 0) +++ trunk/jmagick/debian/libjmagick6-java.examples 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,5 @@ +src/test/Loop.java +src/test/MagickWindow.java +src/test/Test.java +src/test/pics.jpg +debian/examples/Makefile Added: trunk/jmagick/debian/orig-tar.exclude =================================================================== --- trunk/jmagick/debian/orig-tar.exclude (rev 0) +++ trunk/jmagick/debian/orig-tar.exclude 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,6 @@ +libtool +autom4te.cache +Make.def +config.cache +config.log +config.status Added: trunk/jmagick/debian/orig-tar.sh =================================================================== --- trunk/jmagick/debian/orig-tar.sh (rev 0) +++ trunk/jmagick/debian/orig-tar.sh 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,22 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +UPSTREAM_TAR=../JMagick-$2.tar.gz +DIR=jmagick-$2.orig + +rm -f $3 + +# clean up the upstream tarball +tar zxf $UPSTREAM_TAR +mv JMagick-$2 $DIR +GZIP=--best tar czf $3 -X debian/orig-tar.exclude $DIR +rm -rf $DIR $UPSTREAM_TAR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $3 $origDir + echo "moved $3 to $origDir" +fi + +exit 0 Property changes on: trunk/jmagick/debian/orig-tar.sh ___________________________________________________________________ Name: svn:executable + Added: trunk/jmagick/debian/patches/01_fix_load_jnilib.patch =================================================================== --- trunk/jmagick/debian/patches/01_fix_load_jnilib.patch (rev 0) +++ trunk/jmagick/debian/patches/01_fix_load_jnilib.patch 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,33 @@ +diff -Nur jmagick-6.2.6-0.orig/src/magick/Magick.java jmagick-6.2.6-0.orig.new/src/magick/Magick.java +--- jmagick-6.2.6-0.orig/src/magick/Magick.java 2002-07-07 13:46:53.000000000 +0530 ++++ jmagick-6.2.6-0.orig.new/src/magick/Magick.java 2007-10-14 10:27:51.000000000 +0530 +@@ -15,28 +15,7 @@ + public class Magick { + + static { +- String clprop = System.getProperty("jmagick.systemclassloader"); +- if (clprop == null || clprop.equalsIgnoreCase("yes")) { +- try { +- ClassLoader.getSystemClassLoader() +- .loadClass("magick.MagickLoader").newInstance(); +- } +- catch(ClassNotFoundException e) { +- throw new RuntimeException("Can't load MagickLoader " + +- "(class not found)"); +- } +- catch(IllegalAccessException e) { +- throw new RuntimeException("Access to SystemClassLoader "+ +- "denied (IllegalAccessException)"); +- } +- catch(InstantiationException e) { +- throw new RuntimeException("Can't instantiate MagicLoader " + +- "(InstantiationException)"); +- } +- } +- else { +- System.loadLibrary("JMagick"); +- } ++ System.loadLibrary("JMagick"); + } + + /** Added: trunk/jmagick/debian/rules =================================================================== --- trunk/jmagick/debian/rules (rev 0) +++ trunk/jmagick/debian/rules 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,39 @@ +#!/usr/bin/make -f + +JAVA_HOME := /usr/lib/jvm/java-gcj + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_SCRIPT_ENV += PATH=$(JAVA_HOME)/bin:$$PATH +DEB_CONFIGURE_EXTRA_FLAGS = --libdir=/usr/lib/jni --with-java-home=$(JAVA_HOME) +DEB_MAKE_CLEAN_TARGET = clean +DEB_MAKE_BUILD_TARGET = all +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_CHECK_TARGET = +DEB_DH_INSTALL_SOURCEDIR = debian/tmp +DEB_COMPRESS_EXCLUDE = .java + +install/libjmagick6-java:: + mkdir -p $(DEB_DESTDIR)/usr/share/java + install -m 644 -D ./lib/jmagick.jar $(DEB_DESTDIR)/usr/share/java/jmagick6-$(DEB_UPSTREAM_VERSION).jar + dh_install --sourcedir=debian/tmp usr/share/java/jmagick6-$(DEB_UPSTREAM_VERSION).jar + dh_link usr/share/java/jmagick6-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jmagick6.jar + +install/libjmagick6-jni:: + chrpath -d ./lib/libJMagick.so + install -m 644 -D ./lib/libJMagick.so ./debian/libjmagick6-jni/usr/lib/jni/libJMagick.so + +install/jmagick6-docs:: + mkdir -p ./debian/jmagick6-docs/usr/share/doc/jmagick6-docs/api + $(MAKE) javadoc DESTDIR=./debian/jmagick6-docs JAVADOC_DIR=/usr/share/doc/jmagick6-docs/api + +clean:: + rm -rf Make.def libtool config.cache config.log config.status obj/magick/.libs + rm -rf autom4te.cache + +.PHONY: get-orig-source +get-orig-source: + uscan --upstream-version 0 Property changes on: trunk/jmagick/debian/rules ___________________________________________________________________ Name: svn:executable + Added: trunk/jmagick/debian/watch =================================================================== --- trunk/jmagick/debian/watch (rev 0) +++ trunk/jmagick/debian/watch 2007-10-15 18:23:54 UTC (rev 4424) @@ -0,0 +1,2 @@ +version=3 +http://www.yeo.id.au/jmagick/ quickload/JMagick-(.*)\.tar\.gz debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
