The following commit has been merged in the master branch:
commit 1c47c158d3b3ffb559afdd0afc01cbf85af049c7
Author: James Page james.p...@canonical.com
Date: Tue Nov 1 21:18:51 2011 +
Updated version of stapler plugin to 1.16
diff --git a/debian/maven.rules b/debian/maven.rules
index
The following commit has been merged in the master branch:
commit d7cac52bb435d2877db25a1162a9d7d37674ed6e
Author: James Page james.p...@canonical.com
Date: Mon Nov 28 08:07:25 2011 +
Added missing dependency
diff --git a/debian/control b/debian/control
index e51dc5c..9df0066 100644
The following commit has been merged in the master branch:
commit e778582d60480bd976c5f868b0b7f3d1f4f4f132
Author: James Page james.p...@canonical.com
Date: Mon Nov 28 08:11:27 2011 +
Added backported patch to fix annotation processing
diff --git a/debian/patches/apt-to-jsr-269.patch
The following commit has been merged in the master branch:
commit 13f1618ea3dbcef6732f9c007a4b663866e30d6c
Author: James Page james.p...@canonical.com
Date: Mon Nov 28 08:33:57 2011 +
Reverted part of patch for apt processing
diff --git a/debian/patches/apt-to-jsr-269.patch
The following commit has been merged in the master branch:
commit 53aedbf786f269d376f260599216f83724921df4
Merge: d183112f995950557348c7505ece510e72d49bad
777ad27871e1c1386219dcc29012a5c5708e4c00
Author: James Page james.p...@canonical.com
Date: Mon Jan 9 22:47:30 2012 +0100
Merge commit
The following commit has been merged in the master branch:
commit bc7d31c95bc1b2c541abd82a8477da465eb2c9bb
Author: James Page james.p...@canonical.com
Date: Mon Nov 28 08:12:30 2011 +
Added extra ignore rule during clean phase
diff --git a/debian/maven.cleanIgnoreRules
The following commit has been merged in the master branch:
commit d183112f995950557348c7505ece510e72d49bad
Author: James Page james.p...@canonical.com
Date: Fri Jan 6 16:46:28 2012 +
Minor tweaks for build diagnosis
diff --git a/debian/maven.properties b/debian/maven.properties
index
The following commit has been merged in the master branch:
commit deac76db818aa9e8aae378bcdd76a5c28c85cb19
Author: James Page james.p...@ubuntu.com
Date: Wed Jan 25 10:42:44 2012 +
Removed surplus overrides
diff --git a/debian/libmaven-hpi-plugin-java.lintian-overrides
The following commit has been merged in the master branch:
commit d638f87b59adf129443293b3a2c36efd12adfb32
Author: James Page james.p...@canonical.com
Date: Mon Jan 9 22:55:04 2012 +0100
Added new dependency on sezpoz
diff --git a/debian/control b/debian/control
index 9df0066..cbad347
The following commit has been merged in the master branch:
commit defb9e5bc74b8808b6146b64cadcf6494f8a93e9
Author: James Page james.p...@canonical.com
Date: Mon Jan 9 22:51:21 2012 +0100
Updates for new upstream release
diff --git a/debian/changelog b/debian/changelog
index
The following commit has been merged in the master branch:
commit e0d68637c557e0b906c877f8bddecedf4c5efb66
Author: James Page james.p...@ubuntu.com
Date: Wed Jan 25 10:38:28 2012 +
Tidied maven.rules
diff --git a/debian/maven.rules b/debian/maven.rules
index 20af469..60c25f4 100644
---
The following commit has been merged in the master branch:
commit 8bd37568a9c2577d19a980339565310658482ece
Author: James Page james.p...@ubuntu.com
Date: Wed Jan 25 10:34:52 2012 +
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 22aa37a..d77e20b 100644
---
12 matches
Mail list logo
