[pkg-java] r5459 - in trunk/libcommons-collections3-java/debian: . patches
varun at alioth.debian.org
varun at alioth.debian.org
Wed Jan 16 05:23:20 UTC 2008
Author: varun
Date: 2008-01-16 05:23:19 +0000 (Wed, 16 Jan 2008)
New Revision: 5459
Added:
trunk/libcommons-collections3-java/debian/README.Debian-source
trunk/libcommons-collections3-java/debian/orig-tar.sh
trunk/libcommons-collections3-java/debian/patches/
trunk/libcommons-collections3-java/debian/patches/disable_links.diff
trunk/libcommons-collections3-java/debian/patches/series
Removed:
trunk/libcommons-collections3-java/debian/dirs
trunk/libcommons-collections3-java/debian/libcommons-collections3-java.links
Modified:
trunk/libcommons-collections3-java/debian/changelog
trunk/libcommons-collections3-java/debian/compat
trunk/libcommons-collections3-java/debian/control
trunk/libcommons-collections3-java/debian/rules
trunk/libcommons-collections3-java/debian/watch
Log:
* New upstream release
* debian/control:
+ Build-Depends on debhelper >=5
+ Bump up Standards-Version to 3.7.3
* debian/compat: Bump to 5
* Add debian/orig-tar.sh to create orig.tar.gz
* Remove debian/dirs file - not required
* Remove debian/libcommons-collections3-java.links and create links from
debian/rules to avoid hard coding the version in links file
* Add debian/README.Debian-source
* debian/rules:
+ clean up unused variables
+ create symlinks for the jars
+ implement get-orig-source target
* Add patches/disable_links.diff to disable external links in build.xml
while creating javadocs
Added: trunk/libcommons-collections3-java/debian/README.Debian-source
===================================================================
--- trunk/libcommons-collections3-java/debian/README.Debian-source (rev 0)
+++ trunk/libcommons-collections3-java/debian/README.Debian-source 2008-01-16 05:23:19 UTC (rev 5459)
@@ -0,0 +1,13 @@
+libcommons-collections3-java
+============================
+
+The upstream supplied source package contains binary jar files.
+Currently no clean source distribution exists. Therefore, the upstream
+sources were modified to comply with the Debian Free Software
+Guidelines.
+
+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.
+
+ -- Varun Hiremath <varun at debian.org>, Wed, 16 Jan 2008 10:31:23 +0530
Modified: trunk/libcommons-collections3-java/debian/changelog
===================================================================
--- trunk/libcommons-collections3-java/debian/changelog 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/changelog 2008-01-16 05:23:19 UTC (rev 5459)
@@ -1,12 +1,31 @@
-libcommons-collections3-java (3.1a-3.2) UNRELEASED; urgency=low
+libcommons-collections3-java (3.2-1) UNRELEASED; urgency=low
+ [ Kumar Appaiah ]
* Add a watch file.
* debian/control:
+ Add Xs-Vcs-Browser, Xs-Vcs-Svn.
+ Add Homepage field.
-
- -- Kumar Appaiah <akumar at ee.iitm.ac.in> Thu, 20 Sep 2007 19:54:03 +0530
+ [ Varun Hiremath ]
+ * New upstream release
+ * debian/control:
+ + Build-Depends on debhelper >=5
+ + Bump up Standards-Version to 3.7.3
+ * debian/compat: Bump to 5
+ * Add debian/orig-tar.sh to create orig.tar.gz
+ * Remove debian/dirs file - not required
+ * Remove debian/libcommons-collections3-java.links and create links from
+ debian/rules to avoid hard coding the version in links file
+ * Add debian/README.Debian-source
+ * debian/rules:
+ + clean up unused variables
+ + create symlinks for the jars
+ + implement get-orig-source target
+ * Add patches/disable_links.diff to disable external links in build.xml
+ while creating javadocs
+
+ -- Varun Hiremath <varun at debian.org> Wed, 16 Jan 2008 10:41:50 +0530
+
libcommons-collections3-java (3.1a-3.1) unstable; urgency=low
* Non-maintainer upload.
Modified: trunk/libcommons-collections3-java/debian/compat
===================================================================
--- trunk/libcommons-collections3-java/debian/compat 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/compat 2008-01-16 05:23:19 UTC (rev 5459)
@@ -1 +1 @@
-4
+5
Modified: trunk/libcommons-collections3-java/debian/control
===================================================================
--- trunk/libcommons-collections3-java/debian/control 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/control 2008-01-16 05:23:19 UTC (rev 5459)
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Wolfgang Baer <WBaer at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>= 4.2.30), cdbs (>=0.4.21)
+Build-Depends: debhelper (>= 5), cdbs, quilt
Build-Depends-Indep: ant, ant-optional, java-gcj-compat-dev, junit
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-collections3-java
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-collections3-java
+Standards-Version: 3.7.3
Homepage: http://commons.apache.org/collections/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-collections3-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-collections3-java
+
Package: libcommons-collections3-java
Architecture: all
Section: libs
Deleted: trunk/libcommons-collections3-java/debian/dirs
===================================================================
--- trunk/libcommons-collections3-java/debian/dirs 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/dirs 2008-01-16 05:23:19 UTC (rev 5459)
@@ -1 +0,0 @@
-usr/share/java
Deleted: trunk/libcommons-collections3-java/debian/libcommons-collections3-java.links
===================================================================
--- trunk/libcommons-collections3-java/debian/libcommons-collections3-java.links 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/libcommons-collections3-java.links 2008-01-16 05:23:19 UTC (rev 5459)
@@ -1 +0,0 @@
-usr/share/java/commons-collections3-3.1.jar usr/share/java/commons-collections3.jar
Added: trunk/libcommons-collections3-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-collections3-java/debian/orig-tar.sh (rev 0)
+++ trunk/libcommons-collections3-java/debian/orig-tar.sh 2008-01-16 05:23:19 UTC (rev 5459)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=libcommons-collections3-java.orig
+
+# clean up the upstream tarball
+tar -z -x -f $3
+mv commons-collections-$2-src $DIR
+tar -c -z -f $3 --exclude '*.jar' $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
Property changes on: trunk/libcommons-collections3-java/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/libcommons-collections3-java/debian/patches/disable_links.diff
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/disable_links.diff (rev 0)
+++ trunk/libcommons-collections3-java/debian/patches/disable_links.diff 2008-01-16 05:23:19 UTC (rev 5459)
@@ -0,0 +1,20 @@
+Index: libcommons-collections3-java-3.2/build.xml
+===================================================================
+--- libcommons-collections3-java-3.2.orig/build.xml 2008-01-16 11:03:39.000000000 +0530
++++ libcommons-collections3-java-3.2/build.xml 2008-01-16 11:03:47.000000000 +0530
+@@ -358,7 +358,6 @@
+ author="true"
+ version="true"
+ use="true"
+- link="${javadoc.links}"
+ overview="${source.java}/org/apache/commons/collections/overview.html"
+ doctitle="${component.title} ${component.version} API;"
+ windowtitle="${component.title} ${component.version} API"
+@@ -466,7 +465,6 @@
+ access="protected"
+ author="false"
+ version="false"
+- link="${javadoc.links}"
+ overview="${source.test}/org/apache/commons/collections/overview.html"
+ doctitle="${tf.title} ${tf.version} API;"
+ windowtitle="${tf.title} ${tf.version} API"
Added: trunk/libcommons-collections3-java/debian/patches/series
===================================================================
--- trunk/libcommons-collections3-java/debian/patches/series (rev 0)
+++ trunk/libcommons-collections3-java/debian/patches/series 2008-01-16 05:23:19 UTC (rev 5459)
@@ -0,0 +1 @@
+disable_links.diff
Modified: trunk/libcommons-collections3-java/debian/rules
===================================================================
--- trunk/libcommons-collections3-java/debian/rules 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/rules 2008-01-16 05:23:19 UTC (rev 5459)
@@ -1,22 +1,28 @@
#!/usr/bin/make -f
# debian/rules file for libcommons-collections3-java (uses cdbs)
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -\d' ' | cut -f1 -d- )
-TOOLS_SRCDIR := tools
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
DEB_ANT_BUILD_TARGET := jar tf.jar javadoc
-install/libcommons-collections3-java::
- install -m 644 $(DEB_SRCDIR)/build/commons-collections-3.1.jar debian/libcommons-collections3-java/usr/share/java/commons-collections3-3.1.jar
- install -m 644 $(DEB_SRCDIR)/build/commons-collections-testframework-3.1.jar debian/libcommons-collections3-java/usr/share/java/commons-collections3-testframework-3.1.jar
-
clean::
rm -f debian/files
rm -f TEST-*
+
+install/libcommons-collections3-java::
+ install -D -m644 $(DEB_SRCDIR)/build/commons-collections-[0-9]*.jar \
+ debian/libcommons-collections3-java/usr/share/java/commons-collections3-$(DEB_UPSTREAM_VERSION).jar
+ install -D -m644 $(DEB_SRCDIR)/build/commons-collections-testframework-[0-9]*.jar \
+ debian/libcommons-collections3-java/usr/share/java/commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar
+ dh_link /usr/share/java/commons-collections3-$(DEB_UPSTREAM_VERSION).jar \
+ /usr/share/java/commons-collections3.jar
+ dh_link /usr/share/java//commons-collections3-testframework-$(DEB_UPSTREAM_VERSION).jar \
+ /usr/share/java//commons-collections3-testframework.jar
+
+get-orig-source:
+ -uscan --upstream-version 0 --rename
Modified: trunk/libcommons-collections3-java/debian/watch
===================================================================
--- trunk/libcommons-collections3-java/debian/watch 2008-01-15 14:52:59 UTC (rev 5458)
+++ trunk/libcommons-collections3-java/debian/watch 2008-01-16 05:23:19 UTC (rev 5459)
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/commons/collections/source/ commons-collections-([\d\.]+)-src.tar.gz
+http://www.apache.org/dist/commons/collections/source/ commons-collections-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list