This is an automated email from the git hooks/post-receive script. ben pushed a commit to branch master in repository rsyntaxtextarea.
commit 926e455e5460e0e4f60c4b35b8fa049577a5215f Author: Benjamin Mesing <[email protected]> Date: Mon Aug 5 21:41:36 2013 +0200 Imported Debian patch 2.0.7-1 --- debian/changelog | 29 ++++++++ debian/compat | 1 + debian/control | 59 +++++++++++++++ debian/copyright | 16 +++++ debian/librsyntaxtextarea-java-doc.javadoc | 1 + debian/librsyntaxtextarea-java.jlibs | 1 + debian/librsyntaxtextarea-java.poms | 1 + debian/orig-tar.sh | 16 +++++ .../20-fix-IOException-jdk5-compiler-error.patch | 13 ++++ debian/patches/build-process.patch | 38 ++++++++++ debian/patches/series | 2 + debian/pom.xml | 75 ++++++++++++++++++++ debian/rules | 14 ++++ debian/source/format | 1 + debian/watch | 2 + 15 files changed, 269 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..1be1bde --- /dev/null +++ b/debian/changelog @@ -0,0 +1,29 @@ +rsyntaxtextarea (2.0.7-1) UNRELEASED; urgency=low + + * update to v 2.0.7 + + -- Benjamin Mesing <[email protected]> Mon, 05 Aug 2013 21:41:36 +0200 + +rsyntaxtextarea (1.5.1-2) unstable; urgency=low + + * Team upload. + * Work around a typo in the build.xml causing FTBFS with + Java7. + + -- Niels Thykier <[email protected]> Thu, 21 Jun 2012 11:47:38 +0200 + +rsyntaxtextarea (1.5.1-1) unstable; urgency=low + + * New upstream release. + - First upload to Debian. (Closes: #613585) + * Move default-jdk-doc to Recommends in d/control. + * Update d/watch and d/orig-tar.sh files to sf.net. + * Clean d/copyright. + + -- Vladimir Kotov <[email protected]> Wed, 11 May 2011 00:45:07 +0300 + +rsyntaxtextarea (1.5.0-1) unstable; urgency=low + + * Initial release. + + -- Vladimir Kotov <[email protected]> Wed, 16 Mar 2011 00:21:43 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..068a41d --- /dev/null +++ b/debian/control @@ -0,0 +1,59 @@ +Source: rsyntaxtextarea +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Vladimir Kotov <[email protected]>, Benjamin Mesing <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32), maven-repo-helper, ant +Build-Depends-Indep: default-jdk, default-jdk-doc +Standards-Version: 3.9.4 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/rsyntaxtextarea +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/rsyntaxtextarea +Homepage: http://fifesoft.com/rsyntaxtextarea/ + +Package: librsyntaxtextarea-java +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Suggests: librsyntaxtextarea-java-doc +Description: Java library for syntax highlighting text component + RSyntaxTextArea extends JTextComponent so it integrates completely + with the standard javax.swing.text package. It is fast and efficient, and + can be used in any application that needs to edit or view source code. + . + Some of RSyntaxTextArea's features include: + * Syntax highlighting for over 25 programming languages + * Find/Replace with standard options + * Loading and saving of local or remote files + * User-defined macros + * Code templates + * Unlimited undo/redo + * Drag and drop + * Edit with multiple fonts simultaneously + * Bracket matching + * Current line highlighting + * Clickable hyperlinks (only certain languages) + +Package: librsyntaxtextarea-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: default-jdk-doc +Suggests: librsyntaxtextarea-java +Description: Java library for syntax highlighting text component (documentation) + RSyntaxTextArea extends JTextComponent so it integrates completely + with the standard javax.swing.text package. It is fast and efficient, and + can be used in any application that needs to edit or view source code. + . + Some of RSyntaxTextArea's features include: + * Syntax highlighting for over 25 programming languages + * Find/Replace with standard options + * Loading and saving of local or remote files + * User-defined macros + * Code templates + * Unlimited undo/redo + * Drag and drop + * Edit with multiple fonts simultaneously + * Bracket matching + * Current line highlighting + * Clickable hyperlinks (only certain languages) + . + This package contains the API documentation of librsyntaxtextarea-java. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b46cbaf --- /dev/null +++ b/debian/copyright @@ -0,0 +1,16 @@ +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: RSyntaxTextArea +Upstream-Contact: Robert Futrell +Source: http://fifesoft.com/rsyntaxtextarea/ + +Files: * +Copyright: 2003-2013, Robert Futrell +License: LGPL-2.1+ + +Files: debian/* +Copyright: 2011, Vladimir Kotov <[email protected]>, 2013, Benjamin Mesing <[email protected]> +License: LGPL-2.1+ + +License: LGPL-2.1+ + On Debian GNU/Linux system you can find the complete text of the + LGPL-2.1 license in '/usr/share/common-licenses/LGPL-2.1' diff --git a/debian/librsyntaxtextarea-java-doc.javadoc b/debian/librsyntaxtextarea-java-doc.javadoc new file mode 100644 index 0000000..94268a6 --- /dev/null +++ b/debian/librsyntaxtextarea-java-doc.javadoc @@ -0,0 +1 @@ +javadoc /usr/share/doc/librsyntaxtextarea-java/api \ No newline at end of file diff --git a/debian/librsyntaxtextarea-java.jlibs b/debian/librsyntaxtextarea-java.jlibs new file mode 100644 index 0000000..cb5461f --- /dev/null +++ b/debian/librsyntaxtextarea-java.jlibs @@ -0,0 +1 @@ +dist/rsyntaxtextarea.jar diff --git a/debian/librsyntaxtextarea-java.poms b/debian/librsyntaxtextarea-java.poms new file mode 100644 index 0000000..8ec27fc --- /dev/null +++ b/debian/librsyntaxtextarea-java.poms @@ -0,0 +1 @@ +debian/pom.xml --usj-name=rsyntaxtextarea \ No newline at end of file diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..2700348 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,16 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +TAR=../rsyntaxtextarea_$2.orig.tar.gz +DIR=rsyntaxtextarea-$2.orig + +unzip $3 -d $DIR +GZIP=--best tar -c -z -f $TAR $DIR +rm -rf $3 $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi diff --git a/debian/patches/20-fix-IOException-jdk5-compiler-error.patch b/debian/patches/20-fix-IOException-jdk5-compiler-error.patch new file mode 100644 index 0000000..992c31d --- /dev/null +++ b/debian/patches/20-fix-IOException-jdk5-compiler-error.patch @@ -0,0 +1,13 @@ +--- a/src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java ++++ b/src/org/fife/ui/rsyntaxtextarea/parser/XmlParser.java +@@ -205,8 +205,9 @@ + // NOTE: If you compile with Java 5+, you must add IOException to the + // throws clause of this method. The "official" release is built with + // Java 1.4. ++ // BM-debianisation: added throws clause to fix compiler error + public InputSource resolveEntity(String publicId, String systemId) +- throws SAXException { ++ throws SAXException, IOException { + if (entityResolver!=null) { + try { + return entityResolver.resolveEntity(publicId, systemId); diff --git a/debian/patches/build-process.patch b/debian/patches/build-process.patch new file mode 100644 index 0000000..be80dbb --- /dev/null +++ b/debian/patches/build-process.patch @@ -0,0 +1,38 @@ +Description: Changes in the build process to perform clean and build + the javadoc linked to default-jdk-doc. +Author: Vladimir Kotov <[email protected]> +Bug-Debian: http://bugs.debian.org/613585 +Forwarded: not-needed +Last-Update: 2011-03-16 + +--- a/build.xml ++++ b/build.xml +@@ -44,7 +44,7 @@ + + + <!-- Creates the jar file. --> +- <target name="make-jar" depends="compile" ++ <target name="make-jar" depends="compile,make-javadoc" + description="Create RSyntaxTextArea jar"> + <delete includeEmptyDirs="true" quiet="true" dir="${dist-dir}"/> + <mkdir dir="${dist-dir}"/> +@@ -92,12 +92,18 @@ + <!-- Builds the javadoc. --> + <target name="make-javadoc" depends="compile"> + <javadoc destdir="${doc-dir}" author="true" version="true" +- breakiterator="yes"> ++ breakiterator="yes" windowtitle="RSyntaxTextArea API" doctitle="RSyntaxTextArea - ${version}"> + <packageset dir="${source-dir}" defaultexcludes="yes"> + <include name="org/**"/> + </packageset> ++ <link href="file:///usr/share/doc/default-jdk-doc/api" packagelistLoc="/usr/share/doc/default-jdk/api/" /> + </javadoc> + </target> + + ++ <target name="clean"> ++ <delete dir="${class-dir}" /> ++ <delete dir="${dist-dir}" /> ++ <delete dir="${doc-dir}" /> ++ </target> + </project> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3e6bd47 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +build-process.patch +20-fix-IOException-jdk5-compiler-error.patch diff --git a/debian/pom.xml b/debian/pom.xml new file mode 100644 index 0000000..2b0ca67 --- /dev/null +++ b/debian/pom.xml @@ -0,0 +1,75 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>com.fifesoft</groupId> + <artifactId>rtext-root-pom</artifactId> + <version>3</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>2.0.7</version> + <packaging>jar</packaging> + <name>RSyntaxTextArea</name> + <description> + RSyntaxTextArea is the syntax highlighting text editor used in RText, pulled out into its + own jar so it is easily usable in any application. Features include Syntax highlighting for 20+ + languages, Code completion, Regex find and replace, Macros, Code templates, Unlimited undo/redo + Line numbering and bracket matching. + </description> + <inceptionYear>2003</inceptionYear> + <url>http://www.fifesoft.com/rsyntaxtextarea/</url> + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <url>http://svn.fifesoft.com/viewvc-1.0.5/bin/cgi/viewvc.cgi/RSyntaxTextArea/?root=RSyntaxTextArea</url> + <connection>http://svn.fifesoft.com/svn/RSyntaxTextArea/RSyntaxTextArea/</connection> + </scm> + <developers> + <developer> + <name>Robert Futrell</name> + <url>http://www.fifesoft.com</url> + </developer> + </developers> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit-version}</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${compiler-plugin-version}</version> + <executions> + <execution> + <id>default-compile</id> + <configuration> + <fork>true</fork> + <executable>${javac14-compiler-executable}</executable> + <compilerVersion>1.4</compilerVersion> + <source>1.4</source> + <target>1.4</target> + </configuration> + <goals> + <goal>compile</goal> + </goals> + + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> + diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3d64525 --- /dev/null +++ b/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +export JAVA_HOME=/usr/lib/jvm/default-java +VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') + + +%: + dh --with javahelper $@ + +get-orig-source: + uscan --download-version $(VERSION) --force-download + +get-orig-pom: + wget -O debian/pom.xml http://repo1.maven.org/maven2/com/fifesoft/rsyntaxtextarea/$(VERSION)/rsyntaxtextarea-$(VERSION).pom 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) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..276a40e --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/rsyntaxtextarea/ rsyntaxtextarea_([\d\.]+)_Source\.zip debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rsyntaxtextarea.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
