[guice] branch master updated (bd6a3c3 -> 385c158)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch master
in repository guice.

  discards  bd6a3c3   Fixed the versions of ASM and CGLIB in the installed guice pom
       new  636a49a   Build with maven-debian-helper
       new  af7bc4f   Added the Built-Using field with the versions of ASM and CGLIB used
       new  385c158   Upload to unstable

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (bd6a3c3)
            \
             N -- N -- N   refs/heads/master (385c158)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                             |  9 +++---
 debian/control                               | 20 ++++++------
 debian/libguice-java-doc.doc-base            |  9 ++++++
 debian/libguice-java-doc.install             |  2 ++
 debian/libguice-java-doc.javadoc             |  1 -
 debian/libguice-java.poms                    | 27 ++++++++++------
 debian/maven.ignoreRules                     | 12 +++++++
 debian/maven.properties                      |  5 +++
 debian/maven.rules                           |  2 +-
 debian/patches/01_fix_build.diff             | 23 --------------
 debian/patches/02_link_javadocs.diff         | 16 ----------
 debian/patches/03-maven2-compatibility.patch | 14 +++++++++
 debian/patches/series                        |  3 +-
 debian/rules                                 | 47 ++++------------------------
 14 files changed, 80 insertions(+), 110 deletions(-)
 create mode 100644 debian/libguice-java-doc.doc-base
 create mode 100644 debian/libguice-java-doc.install
 delete mode 100644 debian/libguice-java-doc.javadoc
 create mode 100644 debian/maven.ignoreRules
 create mode 100644 debian/maven.properties
 delete mode 100644 debian/patches/01_fix_build.diff
 delete mode 100644 debian/patches/02_link_javadocs.diff
 create mode 100644 debian/patches/03-maven2-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git