[SCM] stapler-adjunct-codemirror packaging branch, master, updated. upstream/1.1-3-ge9a4a4a

[James Page]

The following commit has been merged in the master branch:
commit e9a4a4ac190e9a36f38ea760cd1478fec9a5e10c
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 25 10:04:43 2012 +0000

    Tidy before RFS

diff --git a/debian/README.source b/debian/README.source
index 7721813..bef0693 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -7,3 +7,8 @@ from the maven-debian-helper package.
 The build system uses Maven but prevents it from downloading
 anything from the Internet, making the build compliant with
 the Debian policy.
+
+Note that this package is a re-packaging of the codemirror 
+Javascript library (not-yet-packaged) with a set of patches
+for integration with the Stapler HTTP request processing 
+library.
diff --git a/debian/changelog b/debian/changelog
index 819791a..e14af81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ stapler-adjunct-codemirror (1.1-1) unstable; urgency=low
 
   * Initial release (Closes: #655723).
 
- -- James Page <james.page at ubuntu.com>  Tue, 28 Jun 2011 15:51:48 +0100
+ -- James Page <james.page at ubuntu.com>  Wed, 25 Jan 2012 10:03:15 +0000
diff --git a/debian/control b/debian/control
index 2ef9d2c..2d0973a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,8 @@ Uploaders: James Page <james.page at ubuntu.com>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
- libmaven-javadoc-plugin-java,
  libservlet2.5-java,
- libstapler-java,
- libstapler-java-doc
+ libstapler-java
 Standards-Version: 3.9.2
 Homepage: http://stapler.java.net
 Vcs-Git: git://git.debian.org/git/pkg-java/stapler-adjunct-codemirror.git
@@ -19,7 +17,7 @@ Package: libstapler-adjunct-codemirror-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
-Description: Codemirror library for use with stapler
+Description: Codemirror JS library for use with stapler
  This library provides a JavaScript based codemirror visualisation
  component for embedding in web applications using the stapler
  HTTP request handling engine.
diff --git a/debian/copyright b/debian/copyright
index 463bf35..9e99c43 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,10 @@
 Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: Stapler Timeline
+Upstream-Name: Stapler Codemirror
 Source: http://stapler.java.net
+Description: None of the source .js files contain headers;
+ however the pom.xml in the root of the orig.tar.gz clearly
+ identifies the licensing for the entire project with a link
+ to the codemirror website for the full license text.
 
 Files: *
 Copyright: 2011 by Marijn Haverbeke <marijnh at gmail.com>

-- 
stapler-adjunct-codemirror packaging