[pkg-java] r4182 - trunk/c3p0/debian

varun-guest at alioth.debian.org varun-guest at alioth.debian.org
Sat Sep 15 20:30:02 UTC 2007


Author: varun-guest
Date: 2007-09-15 20:30:02 +0000 (Sat, 15 Sep 2007)
New Revision: 4182

Added:
   trunk/c3p0/debian/README.Debian-source
   trunk/c3p0/debian/orig-tar.sh
Removed:
   trunk/c3p0/debian/README.Debian
   trunk/c3p0/debian/libc3p0-java.dirs
   trunk/c3p0/debian/libc3p0-java.install
   trunk/c3p0/debian/libc3p0-java.links
Modified:
   trunk/c3p0/debian/changelog
   trunk/c3p0/debian/compat
   trunk/c3p0/debian/control
   trunk/c3p0/debian/rules
   trunk/c3p0/debian/watch
Log:
* New upstream release
* Add debian/orig-tar.sh
* debian/rules: implement get-orig-source
* move debian/README.Debian to debian/REAMDE.Debian-source and update the file.
* debian/control: 
  + Add Homepage and Build-Depend on debhelper (>= 5)
  + Add XS-Vcs-{Svn, Browser} headers.
  + Add myself to Uploaders.
* debian/compat: Bump compat to 5
* Remove debian/libc3p0-java.* files and install and link jars in
  debian/rules using DEB_UPSTREAM VERSION.
* Fix the package version, dfsg not required as the changes have been
  documented in debian/README.Debian-source.

Deleted: trunk/c3p0/debian/README.Debian
===================================================================
--- trunk/c3p0/debian/README.Debian	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/README.Debian	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1,10 +0,0 @@
-c3p0
-----
-
-Source tarball:
----------------
-
-I removed all the jar files, the build and dist directory and the
-build.bkup file.
-
- -- Arnaud Vandyck <avdyk at debian.org>, Thu, 29 Mar 2007 14:33:54 +0200

Copied: trunk/c3p0/debian/README.Debian-source (from rev 4181, trunk/c3p0/debian/README.Debian)
===================================================================
--- trunk/c3p0/debian/README.Debian-source	                        (rev 0)
+++ trunk/c3p0/debian/README.Debian-source	2007-09-15 20:30:02 UTC (rev 4182)
@@ -0,0 +1,13 @@
+c3p0
+====
+
+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 <varunhiremath at gmail.com>  Sun, 16 Sep 2007 01:43:56 +0530

Modified: trunk/c3p0/debian/changelog
===================================================================
--- trunk/c3p0/debian/changelog	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/changelog	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1,3 +1,21 @@
+c3p0 (0.9.1.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Add debian/orig-tar.sh
+  * debian/rules: implement get-orig-source
+  * move debian/README.Debian to debian/REAMDE.Debian-source and update the file.
+  * debian/control: 
+    + Add Homepage and Build-Depend on debhelper (>= 5)
+    + Add XS-Vcs-{Svn, Browser} headers.
+    + Add myself to Uploaders.
+  * debian/compat: Bump compat to 5
+  * Remove debian/libc3p0-java.* files and install and link jars in
+    debian/rules using DEB_UPSTREAM VERSION.
+  * Fix the package version, dfsg not required as the changes have been
+    documented in debian/README.Debian-source.
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Sun, 16 Sep 2007 01:45:32 +0530
+
 c3p0 (0.9.1.1.dfsg.1-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/c3p0/debian/compat
===================================================================
--- trunk/c3p0/debian/compat	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/compat	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1 +1 @@
-4
+5

Modified: trunk/c3p0/debian/control
===================================================================
--- trunk/c3p0/debian/control	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/control	2007-09-15 20:30:02 UTC (rev 4182)
@@ -2,10 +2,12 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Varun Hiremath <varunhiremath at gmail.com>
+Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant, liblog4j1.2-java, libmx4j-java
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/c3p0
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/c3p0
 
 Package: libc3p0-java
 Section: libs
@@ -15,6 +17,8 @@
  c3p0 is an easy-to-use library for making traditional JDBC drivers
  "enterprise-ready" by augmenting them with functionality defined by
  the jdbc3 spec and the optional extensions to jdbc2.
+ .
+  Homepage: http://sourceforge.net/projects/c3p0
 
 Package: libc3p0-java-doc
 Section: doc
@@ -26,3 +30,5 @@
  the jdbc3 spec and the optional extensions to jdbc2.
  .
  This package includes the documentation.
+ .
+  Homepage: http://sourceforge.net/projects/c3p0

Deleted: trunk/c3p0/debian/libc3p0-java.dirs
===================================================================
--- trunk/c3p0/debian/libc3p0-java.dirs	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/libc3p0-java.dirs	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1 +0,0 @@
-usr/share/java

Deleted: trunk/c3p0/debian/libc3p0-java.install
===================================================================
--- trunk/c3p0/debian/libc3p0-java.install	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/libc3p0-java.install	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1 +0,0 @@
-build/c3p0-0.9.1.1.jar			/usr/share/java/

Deleted: trunk/c3p0/debian/libc3p0-java.links
===================================================================
--- trunk/c3p0/debian/libc3p0-java.links	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/libc3p0-java.links	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1 +0,0 @@
-/usr/share/java/c3p0-0.9.1.1.jar	/usr/share/java/c3p0.jar

Added: trunk/c3p0/debian/orig-tar.sh
===================================================================
--- trunk/c3p0/debian/orig-tar.sh	                        (rev 0)
+++ trunk/c3p0/debian/orig-tar.sh	2007-09-15 20:30:02 UTC (rev 4182)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=c3p0-$2.orig
+
+# clean up the upstream tarball
+tar zxf $3
+mv c3p0-$2.src $DIR
+GZIP=--best tar czf $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
+
+exit 0


Property changes on: trunk/c3p0/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/c3p0/debian/rules
===================================================================
--- trunk/c3p0/debian/rules	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/rules	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1,17 +1,20 @@
 #!/usr/bin/make -f
 # debian/rules file for c3p0 (uses cdbs)
 
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME := /usr/lib/jvm/java-gcj/
 ANT_HOME := /usr/share/ant
-
 DEB_JARS := log4j1.2 mx4j
 DEB_ANT_BUILD_TARGET := jar javadocs
 
 clean::
 	( cd relproj ; ant clean )
+
+install/libc3p0-java::
+	dh_install build/c3p0*.jar /usr/share/java
+	dh_link /usr/share/java/c3p0-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/c3p0.jar
+
+get-orig-source:
+	-uscan --upstream-version 0 --rename

Modified: trunk/c3p0/debian/watch
===================================================================
--- trunk/c3p0/debian/watch	2007-09-15 19:18:48 UTC (rev 4181)
+++ trunk/c3p0/debian/watch	2007-09-15 20:30:02 UTC (rev 4182)
@@ -1,7 +1,3 @@
-# watch control file for uscan
-version=2
-# Options
-
-# Site Version Script
+version=3
 opts=dversionmangle=s/\.dfsg\.\d+$// \
-  http://heanet.dl.sourceforge.net/sourceforge/c3p0/c3p0-(.*)\.src\.tgz debian uupdate
+  http://heanet.dl.sourceforge.net/sourceforge/c3p0/ c3p0-(.*)\.src\.tgz debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list