The following commit has been merged in the master branch:
commit ebe06d85590e500efb9bcd282a84562f7fdb7d3f
Author: Gabriele Giacone <[email protected]>
Date: Sun Mar 24 21:31:26 2013 +0100
wrap-n-sort.
diff --git a/debian/control b/debian/control
index ed45ef9..b116e2c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,22 @@ Section: editors
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Gabriele Giacone <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.24), ant, ant-optional,
- docbook-xsl, xsltproc, imagemagick, quilt (>= 0.46-7~), bsh-src (>= 2.0b4-11),
- docbook-xml, ant-contrib, bsh, docbook-xsl-saxon, libbsf-java,
libcommons-logging-java,
- junit
+Build-Depends: ant,
+ ant-contrib,
+ ant-optional,
+ bsh,
+ bsh-src (>= 2.0b4-11),
+ debhelper (>= 7.0.50~),
+ docbook-xml,
+ docbook-xsl,
+ docbook-xsl-saxon,
+ imagemagick,
+ javahelper (>= 0.24),
+ junit,
+ libbsf-java,
+ libcommons-logging-java,
+ quilt (>= 0.46-7~),
+ xsltproc
Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk
Standards-Version: 3.9.3
DM-Upload-Allowed: yes
@@ -17,7 +29,9 @@ Homepage: http://www.jedit.org/
Package: jedit
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre, java-wrappers (>=
0.1.14)
+Depends: java-wrappers (>= 0.1.14),
+ openjdk-6-jre | sun-java6-jre,
+ ${misc:Depends}
Description: Plugin-based editor for programmers
As one of the most feature rich editors available, jEdit boasts support for
syntax highlighting in more than 140 languages. jEdit combines the power of
@@ -33,9 +47,9 @@ Description: Plugin-based editor for programmers
Its functionality is easily extended by the use of 'plugins' which can be
downloaded, updated, and installed, all without exiting the editor. These
include a built-in Console shell integration, which lets you execute
- interactive external commands inside your editor, as well as bind them to
+ interactive external commands inside your editor, as well as bind them to
keyboard shortcuts. The FTP plugin lets you browse and edit files on remote
systems over FTP or SFTP. Other plugins provide shells, object oriented
structure/code browsers, or completion popups for Java, XML, HTML, Ant,
LaTeX, Python, Ruby, Perl, C, C++, bash, Scheme, Prolog, and many other
- languages.
+ languages.
diff --git a/debian/copyright b/debian/copyright
index a11e702..2c14c6c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Source: http://www.jedit.org/
Files: *
Copyright: 1999-2010, Contributors <[email protected]>
License: GPL-2+
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
@@ -121,13 +121,13 @@ License: other
Files: debian/*
Copyright: 2010, Gabriele Giacone <[email protected]>
License: GPL-2+
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
Files: debian/patches/00bsh-jedit debian/patches/01bsh-jedit-asm
Copyright: 1999-2010, Contributors <[email protected]>
License: GPL-2+
- On Debian systems the full text of the GNU General Public
+ On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
diff --git a/debian/jedit.install b/debian/jedit.install
index 70a6411..2d82b85 100644
--- a/debian/jedit.install
+++ b/debian/jedit.install
@@ -1,9 +1,9 @@
-debian/jedit.sh usr/share/jedit
build/jedit.jar usr/share/jedit
-build/modes usr/share/jedit
+build/keymaps usr/share/jedit
build/macros usr/share/jedit
+build/modes usr/share/jedit
build/properties usr/share/jedit
build/startup usr/share/jedit
-build/keymaps usr/share/jedit
+debian/jedit.sh usr/share/jedit
debian/lintian/jedit usr/share/lintian/overrides
--
jedit - Java plugin-based editor for programmers
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
