Ubuntu
solr package

Merge lp:~james-page/ubuntu/oneiric/solr/universe-housekeeping into lp:ubuntu/oneiric/solr

  1. Oneiric (11.10)
  2. universe-housekeeping
  3. Merge into oneiric
Proposed by James Page
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/oneiric/solr/universe-housekeeping
Merge into: lp:ubuntu/oneiric/solr
Diff against target: 63 lines (+15/-4)
4 files modified
debian/ant.properties (+1/-1)
debian/changelog (+11/-0)
debian/control (+2/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~james-page/ubuntu/oneiric/solr/universe-housekeeping
Reviewer Review Type Date Requested Status
Matthias Klose Approve
Review via email: mp+74801@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/ant.properties'
2--- debian/ant.properties 2010-12-01 14:18:31 +0000
3+++ debian/ant.properties 2011-09-09 14:30:32 +0000
4@@ -8,4 +8,4 @@
5 compile.debug=on
6 compile.optimize=on
7 ant.library.dir=/usr/share/ant/lib
8-lucene_version=2.9.3
9+lucene_version=2.9.4
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2010-12-07 11:11:16 +0000
13+++ debian/changelog 2011-09-09 14:30:32 +0000
14@@ -1,3 +1,14 @@
15+solr (1.4.1+dfsg1-2ubuntu2) oneiric; urgency=low
16+
17+ * Update to support removal of libcommons-fileupload-java-universe from
18+ archive (LP: #845541):
19+ - debian/control: Drop references to libcommons-fileupload-java-universe.
20+ * Fix misc FTBFS:
21+ - debian/ant.properties: Upgrade lucene2 2.9.3 -> 2.9.4
22+ - debian/rules: Update call to ant to use debian/ant.properties
23+
24+ -- James Page <james.page@ubuntu.com> Fri, 09 Sep 2011 13:13:57 +0100
25+
26 solr (1.4.1+dfsg1-2ubuntu1) natty; urgency=low
27
28 * Merge from debian unstable. Remaining changes:
29
30=== modified file 'debian/control'
31--- debian/control 2010-12-07 11:11:16 +0000
32+++ debian/control 2011-09-09 14:30:32 +0000
33@@ -14,7 +14,7 @@
34 ant (>= 1.7.0), ant-optional (>= 1.7.0),
35 libcommons-codec-java (>= 1.4),
36 libcommons-csv-java (>= 0.1-SNAPSHOT+svn678580),
37- libcommons-fileupload-java-universe | libcommons-fileupload-java (>= 1.2.1),
38+ libcommons-fileupload-java (>= 1.2.1),
39 libcommons-httpclient-java (>= 3.1),
40 libcommons-io-java (>= 1.4),
41 libjaxp1.3-java (>= 1.3.04),
42@@ -34,7 +34,7 @@
43 openjdk-6-jre-headless | java5-runtime-headless | java6-runtime-headless,
44 libcommons-codec-java (>= 1.4),
45 libcommons-csv-java (>= 0.1-SNAPSHOT+svn678580),
46- libcommons-fileupload-java-universe | libcommons-fileupload-java (>= 1.2.1),
47+ libcommons-fileupload-java (>= 1.2.1),
48 libcommons-httpclient-java (>= 3.1),
49 libcommons-io-java (>= 1.4),
50 libjaxp1.3-java (>= 1.3.05-1),
51
52=== modified file 'debian/rules'
53--- debian/rules 2010-12-03 19:10:10 +0000
54+++ debian/rules 2011-09-09 14:30:32 +0000
55@@ -6,7 +6,7 @@
56 dh $@
57
58 override_dh_auto_build:
59- ant -Dversion=1.4.1 init-forrest-entities dist-solrj dist-jar dist-contrib compile make-manifest
60+ ant -Dversion=1.4.1 -propertyfile debian/ant.properties init-forrest-entities dist-solrj dist-jar dist-contrib compile make-manifest
61
62
63 ##!/usr/bin/make -f

Subscribers

People subscribed via source and target branches

to all changes: