Author: twerner Date: 2007-11-06 21:12:17 +0000 (Tue, 06 Nov 2007) New Revision: 4646
Added: trunk/libjboss-cache1-java/debian/patches/ trunk/libjboss-cache1-java/debian/patches/concurrent.diff trunk/libjboss-cache1-java/debian/patches/je.diff trunk/libjboss-cache1-java/debian/patches/series Removed: trunk/libjboss-cache1-java/debian/orig-tar.exclude Modified: trunk/libjboss-cache1-java/debian/ant.properties trunk/libjboss-cache1-java/debian/changelog trunk/libjboss-cache1-java/debian/control trunk/libjboss-cache1-java/debian/orig-tar.sh trunk/libjboss-cache1-java/debian/rules trunk/libjboss-cache1-java/debian/watch Log: * package version 1.4.x * workaround for incomplete concurrent in Debian * workaround for newer je Modified: trunk/libjboss-cache1-java/debian/ant.properties =================================================================== --- trunk/libjboss-cache1-java/debian/ant.properties 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/ant.properties 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,4 +1,4 @@ -project.name=jboss-cache2 +project.name=jboss-cache1 class.dir=classes source.dir=src -jboss-cache.jar=jboss-cache2.jar +jboss-cache.jar=jboss-cache1.jar Modified: trunk/libjboss-cache1-java/debian/changelog =================================================================== --- trunk/libjboss-cache1-java/debian/changelog 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/changelog 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,4 +1,4 @@ -libjboss-cache2-java (2.0.0.GA-1) unstable; urgency=low +libjboss-cache1-java (1.4.1.SP6-1) unstable; urgency=low UNRELEASED * Initial release (Closes: #446656) Modified: trunk/libjboss-cache1-java/debian/control =================================================================== --- trunk/libjboss-cache1-java/debian/control 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/control 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,20 +1,21 @@ -Source: libjboss-cache2-java +Source: libjboss-cache1-java Section: contrib/libs Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL PROTECTED]> -Build-Depends: cdbs, debhelper (>= 5) +Build-Depends: cdbs, debhelper (>= 5), quilt Build-Depends-Indep: ant, java-gcj-compat-dev, libdb-je-java, bsh, - libc3p0-java, ant-optional, libjgroups-java, libcommons-logging-java, - glassfish-javaee, libjdbm-java, libjboss-common-java, junit -# missing: findbugs, jboss-client, jboss-aop + libjgroups-java, libcommons-logging-java, libjdbm-java, liblog4j1.2-java, + libjboss-serialization-java, libjboss-system-java, libjboss-jmx-java, + libjboss-common-java, libconcurrent-java +# missing: jboss, jboss-aop Standards-Version: 3.7.2 Homepage: http://labs.jboss.com/jbosscache/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-cache-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-cache-java -Package: libjboss-cache2-java +Package: libjboss-cache1-java Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime Deleted: trunk/libjboss-cache1-java/debian/orig-tar.exclude =================================================================== --- trunk/libjboss-cache1-java/debian/orig-tar.exclude 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/orig-tar.exclude 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,3 +0,0 @@ -*.class -*.jar -*/docs/* Modified: trunk/libjboss-cache1-java/debian/orig-tar.sh =================================================================== --- trunk/libjboss-cache1-java/debian/orig-tar.sh 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/orig-tar.sh 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,11 +1,11 @@ #!/bin/sh -e # $2 = version, $3 = file -TAR=../libjboss-cache2-java_$2.orig.tar.gz +TAR=../libjboss-cache1-java_$2.orig.tar.gz # clean up the upstream tarball unzip $3 -tar -c -z -f $TAR -X debian/orig-tar.exclude JBossCache*/ +tar -c -z -f $TAR JBossCache*/ rm -rf $3 JBossCache*/ # move to directory 'tarballs' Added: trunk/libjboss-cache1-java/debian/patches/concurrent.diff =================================================================== --- trunk/libjboss-cache1-java/debian/patches/concurrent.diff (rev 0) +++ trunk/libjboss-cache1-java/debian/patches/concurrent.diff 2007-11-06 21:12:17 UTC (rev 4646) @@ -0,0 +1,301 @@ +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/Node.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/Node.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/Node.java 2007-11-06 21:53:38.000000000 +0100 +@@ -7,7 +7,7 @@ + package org.jboss.cache; + + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.factories.NodeFactory; +@@ -149,11 +149,11 @@ + { + if (getFqn().isRoot()) + { +- children = new ConcurrentReaderHashMap(64); ++ children = new ConcurrentHashMap(64); + } + else + { +- children = new ConcurrentReaderHashMap(4); ++ children = new ConcurrentHashMap(4); + } + } + return children; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/buddyreplication/BuddyManager.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/buddyreplication/BuddyManager.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/buddyreplication/BuddyManager.java 2007-11-06 21:53:38.000000000 +0100 +@@ -7,7 +7,7 @@ + package org.jboss.cache.buddyreplication; + + import EDU.oswego.cs.dl.util.concurrent.BoundedLinkedQueue; +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; +@@ -73,7 +73,7 @@ + /** + * Map of buddy pools received from broadcasts + */ +- Map buddyPool = new ConcurrentReaderHashMap(); ++ Map buddyPool = new ConcurrentHashMap(); + /** + * The nullBuddyPool is a set of addresses that have not specified buddy pools. + */ +@@ -92,7 +92,7 @@ + * Keyed on String group name, values are BuddyGroup objects. + * Needs to deal with concurrent access - concurrent assignTo/removeFrom buddy grp + */ +- Map buddyGroupsIParticipateIn = new ConcurrentReaderHashMap(); ++ Map buddyGroupsIParticipateIn = new ConcurrentHashMap(); + + /** + * Queue to deal with queued up view change requests - which are handled asynchronously +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2007-11-06 21:53:38.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.optimistic; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.DataNode; +@@ -88,7 +88,7 @@ + } + else + { +- optimisticChildNodeMap = new ConcurrentReaderHashMap(node.getChildren()); ++ optimisticChildNodeMap = new ConcurrentHashMap(node.getChildren()); + } + this.version = ((OptimisticTreeNode) node).getVersion(); + } +@@ -239,7 +239,7 @@ + { + child = NodeFactory.getInstance().createNodeOfType(parent, child_name, fqn, parent, null, cache, version); + if (optimisticChildNodeMap == Collections.EMPTY_MAP) +- optimisticChildNodeMap = new ConcurrentReaderHashMap(); ++ optimisticChildNodeMap = new ConcurrentHashMap(); + optimisticChildNodeMap.put(child_name, child); + if (trace) log.trace("Adding child " + child_name); + childrenAdded.add(child); +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TransactionTable.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/TransactionTable.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TransactionTable.java 2007-11-06 21:53:38.000000000 +0100 +@@ -7,7 +7,7 @@ + package org.jboss.cache; + + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.lock.IdentityLock; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TreeCache.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/TreeCache.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/TreeCache.java 2007-11-06 21:54:39.000000000 +0100 +@@ -6,8 +6,8 @@ + */ + package org.jboss.cache; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; +-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet; ++import java.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.CopyOnWriteArraySet; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.buddyreplication.BuddyGroup; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/eviction/RegionManager.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/eviction/RegionManager.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/eviction/RegionManager.java 2007-11-06 21:53:38.000000000 +0100 +@@ -29,7 +29,7 @@ + import java.util.TreeSet; + import java.util.Iterator; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + + /** + * Factory to create region from configuration, to track region, +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/ActivationInterceptor.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/ActivationInterceptor.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/ActivationInterceptor.java 2007-11-06 21:53:38.000000000 +0100 +@@ -1,6 +1,6 @@ + package org.jboss.cache.interceptors; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.jboss.cache.DataNode; + import org.jboss.cache.Fqn; + import org.jboss.cache.GlobalTransaction; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2007-11-06 21:53:38.000000000 +0100 +@@ -1,6 +1,6 @@ + package org.jboss.cache.interceptors; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.jboss.cache.Fqn; + import org.jboss.cache.GlobalTransaction; + import org.jboss.cache.Modification; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2007-11-06 21:53:38.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.interceptors; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.CacheException; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2007-11-06 21:53:38.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.interceptors; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.jboss.cache.CacheException; + import org.jboss.cache.Fqn; + import org.jboss.cache.GlobalTransaction; +@@ -329,4 +329,4 @@ + } + } + } +-} +\ No newline at end of file ++} +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/TxInterceptor.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/interceptors/TxInterceptor.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/interceptors/TxInterceptor.java 2007-11-06 21:53:38.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.interceptors; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.jboss.cache.CacheException; + import org.jboss.cache.GlobalTransaction; + import org.jboss.cache.InvocationContext; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/FileCacheLoader.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/FileCacheLoader.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/FileCacheLoader.java 2007-11-06 21:53:38.000000000 +0100 +@@ -1,6 +1,6 @@ + package org.jboss.cache.loader; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.Fqn; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2007-11-06 21:53:38.000000000 +0100 +@@ -1,6 +1,6 @@ + package org.jboss.cache.loader.bdbje; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import com.sleepycat.bind.serial.SerialBinding; + import com.sleepycat.bind.serial.StoredClassCatalog; + import com.sleepycat.bind.tuple.TupleBinding; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java 2007-11-06 21:53:38.000000000 +0100 +@@ -1,6 +1,6 @@ + package org.jboss.cache.loader.jdbm; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import jdbm.RecordManager; + import jdbm.RecordManagerFactory; + import jdbm.btree.BTree; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/Marshaller.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/marshall/Marshaller.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/Marshaller.java 2007-11-06 21:53:38.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.marshall; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.Fqn; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/RegionManager.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/marshall/RegionManager.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/RegionManager.java 2007-11-06 21:53:38.000000000 +0100 +@@ -23,7 +23,7 @@ + import java.util.Set; + import java.util.TreeSet; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + + /** + * Factory to create region from configuration, to track region, +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/TreeCacheMarshaller.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/marshall/TreeCacheMarshaller.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/marshall/TreeCacheMarshaller.java 2007-11-06 21:53:38.000000000 +0100 +@@ -7,7 +7,7 @@ + + package org.jboss.cache.marshall; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.jboss.cache.Fqn; +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2007-11-01 18:22:40.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2007-11-06 21:53:38.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.optimistic; + +-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.ConcurrentHashMap; + import org.jboss.cache.Fqn; + import org.jboss.cache.TreeCache; + +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/lock/LockMap.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/lock/LockMap.java 2007-11-06 21:54:34.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/lock/LockMap.java 2007-11-06 21:54:44.000000000 +0100 +@@ -6,7 +6,7 @@ + */ + package org.jboss.cache.lock; + +-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet; ++import java.util.concurrent.CopyOnWriteArraySet; + + // See IdentityLockPerfTest -- + // oswego read/write acquire/release locks/sec: 2000000, 2840909 Added: trunk/libjboss-cache1-java/debian/patches/je.diff =================================================================== --- trunk/libjboss-cache1-java/debian/patches/je.diff (rev 0) +++ trunk/libjboss-cache1-java/debian/patches/je.diff 2007-11-06 21:12:17 UTC (rev 4646) @@ -0,0 +1,13 @@ +Index: libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java +=================================================================== +--- libjboss-cache1-java-1.4.1.SP6.orig/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2007-11-06 22:07:22.000000000 +0100 ++++ libjboss-cache1-java-1.4.1.SP6/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2007-11-06 22:12:51.000000000 +0100 +@@ -848,7 +848,7 @@ + private void dumpDatabase(String dbName, PrintStream ps) + throws Exception { + +- DbDump dumper = new DbDump(env, dbName, ps, false); ++ DbDump dumper = new DbDump(env, dbName, ps, ".", false); + dumper.dump(); + } + Added: trunk/libjboss-cache1-java/debian/patches/series =================================================================== --- trunk/libjboss-cache1-java/debian/patches/series (rev 0) +++ trunk/libjboss-cache1-java/debian/patches/series 2007-11-06 21:12:17 UTC (rev 4646) @@ -0,0 +1,2 @@ +concurrent.diff +je.diff Modified: trunk/libjboss-cache1-java/debian/rules =================================================================== --- trunk/libjboss-cache1-java/debian/rules 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/rules 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,20 +1,21 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk JAVA_HOME := /usr/lib/jvm/java-gcj DEB_ANT_BUILD_TARGET := jar DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := findbugs jboss-client jboss-aop-jdk50 je bsh c3p0 \ - ant-junit jgroups-core commons-logging glassfish-javaee jdbm \ - jboss-common junit +DEB_JARS := jboss jboss-aop-jdk50 je bsh jgroups-core commons-logging \ + jdbm log4j-1.2 jboss-serialization jboss-system jboss-jmx jboss-common \ + concurrent -install/libjboss-cache2-java:: - install -m 644 -D jboss-cache2.jar \ - $(DEB_DESTDIR)/usr/share/java/jboss-cache2-$(DEB_UPSTREAM_VERSION).jar - dh_link /usr/share/java/jboss-cache2-$(DEB_UPSTREAM_VERSION).jar \ - /usr/share/java/jboss-cache2.jar +install/libjboss-cache1-java:: + install -m 644 -D jboss-cache1.jar \ + $(DEB_DESTDIR)/usr/share/java/jboss-cache1-$(DEB_UPSTREAM_VERSION).jar + dh_link /usr/share/java/jboss-cache1-$(DEB_UPSTREAM_VERSION).jar \ + /usr/share/java/jboss-cache1.jar get-orig-source: uscan --upstream-version 0 --rename Modified: trunk/libjboss-cache1-java/debian/watch =================================================================== --- trunk/libjboss-cache1-java/debian/watch 2007-11-06 18:28:00 UTC (rev 4645) +++ trunk/libjboss-cache1-java/debian/watch 2007-11-06 21:12:17 UTC (rev 4646) @@ -1,2 +1,2 @@ version=3 -http://sf.net/jboss/ JBossCache-all-(.*).zip debian debian/orig-tar.sh +http://sf.net/jboss/ jboss-cache-srcOnly-(.*).zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
