Merge lp:~james-page/ubuntu/oneiric/libstruts1.2-java/universe-housekeeping into lp:ubuntu/oneiric/libstruts1.2-java

Proposed by James Page
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/oneiric/libstruts1.2-java/universe-housekeeping
Merge into: lp:ubuntu/oneiric/libstruts1.2-java
Diff against target: 42 lines (+14/-3)
2 files modified
debian/changelog (+10/-0)
debian/control (+4/-3)
To merge this branch: bzr merge lp:~james-page/ubuntu/oneiric/libstruts1.2-java/universe-housekeeping
Reviewer Review Type Date Requested Status
Matthias Klose Approve
Review via email: mp+74802@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthias Klose (doko) wrote :

thanks, looks fine

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 2011-04-09 23:59:32 +0000
3+++ debian/changelog 2011-09-09 14:30:33 +0000
4@@ -1,3 +1,13 @@
5+libstruts1.2-java (1.2.9-4ubuntu3) oneiric; urgency=low
6+
7+ * Update to support removal of libcommons-fileupload-java-universe from
8+ archive (LP: #845541):
9+ - debian/control: Drop references to libcommons-fileupload-java-universe.
10+ * Switch back to using ant instead of ant1.7 as ant >= 1.8.2
11+ resolves FTBFS.
12+
13+ -- James Page <james.page@ubuntu.com> Fri, 09 Sep 2011 13:04:41 +0100
14+
15 libstruts1.2-java (1.2.9-4ubuntu2) natty; urgency=low
16
17 * Build-depend on ant1.7 instead of ant.
18
19=== modified file 'debian/control'
20--- debian/control 2011-04-09 23:59:32 +0000
21+++ debian/control 2011-09-09 14:30:33 +0000
22@@ -1,16 +1,17 @@
23 Source: libstruts1.2-java
24 Section: java
25 Priority: optional
26-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
27+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
29 Uploaders: Arnaud Vandyck <avdyk@debian.org>, Stefan Gybas <sgybas@debian.org>, Michael Koch <konqueror@gmx.de>
30-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk, ant1.7, ant1.7-optional, libxerces2-java, libxalan2-java, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java-universe | libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java, antlr
31+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk, ant, ant-optional, libxerces2-java, libxalan2-java, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java, antlr
32 Standards-Version: 3.8.4
33 Homepage: http://struts.apache.org/
34
35 Package: libstruts1.2-java
36 Architecture: all
37 Priority: optional
38-Depends: ${misc:Depends}, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java-universe | libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java
39+Depends: ${misc:Depends}, libcommons-beanutils-java (>= 1.7.0), libcommons-digester-java (>= 1.7), libcommons-fileupload-java (>= 1.0), libcommons-logging-java, libcommons-validator-java (>= 1.1.4), liboro-java, libservlet2.5-java
40 Description: Java Framework for MVC web applications
41 The core of the Struts framework is a flexible control layer based on standard
42 technologies like Servlets, JavaBeans, ResourceBundles, and Extensible

Subscribers

People subscribed via source and target branches

to all changes: