[pkg-java] r11280 - in trunk/eigenbase-farrago/debian: . patches

Sun Dec 13 16:26:22 UTC 2009

Author: drazzib
Date: 2009-12-13 16:26:22 +0000 (Sun, 13 Dec 2009)
New Revision: 11280

Added:
   trunk/eigenbase-farrago/debian/orig-tar.exclude
   trunk/eigenbase-farrago/debian/orig-tar.sh
   trunk/eigenbase-farrago/debian/patches/javadoc_links.diff
Modified:
   trunk/eigenbase-farrago/debian/changelog
   trunk/eigenbase-farrago/debian/control
   trunk/eigenbase-farrago/debian/copyright
   trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff
   trunk/eigenbase-farrago/debian/patches/series
   trunk/eigenbase-farrago/debian/rules
   trunk/eigenbase-farrago/debian/watch
Log:
update copyright and repack

Modified: trunk/eigenbase-farrago/debian/changelog
===================================================================

--- trunk/eigenbase-farrago/debian/changelog	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/changelog	2009-12-13 16:26:22 UTC (rev 11280)
@@ -1,4 +1,4 @@
-eigenbase-farrago (0.9.0-1) UNRELEASED; urgency=low
+eigenbase-farrago (0.9.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #560234)
 

Modified: trunk/eigenbase-farrago/debian/control
===================================================================
--- trunk/eigenbase-farrago/debian/control	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/control	2009-12-13 16:26:22 UTC (rev 11280)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt
-Build-Depends-Indep: libeigenbase-resgen-java
+Build-Depends-Indep: libeigenbase-resgen-java, junit, default-jdk-doc, junit-doc
 Standards-Version: 3.8.3
-Vcs-Svn: ssh://svn.debian.org/svn/pkg-java/trunk/eigenbase-resgen
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/eigenbase-resgen
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/eigenbase-resgen
 Homepage: http://farrago.sourceforge.net/
 
@@ -20,3 +20,5 @@
  Farrago is not an end-user product like MySQL or PostgreSQL.
  It provides a standards-based pluggable architecture, component library, and
  toolset for developers of other projects which specialize it.
+ .
+ This package only ship eigenbase-properties part of Farrago.

Modified: trunk/eigenbase-farrago/debian/copyright
===================================================================
--- trunk/eigenbase-farrago/debian/copyright	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/copyright	2009-12-13 16:26:22 UTC (rev 11280)
@@ -4,10 +4,11 @@
 Source: http://sourceforge.net/projects/farrago/files/
 
 Files: *
-Copyright: Copyright (C) 2005-2009 The Eigenbase Project
+Copyright: Copyright (C) 2002-2009 The Eigenbase Project
 Copyright: Copyright (C) 2002-2009 SQLstream, Inc.
-Copyright: Copyright (C) 2005-2009 LucidEra, Inc.
-Copyright: Copyright (C) 2003-2009 John V. Sichi
+Copyright: Copyright (C) 2002-2009 LucidEra, Inc.
+Copyright: Copyright (C) 2002-2009 John V. Sichi
+Copyright: Copyright (C) 2005-2009 Xiaoyang Luo
 License: GPL-2+ with linking GPL-incompatible libraries exemption
 
 Files: debian/*

Added: trunk/eigenbase-farrago/debian/orig-tar.exclude
===================================================================
--- trunk/eigenbase-farrago/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/eigenbase-farrago/debian/orig-tar.exclude	2009-12-13 16:26:22 UTC (rev 11280)
@@ -0,0 +1,8 @@
+*.vsd
+*.sxd
+*.odg
+*.doc
+unitsql/*
+testlog/*
+regressionsql/*
+testcases/*

Added: trunk/eigenbase-farrago/debian/orig-tar.sh
===================================================================
--- trunk/eigenbase-farrago/debian/orig-tar.sh	                        (rev 0)
+++ trunk/eigenbase-farrago/debian/orig-tar.sh	2009-12-13 16:26:22 UTC (rev 11280)
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=eigenbase-farrago-$2
+TAR=eigenbase-farrago_$2.orig.tar.gz
+
+# Repack upstream source to tar.gz
+tar xjf $3
+mv farrago-* $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+


Property changes on: trunk/eigenbase-farrago/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/eigenbase-farrago/debian/patches/javadoc_links.diff
===================================================================
--- trunk/eigenbase-farrago/debian/patches/javadoc_links.diff	                        (rev 0)
+++ trunk/eigenbase-farrago/debian/patches/javadoc_links.diff	2009-12-13 16:26:22 UTC (rev 11280)
@@ -0,0 +1,23 @@
+Description: Fix link of Javadoc HTML documentation
+ to use local API from /usr/share/doc/
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -1545,13 +1545,8 @@
+       <packageset dir="${farrago.dir}/examples/rng/catalog/java">
+         <include name="**"/>
+       </packageset>
+-      <link href="http://www.netbeans.org/download/dev/javadoc/org-netbeans-api-mdr"/>
+-      <link href="http://java.sun.com/products/jmi/jmi-1_0-fr-doc"/>
+-      <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+-      <link href="http://www.junit.org/junit/javadoc/3.8.1"/>
+-      <link href="http://www.janino.net/javadoc"/>
+-      <link href="http://www.csg.is.titech.ac.jp/openjava/OpenJava_1.1/htdocs"/>
+-      <link href="${enki.dir}/javadoc"/>
++      <link href="/usr/share/doc/default-jdk-doc/api/"/>
++      <link href="/usr/share/doc/junit-doc/doc/api/"/>
+       <doclet
+           name="ydoc.doclets.YStandard"
+           path="${ydoc.home}/lib/ydoc.jar${ps}${ydoc.home}/lib/class2svg.jar${ps}${ydoc.home}/resources${ps}${ydoc.home}/doc">

Modified: trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff
===================================================================
--- trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff	2009-12-13 16:26:22 UTC (rev 11280)
@@ -1,3 +1,8 @@
+Description: Update TriggerableProperties and Property to enable generics API
+ (those were commented out in upstream source code)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: no
 --- a/src/org/eigenbase/util/property/Property.java
 +++ b/src/org/eigenbase/util/property/Property.java
 @@ -262,10 +262,10 @@

Modified: trunk/eigenbase-farrago/debian/patches/series
===================================================================
--- trunk/eigenbase-farrago/debian/patches/series	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/patches/series	2009-12-13 16:26:22 UTC (rev 11280)
@@ -1 +1,2 @@
 properties_java5_api.diff
+javadoc_links.diff

Modified: trunk/eigenbase-farrago/debian/rules
===================================================================
--- trunk/eigenbase-farrago/debian/rules	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/rules	2009-12-13 16:26:22 UTC (rev 11280)
@@ -15,6 +15,5 @@
 	dh_install build/eigenbase-properties-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_link usr/share/java/eigenbase-properties-$(DEB_UPSTREAM_VERSION).jar usr/share/java/eigenbase-properties.jar
 
-
 get-orig-source:
-	uscan --force-download --rename --repack
+	uscan --force-download --rename

Modified: trunk/eigenbase-farrago/debian/watch
===================================================================
--- trunk/eigenbase-farrago/debian/watch	2009-12-13 15:38:55 UTC (rev 11279)
+++ trunk/eigenbase-farrago/debian/watch	2009-12-13 16:26:22 UTC (rev 11280)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/farrago/farrago-src-([\d\.]+).tar.bz2 debian uupdate
+http://sf.net/farrago/farrago-src-([\d\.]+).tar.bz2 debian debian/orig-tar.sh


