Merge lp:~ari-tczew/ubuntu/maverick/geronimo-jacc-1.1-spec/lp-512430 into lp:ubuntu/maverick/geronimo-jacc-1.1-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-jacc-1.1-spec/lp-512430
Merge into: lp:ubuntu/maverick/geronimo-jacc-1.1-spec
Diff against target: 80 lines (+45/-2)
4 files modified
debian/changelog (+12/-0)
debian/control (+13/-2)
debian/orig-tar.sh (+18/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/maverick/geronimo-jacc-1.1-spec/lp-512430
Reviewer Review Type Date Requested Status
Thierry Carrez (community) Approve
Review via email: mp+25858@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-08-26 12:34:44 +0000
3+++ debian/changelog 2010-05-23 20:34:22 +0000
4@@ -1,3 +1,15 @@
5+geronimo-jacc-1.1-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:29:37 +0200
10+
11+geronimo-jacc-1.1-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:49:27 -0800
16+
17 geronimo-jacc-1.1-spec (1.0.1-0ubuntu2) karmic; urgency=low
18
19 * debian/build.xml, debian/rules: Enable test suite
20
21=== modified file 'debian/control'
22--- debian/control 2009-08-26 12:34:44 +0000
23+++ debian/control 2010-05-23 20:34:22 +0000
24@@ -2,13 +2,24 @@
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, libservlet2.5-java, junit
32 Build-Depends: ant-optional, 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-jacc-1.1-spec-java
38 Architecture: all
39 Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
40 Description: Geronimo API implementation of the JACC 1.1 spec
41- Geronimo API implementation of the JACC 1.1 spec (javax.security.jacc classes)
42+ The goal of the Geronimo project is to produce a server runtime framework
43+ that pulls together the best Open Source alternatives to create runtimes
44+ that meet the needs of developers and system administrators. Our most
45+ popular distribution is a fully certified Java EE 5 application server
46+ runtime.
47+ .
48+ This package offers the Geronimo API implementation of the JACC 1.1 spec
49+ (javax.security.jacc classes).
50
51
52=== added file 'debian/orig-tar.sh'
53--- debian/orig-tar.sh 1970-01-01 00:00:00 +0000
54+++ debian/orig-tar.sh 2010-05-23 20:34:22 +0000
55@@ -0,0 +1,18 @@
56+#!/bin/sh -e
57+
58+# $1 = version
59+TAR=../geronimo-jacc-1.1-spec_$2.orig.tar.gz
60+DIR=libgeronimo-jacc-1.1-spec-java-$2.orig
61+
62+# clean up the upstream tarball
63+svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jacc_1.1_spec-$2/ $DIR
64+GZIP=--best tar -c -z -f $TAR $DIR
65+rm -rf $DIR
66+rm ../geronimo-jacc_1.1_spec-$2
67+
68+# move to directory 'tarballs'
69+if [ -r .svn/deb-layout ]; then
70+ . .svn/deb-layout
71+ mv $TAR $origDir
72+ echo "moved $TAR to $origDir"
73+fi
74
75=== added file 'debian/watch'
76--- debian/watch 1970-01-01 00:00:00 +0000
77+++ debian/watch 2010-05-23 20:34:22 +0000
78@@ -0,0 +1,2 @@
79+version=3
80+http://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-jacc_1.1_spec-([0-9].*)/ debian debian/orig-tar.sh

Subscribers

People subscribed via source and target branches

to all changes: