Merge lp:~ari-tczew/ubuntu/maverick/geronimo-ejb-3.0-spec/lp-512430 into lp:ubuntu/maverick/geronimo-ejb-3.0-spec

Proposed by Artur Rona
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~ari-tczew/ubuntu/maverick/geronimo-ejb-3.0-spec/lp-512430
Merge into: lp:ubuntu/maverick/geronimo-ejb-3.0-spec
Diff against target: 78 lines (+43/-1)
4 files modified
debian/changelog (+12/-0)
debian/control (+11/-1)
debian/orig-tar.sh (+18/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/maverick/geronimo-ejb-3.0-spec/lp-512430
Reviewer Review Type Date Requested Status
Thierry Carrez (community) Approve
Review via email: mp+25857@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

Looks good, I'll upload.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-07-27 11:09:22 +0000
3+++ debian/changelog 2010-05-23 20:29:21 +0000
4@@ -1,3 +1,15 @@
5+geronimo-ejb-3.0-spec (1.0.1-1fakesync1) maverick; urgency=low
6+
7+ * Fake sync due to mismatching tarball (LP: #512430).
8+
9+ -- Artur Rona <ari-tczew@tlen.pl> Sun, 23 May 2010 22:12:21 +0200
10+
11+geronimo-ejb-3.0-spec (1.0.1-1) unstable; urgency=low
12+
13+ * Port package to pkg-java based largely on existing Ubuntu package
14+
15+ -- Chris Grzegorczyk <grze@eucalyptus.com> Wed, 16 Dec 2009 21:47:07 -0800
16+
17 geronimo-ejb-3.0-spec (1.0.1-0ubuntu1) karmic; urgency=low
18
19 * Initial release. New Eucalyptus dependency.
20
21=== modified file 'debian/control'
22--- debian/control 2009-07-27 11:09:22 +0000
23+++ debian/control 2010-05-23 20:29:21 +0000
24@@ -2,13 +2,23 @@
25 Section: java
26 Priority: optional
27 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28+XSBC-Original-Maintainer: Chris Grzegorczyk <grze@eucalyptus.com>
29+DM-Upload-Allowed: yes
30+Uploaders: Graziano Obertelli <graziano@eucalyptus.com>, Kyo Lee <kyo.lee@eucalyptus.com>
31 Build-Depends-Indep: default-jdk, libgeronimo-jta-1.0.1b-spec-java
32 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
33-Standards-Version: 3.8.2
34+Standards-Version: 3.8.3
35+Homepage: http://geronimo.apache.org
36
37 Package: libgeronimo-ejb-3.0-spec-java
38 Architecture: all
39 Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
40 Description: Geronimo API implementation of the EJB 3.0 spec
41+ The goal of the Geronimo project is to produce a server runtime framework
42+ that pulls together the best Open Source alternatives to create runtimes
43+ that meet the needs of developers and system administrators. Its most
44+ popular distribution is a fully certified Java EE 5 application server
45+ runtime.
46+ .
47 Geronimo API implementation of the EJB 3.0 spec (javax.ejb classes)
48
49
50=== added file 'debian/orig-tar.sh'
51--- debian/orig-tar.sh 1970-01-01 00:00:00 +0000
52+++ debian/orig-tar.sh 2010-05-23 20:29:21 +0000
53@@ -0,0 +1,18 @@
54+#!/bin/sh -e
55+
56+# $1 = version
57+TAR=../geronimo-ejb-3.0-spec_$2.orig.tar.gz
58+DIR=libgeronimo-ejb-3.0-spec-java-$2.orig
59+
60+# clean up the upstream tarball
61+svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ejb_3.0_spec-$2/ $DIR
62+GZIP=--best tar -c -z -f $TAR $DIR
63+rm -rf $DIR
64+rm ../geronimo-ejb_3.0_spec-$2
65+
66+# move to directory 'tarballs'
67+if [ -r .svn/deb-layout ]; then
68+ . .svn/deb-layout
69+ mv $TAR $origDir
70+ echo "moved $TAR to $origDir"
71+fi
72
73=== added file 'debian/watch'
74--- debian/watch 1970-01-01 00:00:00 +0000
75+++ debian/watch 2010-05-23 20:29:21 +0000
76@@ -0,0 +1,2 @@
77+version=3
78+http://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-ejb_3.0_spec-([0-9].*)/ debian debian/orig-tar.sh

Subscribers

People subscribed via source and target branches

to all changes: