[pkg-java] r13493 - trunk/rsyntaxtextarea/debian

[vladimir kotov]

Author: rk13-guest
Date: 2011-04-04 00:08:30 +0000 (Mon, 04 Apr 2011)
New Revision: 13493

Modified:
   trunk/rsyntaxtextarea/debian/changelog
   trunk/rsyntaxtextarea/debian/control
   trunk/rsyntaxtextarea/debian/copyright
   trunk/rsyntaxtextarea/debian/orig-tar.sh
   trunk/rsyntaxtextarea/debian/pom.xml
   trunk/rsyntaxtextarea/debian/watch
Log:
[rsyntaxtextarea]
 * New upstream release.
 * Move default-jdk-doc to Recommends in d/control.
 * Update d/watch and d/orig-tar.sh files to sf.net.
 * Clean d/copyright.



Modified: trunk/rsyntaxtextarea/debian/changelog
===================================================================
--- trunk/rsyntaxtextarea/debian/changelog	2011-04-02 23:57:04 UTC (rev 13492)
+++ trunk/rsyntaxtextarea/debian/changelog	2011-04-04 00:08:30 UTC (rev 13493)
@@ -1,3 +1,12 @@
+rsyntaxtextarea (1.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * 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 <vladimir at kotov.lv>  Mon, 04 Apr 2011 01:28:39 +0300
+
 rsyntaxtextarea (1.5.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #613585)

Modified: trunk/rsyntaxtextarea/debian/control
===================================================================
--- trunk/rsyntaxtextarea/debian/control	2011-04-02 23:57:04 UTC (rev 13492)
+++ trunk/rsyntaxtextarea/debian/control	2011-04-04 00:08:30 UTC (rev 13493)
@@ -35,7 +35,8 @@
 Package: librsyntaxtextarea-java-doc
 Architecture: all
 Section: doc
-Depends: default-jdk-doc, ${misc:Depends}
+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

Modified: trunk/rsyntaxtextarea/debian/copyright
===================================================================
--- trunk/rsyntaxtextarea/debian/copyright	2011-04-02 23:57:04 UTC (rev 13492)
+++ trunk/rsyntaxtextarea/debian/copyright	2011-04-04 00:08:30 UTC (rev 13493)
@@ -7,36 +7,6 @@
 Copyright: 2003-2011, Robert Futrell
 License: LGPL-2.1
 
-Files:
- test/org/fife/ui/rtextarea/SearchEngineTest.java
- src/org/fife/ui/rsyntaxtextarea/AbstractTokenMakerFactory.java
- src/org/fife/ui/rsyntaxtextarea/XMLParser.java
- src/org/fife/ui/rsyntaxtextarea/templates/AbstractCodeTemplate.java
- src/org/fife/ui/rtextarea/RUndoManager.java
- src/org/fife/ui/rtextarea/ToolTipSupplier.java
-Copyright: 2003-2011, Robert Futrell
-License: LGPL-2.1
-Comment: No license in the files in 1.5.0 release. We have notified the upstream
- author Robert Futrell about these and license headers were added in SVN (r294)
- http://svn.fifesoft.com/viewvc-1.0.5/bin/cgi/viewvc.cgi?view=rev&root=RSyntaxTextArea&revision=294.
- Here is confirmation from the author:
- From: "Robert" <robert at fifesoft.com>
- To: "Vladimir Kotov" <vladimir at kotov.lv>
- .
- Hi Vladimir,
- .
- Thanks for working to package RSTA for Debian!  I've fixed the licenses in
- SVN (revision 294).  I hope to make a very minor update release relatively
- soon, but if you'd rather not wait for that:
- .
- I hereby give you permission to distribute the entire RSyntaxTextArea
- project under the LGPL v3 license, including any files that do not include a
- license summary in a header comment.
- .
- Hope this helps!  Let me know if you need anything else.
- .
- Robert
-
 Files: debian/*
 Copyright: 2011, Vladimir Kotov <vladimir at kotov.lv>
 License: GPL-2

Modified: trunk/rsyntaxtextarea/debian/orig-tar.sh
===================================================================
--- trunk/rsyntaxtextarea/debian/orig-tar.sh	2011-04-02 23:57:04 UTC (rev 13492)
+++ trunk/rsyntaxtextarea/debian/orig-tar.sh	2011-04-04 00:08:30 UTC (rev 13493)
@@ -1,18 +1,16 @@
 #!/bin/sh -e
 
-VERSION=$2
-TAR=../rsyntaxtextarea_$VERSION.orig.tar.gz
-DIR=rsyntaxtextarea-$VERSION
-SVN=http://svn.fifesoft.com/svn/RSyntaxTextArea/RSyntaxTextArea/tags/
-TAG=$VERSION
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../rsyntaxtextarea_$2.orig.tar.gz
+DIR=rsyntaxtextarea-$2.orig
 
-# clean up the upstream tarball
-svn export $SVN/$TAG $DIR
-tar -c -z -f $TAR $DIR
-rm -rf $DIR $3
+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"
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
 fi

Modified: trunk/rsyntaxtextarea/debian/pom.xml
===================================================================
--- trunk/rsyntaxtextarea/debian/pom.xml	2011-04-02 23:57:04 UTC (rev 13492)
+++ trunk/rsyntaxtextarea/debian/pom.xml	2011-04-04 00:08:30 UTC (rev 13493)
@@ -13,7 +13,7 @@
 
 	<groupId>com.fifesoft</groupId>
 	<artifactId>rsyntaxtextarea</artifactId>
-	<version>1.5.0</version>
+	<version>1.5.1</version>
 	<packaging>jar</packaging>
 	<name>RSyntaxTextArea</name>
 	<description>

Modified: trunk/rsyntaxtextarea/debian/watch
===================================================================
--- trunk/rsyntaxtextarea/debian/watch	2011-04-02 23:57:04 UTC (rev 13492)
+++ trunk/rsyntaxtextarea/debian/watch	2011-04-04 00:08:30 UTC (rev 13493)
@@ -1,3 +1,2 @@
 version=3
-http://svn.fifesoft.com/svn/RSyntaxTextArea/RSyntaxTextArea/tags/ (\d[\d\.]*)/ \
-  debian debian/orig-tar.sh
+http://sf.net/rsyntaxtextarea/ rsyntaxtextarea_([\d\.]+)_Source\.zip debian debian/orig-tar.sh