The following commit has been merged in the master branch:
commit 6d38a6bdfa81adbb91eb45d2ff5e17006cf91a2f
Author: Wolodja Wentland <deb...@babilen5.org>
Date: Wed Mar 28 16:10:28 2012 +0100
Debian release 1.7.1-1
* Rebase patches against 1.7.1
* debian/control: Standards-Version 3.9.3
* debian/copyright: adopt copyright-format 1.0
diff --git a/debian/changelog b/debian/changelog
index 26b20da..df27d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+leiningen (1.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version 3.9.3
+ * Format 1.0 for debian/copyright
+
+ -- Wolodja Wentland <deb...@babilen5.org> Wed, 28 Mar 2012 15:12:45 +0000
+
leiningen (1.7.0-1) unstable; urgency=low
* New upstream version
diff --git a/debian/control b/debian/control
index 73bcbd0..b742e1c 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends:
openjdk-6-jdk,
rlwrap,
zip
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: https://github.com/technomancy/leiningen
Vcs-Git: git://git.debian.org/pkg-java/leiningen.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/leiningen.git
diff --git a/debian/copyright b/debian/copyright
index 7cb0fe0..a7722f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: leiningen
Upstream-Contact: Phil Hagelberg
Source: https://github.com/technomancy/leiningen
diff --git a/debian/patches/0002-Lein-upgrade-message.patch
b/debian/patches/0002-Lein-upgrade-message.patch
index 565e440..f32002a 100644
--- a/debian/patches/0002-Lein-upgrade-message.patch
+++ b/debian/patches/0002-Lein-upgrade-message.patch
@@ -1,21 +1,20 @@
-From: Wolodja Wentland <babi...@gmail.com>
-Date: Thu, 6 Oct 2011 16:02:21 +0100
+From: Wolodja Wentland <deb...@babilen5.org>
+Date: Wed, 28 Mar 2012 16:07:36 +0100
Subject: Lein upgrade message
---
- src/leiningen/upgrade.clj | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ src/leiningen/upgrade.clj | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/leiningen/upgrade.clj b/src/leiningen/upgrade.clj
-index c2dd189..05d41df 100644
+index 32e9330..ff5fc9d 100644
--- a/src/leiningen/upgrade.clj
+++ b/src/leiningen/upgrade.clj
-@@ -1,5 +1,8 @@
- (ns leiningen.upgrade
- "Upgrade Leiningen to the latest stable release.")
+@@ -3,5 +3,5 @@
-+(defn upgrade []
-+ (println "Upgrades should be done using apt rather than Leiningen itself."))
-+
;; This file is only a placeholder. The real upgrade
;; implementation can be found in the 'lein' script.
+-
+-(defn upgrade ([]) ([target-version]))
++(defn upgrade []
++ (println "Upgrades should be done using apt rather than Leiningen itself."))
diff --git a/debian/patches/0003-Disable-dependency-download.patch
b/debian/patches/0003-Disable-dependency-download.patch
index fa7fbc7..6ff1201 100644
--- a/debian/patches/0003-Disable-dependency-download.patch
+++ b/debian/patches/0003-Disable-dependency-download.patch
@@ -1,5 +1,5 @@
From: Wolodja Wentland <deb...@babilen5.org>
-Date: Fri, 17 Feb 2012 12:39:49 +0000
+Date: Wed, 28 Mar 2012 16:08:08 +0100
Subject: Disable dependency download
---
@@ -7,7 +7,7 @@ Subject: Disable dependency download
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/project.clj b/project.clj
-index d2f9f95..f9de2e1 100644
+index 229c8b8..97139fb 100644
--- a/project.clj
+++ b/project.clj
@@ -6,13 +6,6 @@
--
leiningen 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
