Merge lp:~ari-tczew/ubuntu/maverick/geronimo-jms-1.1-spec/lp-512430 into lp:ubuntu/maverick/geronimo-jms-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-jms-1.1-spec/lp-512430
Merge into: lp:ubuntu/maverick/geronimo-jms-1.1-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-jms-1.1-spec/lp-512430
Reviewer Review Type Date Requested Status
Thierry Carrez (community) Approve
Review via email: mp+25855@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
=== modified file 'debian/changelog'
--- debian/changelog 2009-08-10 14:03:21 +0000
+++ debian/changelog 2010-05-23 20:18:25 +0000
@@ -1,3 +1,15 @@
1geronimo-jms-1.1-spec (1.1-1fakesync1) maverick; urgency=low
2
3 * Fake sync due to mismatching tarball (LP: #512430).
4
5 -- Artur Rona <ari-tczew@tlen.pl> Sun, 23 May 2010 21:55:02 +0200
6
7geronimo-jms-1.1-spec (1.1-1) unstable; urgency=low
8
9 * Port package to pkg-java based largely on existing Ubuntu package
10
11 -- Chris Grzegorczyk <grze@eucalyptus.com> Wed, 16 Dec 2009 21:50:22 -0800
12
1geronimo-jms-1.1-spec (1.1-0ubuntu2) karmic; urgency=low13geronimo-jms-1.1-spec (1.1-0ubuntu2) karmic; urgency=low
214
3 * debian/rules: Remove unneeded build variables.15 * debian/rules: Remove unneeded build variables.
416
=== modified file 'debian/control'
--- debian/control 2009-08-10 14:03:21 +0000
+++ debian/control 2010-05-23 20:18:25 +0000
@@ -2,13 +2,23 @@
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Chris Grzegorczyk <grze@eucalyptus.com>
6DM-Upload-Allowed: yes
7Uploaders: Graziano Obertelli <graziano@eucalyptus.com>, Kyo Lee <kyo.lee@eucalyptus.com>
5Build-Depends-Indep: default-jdk8Build-Depends-Indep: default-jdk
6Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)9Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
7Standards-Version: 3.8.010Standards-Version: 3.8.3
11Vcs-Svn: http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jms_1.1_spec
812
9Package: libgeronimo-jms-1.1-spec-java13Package: libgeronimo-jms-1.1-spec-java
10Architecture: all14Architecture: all
11Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}15Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends}
12Description: Geronimo API implementation of the JMS 1.1 spec16Description: Geronimo API implementation of the JMS 1.1 spec
17 The goal of the Geronimo project is to produce a server runtime framework
18 that pulls together the best Open Source alternatives to create runtimes
19 that meet the needs of developers and system administrators. Geronimo's
20 most popular distribution is a fully certified Java EE 5 application server
21 runtime.
22 .
13 Geronimo API implementation of the JMS 1.1 spec (javax.jms classes)23 Geronimo API implementation of the JMS 1.1 spec (javax.jms classes)
1424
1525
=== added file 'debian/orig-tar.sh'
--- debian/orig-tar.sh 1970-01-01 00:00:00 +0000
+++ debian/orig-tar.sh 2010-05-23 20:18:25 +0000
@@ -0,0 +1,18 @@
1#!/bin/sh -e
2
3# $1 = version
4TAR=../geronimo-jms-1.1-spec_$2.orig.tar.gz
5DIR=libgeronimo-jms-1.1-spec-java-$2.orig
6
7# clean up the upstream tarball
8svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jms_1.1_spec-$2/ $DIR
9GZIP=--best tar -c -z -f $TAR $DIR
10rm -rf $DIR
11rm ../geronimo-jms_1.1_spec-$2
12
13# move to directory 'tarballs'
14if [ -r .svn/deb-layout ]; then
15 . .svn/deb-layout
16 mv $TAR $origDir
17 echo "moved $TAR to $origDir"
18fi
019
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2010-05-23 20:18:25 +0000
@@ -0,0 +1,2 @@
1version=3
2http://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-jms_1.1_spec-([0-9].*)/ debian debian/orig-tar.sh

Subscribers

People subscribed via source and target branches

to all changes: