[SCM] Animal Sniffer Debian packaging branch, master, updated. debian/1.7-1-3-gd071264

2012-01-07 Thread Damien Raude-Morvan
The following commit has been merged in the master branch:
commit 8d17d392c2d4604065ac247af0e3cc48829c3e9e
Author: Damien Raude-Morvan draz...@debian.org
Date:   Sun Jan 8 01:36:01 2012 +0100

Fix typo in package description targetting - targeting.

diff --git a/debian/changelog b/debian/changelog
index 6edb573..1ebc1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ animal-sniffer (1.7-2) unstable; urgency=low
   (Thanks to James Page) (Closes: #643491).
 - Add libmaven-install-plugin-java to Build-Depends-Indep; Needed for above
   FTBFS fix.
+  * Fix typo in package description.
 
- -- Damien Raude-Morvan draz...@debian.org  Sun, 08 Jan 2012 01:25:29 +0100
+ -- Damien Raude-Morvan draz...@debian.org  Sun, 08 Jan 2012 02:03:15 +0100
 
 animal-sniffer (1.7-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d7e9a73..04ce9b0 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Description: JDK/API verification tools
  Animal Sniffer Annotations provides Java 1.5+ annotations which allow marking
  methods which Animal Sniffer should ignore signature violations of. Animal
  Sniffer is designed to detect when you have used classes/methods/fields which
- are not part of the JRE that you are targetting. There are certain situations
- when you might be compiling with a newer JDK than the JRE you are targetting.
+ are not part of the JRE that you are targeting. There are certain situations
+ when you might be compiling with a newer JDK than the JRE you are targeting.
  .  
  The Animal Sniffer ANT Tasks can be used to build signatures of APIs and to
  check your classes against previously generated signatures.  
diff --git a/debian/copyright b/debian/copyright
index fbd31e4..e67b949 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,19 +16,19 @@ License: Apache-2.0
 
 License: MIT
  The MIT License
- 
+ .
  Copyright (c) 2008,2009 Kohsuke Kawaguchi, codehaus.org, Stephen Connolly
- 
+ .
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the Software), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+ .
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+ .
  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-- 
Animal Sniffer Debian packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] Animal Sniffer Debian packaging branch, master, updated. debian/1.7-1-3-gd071264

2012-01-07 Thread Damien Raude-Morvan
The following commit has been merged in the master branch:
commit d07126497c4e6fba7dfb65d038856f114437551b
Author: Damien Raude-Morvan draz...@debian.org
Date:   Sun Jan 8 02:04:53 2012 +0100

Update d/copyright to latest DEP5 format.

diff --git a/debian/changelog b/debian/changelog
index 1ebc1bc..afd5526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ animal-sniffer (1.7-2) unstable; urgency=low
 - Add libmaven-install-plugin-java to Build-Depends-Indep; Needed for above
   FTBFS fix.
   * Fix typo in package description.
+  * Update d/copyright to latest DEP5 format.
 
- -- Damien Raude-Morvan draz...@debian.org  Sun, 08 Jan 2012 02:03:15 +0100
+ -- Damien Raude-Morvan draz...@debian.org  Sun, 08 Jan 2012 02:04:44 +0100
 
 animal-sniffer (1.7-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index e67b949..266f625 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Animal Sniffer
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Animal Sniffer
 Source: http://mojo.codehaus.org/animal-sniffer/animal-sniffer/
 
 Files: *

-- 
Animal Sniffer Debian packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] Animal Sniffer Debian packaging branch, master, updated. debian/1.7-1-3-gd071264

2012-01-07 Thread Damien Raude-Morvan
The following commit has been merged in the master branch:
commit 2dde07b304df698151a55c3f473c21f073602cec
Author: Damien Raude-Morvan draz...@debian.org
Date:   Sun Jan 8 01:27:25 2012 +0100

Team upload.

* Team upload.
* Merge fixes FTBFS with no network proposed by Micah Gersten:
  - Add a maven build target of install so that jars are deployed
into the local maven repository during the build process
(Thanks to James Page) (Closes: #643491).
  - Add libmaven-install-plugin-java to Build-Depends-Indep; Needed for 
above
FTBFS fix.

diff --git a/debian/changelog b/debian/changelog
index edae09f..6edb573 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+animal-sniffer (1.7-2) unstable; urgency=low
+
+  * Team upload.
+  * Merge fixes FTBFS with no network proposed by Micah Gersten:
+- Add a maven build target of install so that jars are deployed
+  into the local maven repository during the build process
+  (Thanks to James Page) (Closes: #643491).
+- Add libmaven-install-plugin-java to Build-Depends-Indep; Needed for above
+  FTBFS fix.
+
+ -- Damien Raude-Morvan draz...@debian.org  Sun, 08 Jan 2012 01:25:29 +0100
+
 animal-sniffer (1.7-1) unstable; urgency=low
 
   * Initial release. (Closes: #621871)
diff --git a/debian/control b/debian/control
index 7520738..d7e9a73 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (= 7), cdbs, default-jdk, 
maven-debian-helper (= 1.4)
 Build-Depends-Indep: libasm3-java, junit, default-jdk-doc,
  libmaven-javadoc-plugin-java, libmaven-enforcer-plugin-java,
  libmaven-invoker-plugin-java, libmaven-common-artifact-filters-java,
- libbuild-helper-maven-plugin-java, libmaven-shade-plugin-java, 
libmaven-plugin-tools-java
+ libbuild-helper-maven-plugin-java, libmaven-shade-plugin-java, 
libmaven-plugin-tools-java, libmaven-install-plugin-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/animal-sniffer.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/animal-sniffer.git;a=summary
diff --git a/debian/rules b/debian/rules
index b457cb5..0a055a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ include /usr/share/cdbs/1/class/maven.mk
 #  mh_installjar -plib$(PACKAGE)-java -l pom.xml 
target/$(PACKAGE)-$(VERSION).jar 
 
 DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
+DEB_MAVEN_BUILD_TARGET := install
 
 clean::
mh_clean

-- 
Animal Sniffer Debian packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits