[SCM] UNNAMED PROJECT branch, master, updated. 86b208426a0aa104080d52a6f7b931149a6fc608

Miguel Landaeta miguel at miguel.cc
Sat Oct 22 19:10:22 UTC 2011


The following commit has been merged in the master branch:
commit 86b208426a0aa104080d52a6f7b931149a6fc608
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sat Oct 22 14:40:05 2011 -0430

    Add Build-Depends on libmaven-plugin-tools-java and other fixes
    
    * Team upload.
    * Add Build-Depends on libmaven-plugin-tools-java. (Closes: #643497).
    * Bump Standards-Version to 3.9.2. No changes were required.
    * Remove unneccesary patch.
    * Remove unneccesary Build-Depends on quilt.
    * Switch to source format 3.0 (quilt).

diff --git a/debian/changelog b/debian/changelog
index 2d94e1a..b870724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+clojure-maven-plugin (1.3.3-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add Build-Depends on libmaven-plugin-tools-java. (Closes: #643497).
+  * Bump Standards-Version to 3.9.2. No changes were required.
+  * Remove unneccesary patch.
+  * Remove unneccesary Build-Depends on quilt.
+  * Switch to source format 3.0 (quilt).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sat, 22 Oct 2011 14:25:17 -0430
+
 clojure-maven-plugin (1.3.3-2) unstable; urgency=low
 
   * debian/control, debian/maven.ignoreRules: use m-r-h 1.2 maven rules
diff --git a/debian/control b/debian/control
index f9e2c73..35d40c1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Peter Collingbourne <peter at pcc.me.uk>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk, maven-debian-helper (>= 1.1)
-Build-Depends-Indep: libmaven2-core-java, libcommons-exec-java, libcommons-io-java, libcommons-lang-java, libplexus-utils-java
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.1)
+Build-Depends-Indep: libmaven2-core-java, libcommons-exec-java, libcommons-io-java, libcommons-lang-java, libplexus-utils-java, libmaven-plugin-tools-java
+Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Browser: http://git.debian.org/?p=pkg-java/clojure-maven-plugin.git
 Vcs-Git: git://git.debian.org/git/pkg-java/clojure-maven-plugin.git
diff --git a/debian/patches/01-pom-plexus-utils.patch b/debian/patches/01-pom-plexus-utils.patch
deleted file mode 160000
index 4795760..0000000
--- a/debian/patches/01-pom-plexus-utils.patch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4795760a415669eb486c4a227bb54f3e6280363d
diff --git a/debian/patches/01-pom-plexus-utils.patch.info b/debian/patches/01-pom-plexus-utils.patch.info
deleted file mode 100644
index c014836..0000000
--- a/debian/patches/01-pom-plexus-utils.patch.info
+++ /dev/null
@@ -1,4 +0,0 @@
-Add an explicit dependency on plexus-utils.  Required to prevent maven
-from automatically substituting an older version of the package as
-a dependency.
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e07bb84..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-pom-plexus-utils.patch
diff --git a/debian/rules b/debian/rules
index 33fb9b0..da4b3af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 DEB_PATCHPOMS_ARGS := -idebian/maven.ignoreRules
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
UNNAMED PROJECT



More information about the pkg-java-commits mailing list