Author: malat Date: 2012-04-04 15:59:56 +0000 (Wed, 04 Apr 2012) New Revision: 10325
Removed: trunk/packages/netcdf-java/trunk/debian/get-orig-source trunk/packages/netcdf-java/trunk/debian/patches/ Modified: trunk/packages/netcdf-java/trunk/debian/changelog trunk/packages/netcdf-java/trunk/debian/control trunk/packages/netcdf-java/trunk/debian/copyright trunk/packages/netcdf-java/trunk/debian/orig-tar.sh trunk/packages/netcdf-java/trunk/debian/rules Log: Have to stop again netcdf effort. Need joda time 2.0 lib Modified: trunk/packages/netcdf-java/trunk/debian/changelog =================================================================== --- trunk/packages/netcdf-java/trunk/debian/changelog 2012-04-04 14:55:45 UTC (rev 10324) +++ trunk/packages/netcdf-java/trunk/debian/changelog 2012-04-04 15:59:56 UTC (rev 10325) @@ -2,4 +2,4 @@ * Initial Debian Upload (Closes: #641447) - -- Mathieu Malaterre <[email protected]> Mon, 12 Sep 2011 09:56:16 +0200 + -- Mathieu Malaterre <[email protected]> Mon, 12 Sep 2011 09:56:16 +0200 Modified: trunk/packages/netcdf-java/trunk/debian/control =================================================================== --- trunk/packages/netcdf-java/trunk/debian/control 2012-04-04 14:55:45 UTC (rev 10324) +++ trunk/packages/netcdf-java/trunk/debian/control 2012-04-04 15:59:56 UTC (rev 10325) @@ -2,15 +2,14 @@ Priority: optional Section: java Maintainer: Debian Med Packaging Team <[email protected]> -DM-Upload-Allowed: yes -Uploaders: Mathieu Malaterre <[email protected]> +Uploaders: Mathieu Malaterre <[email protected]> Build-Depends: debhelper (>= 8), javahelper (>=0.25) Build-Depends-Indep: default-jdk, default-jdk-doc, ant, libjdom1-java, libslf4j-java, libcommons-httpclient-java, libdb-je-java, libehcache-java, libprotobuf-java, libquartz-java, libprotobuf-java (>= 2.3), - libjna-java -Standards-Version: 3.9.2 + libjna-java, libjoda-time-java, libdb-je-java +Standards-Version: 3.9.3 Homepage: http://www.unidata.ucar.edu/software/netcdf-java/ Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/netcdf-java/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/netcdf-java/trunk/ Modified: trunk/packages/netcdf-java/trunk/debian/copyright =================================================================== --- trunk/packages/netcdf-java/trunk/debian/copyright 2012-04-04 14:55:45 UTC (rev 10324) +++ trunk/packages/netcdf-java/trunk/debian/copyright 2012-04-04 15:59:56 UTC (rev 10325) @@ -1,9 +1,9 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: netcdf-java Source: http://www.unidata.ucar.edu/software/netcdf-java/ Files: * -Copyright: 1993-2010 University Corporation for Atmospheric Research/Unidata +Copyright: © 1993-2010 University Corporation for Atmospheric Research/Unidata Licence: BSD Portions of this software were developed by the Unidata Program at the University Corporation for Atmospheric Research. @@ -30,7 +30,7 @@ cdm/src/main/java/ucar/unidata/geoloc/vertical/OceanSG2.java cdm/src/main/java/ucar/nc2/dataset/transform/VOceanSG2.java cdm/src/main/java/ucar/nc2/dataset/transform/VOceanSG1.java -Copyright: 1997-2010 Unidata Program Center/University Corporation for +Copyright: © 1997-2010 Unidata Program Center/University Corporation for Licence: LGPL-2+ Atmospheric Research, P.O. Box 3000, Boulder, CO 80307, [email protected]. @@ -50,7 +50,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Files: cdm/src/main/java/ucar/unidata/io/bzip2/*.java -Copyright: 2001 The Apache Software Foundation. All rights reserved. +Copyright: © 2001 The Apache Software Foundation. All rights reserved. License: Apache 1.1 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -93,19 +93,18 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: ./cdm/src/main/java/ucar/unidata/geoloc/projection/proj4/*.java -Copyright: 2006 Jerry Huxtable -License: Apache-2 +Files: cdm/src/main/java/ucar/unidata/geoloc/projection/proj4/*.java +Copyright: © 2006 Jerry Huxtable +License: Apache-2.0 Files: common/src/main/java/ucar/nc2/util/net/EasyX509TrustManager.java common/src/main/java/ucar/nc2/util/net/EasySSLProtocolSocketFactory.java -Copyright: Copyright 2002-2004 The Apache Software Foundation -License: Apache-2 +Copyright: © 2002-2004 The Apache Software Foundation +License: Apache-2.0 Files: common/src/main/java/ucar/nc2/util/net/EscapeStrings.java -Copyright: - Copyright (c) 2010, OPeNDAP, Inc. - Copyright (c) 2002,2003 OPeNDAP, Inc. +Copyright: © 2010, OPeNDAP, Inc. + © 2002,2003 OPeNDAP, Inc. License: BSD Redistribution and use in source and binary forms, with or without modification, are permitted provided @@ -136,11 +135,62 @@ Files: cdm/src/main/java/ucar/unidata/geoloc/projection/UtmCoordinateConversion.java -Copyright: Copyright IBM Corp. 2007 +Copyright: © IBM Corp. 2007 +License: IBM-Corp-2007 + The following are terms of a legal downloader agreement (the "Agreement") regarding Your download of Content (as defined below) from this Website. + IBM may change these terms of use and other requirements and guidelines for use of this Website at its sole discretion. + This Website may contain other proprietary notices and copyright information the terms of which must be observed and followed. + Any use of the Content in violation of this Agreement is strictly prohibited. + . + "Content" includes, but is not limited to, software, text and/or speech files, code, associated materials, media and /or documentation that + You download from this Website. The Content may be provided by IBM or third-parties. IBM Content is owned by IBM and is copyrighted and licensed, + not sold. Third-party Content is owned by its respective owner and is licensed by the third party directly to You. IBM's decision to permit + posting of third-party Content does not constitute an express or implied license from IBM to You or a recommendation or endorsement by IBM + of any particular product, service, company or technology. + . + The party providing the Content (the "Provider") grants You a nonexclusive, worldwide, irrevocable, royalty-free, copyright license to edit, + copy, reproduce, publish, publicly display and/or perform, format, modify and/or make derivative works of, translate, re-arrange, and distribute + the Content or any portions thereof and to sublicense any or all such rights and to permit sublicensees to further sublicense such rights, for both + commercial and non-commercial use, provided You abide by the terms of this Agreement. You understand that no assurances are provided that the Content + does not infringe the intellectual property rights of any other entity. Neither IBM nor the provider of the Content grants a patent license of any kind, + whether expressed or implied or by estoppel. As a condition of exercising the rights and licenses granted under this Agreement, + You assume sole responsibility to obtain any other intellectual property rights needed. + . + The Provider of the Content is the party that submitted the Content for Posting and who represents and warrants that they own all of the Content, + (or have obtained all written releases, authorizations and licenses from any other owner(s) necessary to grant IBM and downloaders this license + with respect to portions of the Content not owned by the Provider). All information provided on or through this Website may be changed or updated + without notice. You understand that IBM has no obligation to check information and /or Content on the Website and that the information and/or + Content provided on this Web site may contain technical inaccuracies or typographical errors. + . + IBM may, in its sole discretion, discontinue the Website, any service provided on or through the Website, as well as limit or discontinue access + to any Content posted on the Website for any reason without notice. IBM may terminate this Agreement and Your rights to access, use and download + Content from the Website at any time, with or without cause, immediately and without notice. + . + ALL INFORMATION AND CONTENT IS PROVIDED ON AN "AS IS" BASIS. IBM MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, CONCERNING USE OF + THE WEBSITE, THE CONTENT, OR THE COMPLETENESS OR ACCURACY OF THE CONTENT OR INFORMATION OBTAINED FROM THE WEBSITE. IBM SPECIFICALLY DISCLAIMS + ALL WARRANTIES WITH REGARD TO THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IBM DOES NOT + WARRANT UNINTERRUPTED OR ERROR-FREE OPERATION OF ANY CONTENT. IBM IS NOT RESPONSIBLE FOR THE RESULTS OBTAINED FROM THE USE OF THE CONTENT OR + INFORMATION OBTAINED FROM THE WEBSITE. + . + LIMITATION OF LIABILITY. IN NO EVENT WILL IBM BE LIABLE TO ANY PARTY FOR ANY DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR A + NY USE OF THIS WEBSITE, THE USE OF CONTENT FROM THIS WEBSITE, OR ON ANY OTHER HYPER LINKED WEB SITE, INCLUDING, WITHOUT LIMITATION, ANY LOST + PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN IF IBM IS EXPRESSLY + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + . + The laws of the State of New York, USA govern this Agreement, without reference to conflict of law principles. The "United Nations Convention + on International Sale of Goods" does not apply. This Agreement may not be assigned by You. The parties agree to waive their right to a trial by jury. + . + This Agreement is the complete and exclusive agreement between the parties and supersedes all prior agreements, oral or written, and all + other communications relating to the subject matter hereof. For clarification, it is understood and You agree, that any additional + agreement or license terms that may accompany the Content is invalid, void, and non-enforceable to any downloader of this Content including IBM. + . + If any section of this Agreement is found by competent authority to be invalid, illegal or unenforceable in any respect for any reason, + the validity, legality and enforceability of any such section in every other respect and the remainder of this Agreement shall continue in effect. + Files: cdm/src/main/java/net/jcip/annotations/GuardedBy.java -Copyright: 2005 Brian Goetz and Tim Peierls -License: CCAL +Copyright: © 2005 Brian Goetz and Tim Peierls +License: CC-BY-2.5 Released under the Creative Commons Attribution License (http://creativecommons.org/licenses/by/2.5) Official home: http://www.jcip.net @@ -148,7 +198,11 @@ Any republication or derived work distributed in source code form must include this copyright and license notice. +License: Apache-2.0 + On Debian systems the full text of the Apache Software License 2.0 can be + found in the `/usr/share/common-licenses/Apache-2.0' file. + Files: debian/* -Copyright: © 2011 Mathieu Malaterre <[email protected]> +Copyright: © 2012 Mathieu Malaterre <[email protected]> License: PD The packaging work is in the public domain unless stated otherwise. Deleted: trunk/packages/netcdf-java/trunk/debian/get-orig-source =================================================================== --- trunk/packages/netcdf-java/trunk/debian/get-orig-source 2012-04-04 14:55:45 UTC (rev 10324) +++ trunk/packages/netcdf-java/trunk/debian/get-orig-source 2012-04-04 15:59:56 UTC (rev 10325) @@ -1,64 +0,0 @@ -#!/bin/sh -set -ex - -PACKAGE=netcdf-java - -VERSION=${VERSION:-$2} -TARFILE=${TARFILE:-$3} - -if [ -z ${VERSION}]; then -VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'` -fi - -REVISION=`echo $VERSION | sed -e 's/^.*svn//g'` - - -if [ -z ${TARFILE}]; then -TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz -fi - -FOLDER=${PACKAGE}-${VERSION} - -# http://www.unidata.ucar.edu/software/netcdf-java/ -# http://www.unidata.ucar.edu/downloads/netcdf/netcdf-java-4/index.jsp -wget -c ftp://ftp.unidata.ucar.edu/pub/netcdf-java/v$VERSION/ncSrc-$VERSION.zip -unzip ncSrc-$VERSION.zip -d ${FOLDER} -# remove jars: -rm -rf ${FOLDER}/lib/release/ -rm -rf ${FOLDER}/lib/external/ - -# remove files with weird copyright -# upstream is fixing them for next release -# http://mailman.unidata.ucar.edu/mailing_lists/archives/netcdf-java/2012/msg00002.html -# http://mailman.unidata.ucar.edu/mailing_lists/archives/netcdf-java/2012/msg00014.html -# http://mailman.unidata.ucar.edu/mailing_lists/archives/netcdf-java/2012/msg00016.html -rm -rf ${FOLDER}/ui/src/main/java/ucar/ -rm -rf ${FOLDER}/cdm/src/main/java/thredds -rm -rf ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/noaa/ -rm -rf ${FOLDER}/ui/src/main/java/thredds/ui/monitor/ManageForm.java -rm -rf ${FOLDER}/ui/src/main/java/thredds/ui/catalog/tools/CatalogCopier.java -#./cdm/src/main/java/ucar/ma2/ArrayScalar.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/AwxFileGeoSatelliteSecondHeader.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/util/EndianByteBuffer.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/AwxFileGridProductSecondHeader.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/UnsupportedDatasetException.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/AwxFileFirstHeader.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/AwxFileSecondHeader.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/fysat/AwxFileGridProductExtendedPart.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/uamiv/UAMIVServiceProvider.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/iosp/sigmet/SigmetIOServiceProvider.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/ft/point/collection/UpdateableCollection.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/ft/point/remote/RemotePointFeatureIterator.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/ft/point/remote/FeatureMaker.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/ft/point/remote/RemoteStationCollection.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/stream/NcStreamIosp.java -#rm ${FOLDER}/cdm/src/main/java/ucar/nc2/stream/NcStream.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/ncml/NcmlConstructor.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/time/Calendar.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/time/CalendarDateUnit.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/time/CalendarDuration.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/time/CalendarDateRange.java -rm ${FOLDER}/cdm/src/main/java/ucar/nc2/time/CalendarDate.java - -GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER} -rm -rf ${FOLDER} Modified: trunk/packages/netcdf-java/trunk/debian/orig-tar.sh =================================================================== --- trunk/packages/netcdf-java/trunk/debian/orig-tar.sh 2012-04-04 14:55:45 UTC (rev 10324) +++ trunk/packages/netcdf-java/trunk/debian/orig-tar.sh 2012-04-04 15:59:56 UTC (rev 10325) @@ -7,8 +7,29 @@ # clean up the upstream tarball tar -zxf $3 mv Unidata-thredds-* $DIR +# remove lib/ dir: +rm -rf $DIR/lib/binary/ +rm -rf $DIR/lib/external/ +rm -rf $DIR/lib/release/ +# remaining *.jar find $DIR -name *.jar -delete +# remove docs since 187M +rm -rf $DIR/docs +# too big: +rm -rf $DIR/cdm/src/test/data/ +rm -rf $DIR/cdm/doc +# remove some zip files: +find $DIR -name *.zip -delete +# remove doc files too: +find $DIR -name *.doc -delete +# wotsit ? +# 'ESRI Shapefile version 1000 length 1910754 type Polygon' +rm $DIR/cdm/src/main/resources/optional/nj22/maps/Countries.zip +rm -rf $DIR/wmoTables +# should not copy convenient lib: +rm -rf $DIR/opendap tar -czf $TAR $DIR +# 299M ../v4.3.8-BETA rm -rf $DIR $3 # move to directory 'tarballs' Modified: trunk/packages/netcdf-java/trunk/debian/rules =================================================================== --- trunk/packages/netcdf-java/trunk/debian/rules 2012-04-04 14:55:45 UTC (rev 10324) +++ trunk/packages/netcdf-java/trunk/debian/rules 2012-04-04 15:59:56 UTC (rev 10325) @@ -4,11 +4,11 @@ JAVA_HOME=/usr/lib/jvm/default-java # libprotobuf-java 2.3.0 -> /usr/share/java/protobuf.jar # libprotobuf-java 2.4.1 -> /usr/share/java/protobuf-java.jar -export CLASSPATH=/usr/share/java/quartz.jar:/usr/share/java/protobuf.jar:/usr/share/java/ehcache.jar:/usr/share/java/jdom1.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/protobuf-java.jar +export CLASSPATH=/usr/share/java/quartz.jar:/usr/share/java/protobuf.jar:/usr/share/java/ehcache.jar:/usr/share/java/jdom1.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/protobuf-java.jar:/usr/share/java/joda-time.jar:/usr/share/java/db-je.jar ANT_OPTS=-Dbuild.sysclasspath=first %: - dh $@ --sourcedirectory=cdm --with javahelper + dh $@ --sourcedirectory=cdm #--with ant override_dh_auto_build: dh_auto_build -- $(ANT_OPTS) makeCore _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
