[pkg-java] r15072 - in trunk/jta: . de/mud/jta debian debian/patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Tue Sep 27 19:32:51 UTC 2011
Author: nomadium-guest
Date: 2011-09-27 19:32:51 +0000 (Tue, 27 Sep 2011)
New Revision: 15072
Added:
trunk/jta/debian/patches/fix_build.patch
Removed:
trunk/jta/Makefile
trunk/jta/de/mud/jta/Build.java
Modified:
trunk/jta/debian/changelog
trunk/jta/debian/patches/series
Log:
Put changes to upstream code in a patch
Deleted: trunk/jta/Makefile
===================================================================
--- trunk/jta/Makefile 2011-09-27 18:11:27 UTC (rev 15071)
+++ trunk/jta/Makefile 2011-09-27 19:32:51 UTC (rev 15072)
@@ -1,178 +0,0 @@
-# This file is part of "The Java Telnet Application".
-#
-# (c) Matthias L. Jugel, Marcus Meißner 1996-2002. All Rights Reserved.
-#
-# Please visit http://javatelnet.org/ for updates and contact.
-#
-# --LICENSE NOTICE--
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-# --LICENSE NOTICE--
-#
-
-#JAVA_HOME=/usr/local/IBMJava2-ppc-142
-JAVA = $(JAVA_HOME)/bin/java
-JAR = $(JAVA_HOME)/bin/jar
-JAVAC = $(JAVA_HOME)/bin/javac
-JAVADOC = $(JAVA_HOME)/bin/javadoc
-JAVAH = $(JAVA_HOME)/bin/javah
-#JAVA = /q/opt/jdk1.2.2/bin/java
-#JAR = /q/opt/jdk1.2.2/bin/jar
-#JAVAC = /q/opt/jdk1.2.2/bin/javac
-#JAVADOC = /q/opt/jdk1.2.2/bin/javadoc
-#DEBUG = -g -deprecation
-DEBUG = -g
-JFLAGS = -classpath $(CLASSPATH):jar/org.apache.crimson.jar:jar/jdom.jar:jar/gnu-regexp-1.0.8.jar:.
-SRCDIR = de
-PKGNAME = jta25
-VERSION = `java -version 2>&1 | head -1 | \
- sed 's/^java version //' | sed 's/"//g'`
-DATE = `date +%Y%m%d-%H%M`
-
-.SUFFIXES: .java .class
-
-# compile java files to class
-.java.class:
- $(JAVAC) $(DEBUG) $(JFLAGS) $<
-
-#
-# major rules to create files
-#
-all: app cont doc jar tools/mrelayd tools/relayd
-
-run: app
- $(JAVA) $(JFLAGS) de.mud.jta.Main
-
-doc: app
- @echo Creating source documentation ...
- @if [ ! -d doc ]; then mkdir doc; fi
- @-rm -r doc/source/*.html doc/source/de
- @$(JAVADOC) -d doc/source -version -author \
- -sourcepath $(CLASSPATH):.:contrib \
- `(find de -name \*.java -printf '%h\n'; \
- (cd contrib; find * -name \*.java -printf '%h\n')) | \
- sort | uniq | \
- grep -v CVS | sed 's/\//./g'`; > /dev/null
- @echo Source documentation done.
-
-tex: app
- @echo Creating latex source documentation ...
- @$(JAVADOC) -docletpath ../tex -doclet TexDoclet \
- -output $(PKGNAME).tex \
- -docdir de/mud/jta `find de/mud -type d -print | \
- grep -v CVS | grep -v '^de/mud$$' | sed 's/\//./g'`; > /dev/null
- @echo Source documentation done.
-
-jar: app build
- @echo Creating binary archive ...
- @if [ ! -d jar ]; then mkdir jar; fi
- @touch "Created-$(DATE)"
- @$(JAR) cvfm jar/$(PKGNAME).jar jta.manifest \
- "Created-$(DATE)" README \
- license/COPYING \
- `find $(SRCDIR) -name \*.class` \
- `find $(SRCDIR) -name \*.conf` > /dev/null
- @rm -f Created-*
- @echo Created jar/$(PKGNAME).jar
-
-opt:
- @[ -f ../Jopt.jar ] && $(JAVA) -jar ../Jopt.jar jar/$(PKGNAME).jar
- @echo Created jar/$(PKGNAME)_o.jar
-
-cont:
- @echo Compiling contributed software ...
- @(cd contrib; make)
-
-dist: all opt revision changes
- @echo Creating distribution package ...
- @if [ "$(CVSROOT)" = "" ]; then echo "Missing CVSROOT!"; exit -1; fi
- @(cvs -Q -d $(CVSROOT) export -D now -d $(PKGNAME) jta && \
- export CLASSPATH=$(CLASSPATH):`pwd`/jar/cryptix.jar && \
- cp REVISION CHANGES $(PKGNAME)/ && \
- cp -r doc/source $(PKGNAME)/doc/ && \
- touch "$(PKGNAME)/Created-$(DATE)" && \
- sed "s/<!-- DATE -->/$(DATE)/g" < $(PKGNAME)/index.html \
- > $(PKGNAME)/index.new && \
- mv $(PKGNAME)/index.new $(PKGNAME)/index.html && \
- echo "s/<!-- DATE -->/$(DATE)/g" > /tmp/jta.sed && \
- (cd $(PKGNAME); make cont; \
- rm -r contrib/de/mud/bsx contrib/de/mud/jta/plugin/BSX*; \
- $(JAR) cvMf ../jar/contrib.jar contrib) &&\
- (cd jar; for i in *.jar; do \
- echo 's/<!-- SIZE-'$$i' -->/'`\ls -l $$i | \
- awk '{printf("%dk", $$5/1024);}' `'/g'; \
- done) >> /tmp/jta.sed && \
- sed -f /tmp/jta.sed < $(PKGNAME)/html/download.html \
- > $(PKGNAME)/html/download.new && \
- rm -f /tmp/jta.sed && \
- mv $(PKGNAME)/html/download.new $(PKGNAME)/html/download.html && \
- bin/users.pl > $(PKGNAME)/html/users.html.new && \
- mv $(PKGNAME)/html/users.html.new $(PKGNAME)/html/users.html && \
- rm -r $(PKGNAME)/tools/* \
- $(PKGNAME)/html/users.db \
- $(PKGNAME)/bin/users.pl && \
- (cd $(PKGNAME); $(MAKE) clean) && \
- $(JAR) cvMf jar/$(PKGNAME)-src.jar $(PKGNAME) \
- ) > /dev/null
- @rm -rf $(PKGNAME)
- @echo Created jar/$(PKGNAME)-src.jar
- @$(JAR) cvMf jar/relay.jar \
- tools/relayd tools/mrelayd tools/*.c tools/*.exe
-
-build:
- @echo "package de.mud.jta; public class Build implements Version { public String getDate() { return \"$(DATE)\"; } }" > de/mud/jta/Build.java
-
-changes:
- @rcs2log > CHANGES
- @echo Created CHANGES.
-
-revision:
- @find de -name \*.java | xargs cat | grep @version | \
- awk 'BEGIN{ \
- printf("%-26.26s %2.2s.%-2.2s (%10s) %s\n", \
- "File","R","M", "Date", "Last Accessed by:"); \
- } \
- { \
- split($$5,rev,"."); \
- printf("%-26.26s %2.2s.%-2.2s (%10s) %s\n", \
- $$4,rev[1],rev[2],$$6,$$8); \
- }' \
- > REVISION
- @echo Created REVISION.
-
-small: app
- jar cvf jar/jta20-small.jar \
- license/README \
- de/mud/jta/SmallApplet*class \
- de/mud/telnet/TelnetProtocolHandler.class \
- de/mud/terminal/VDU*class \
- de/mud/terminal/vt320*class \
- de/mud/terminal/SoftFont.class
-
-#
-# application dependencies
-#
-app:
- @find $(SRCDIR) -name \*.java | sed 's/java$$/class/' | xargs make
- @echo Done.
-
-clean:
- -find . -name \*.class -print | xargs rm > /dev/null 2>&1
- -find . -name \*~ -print | xargs rm > /dev/null 2>&1
- -rm -f tools/relayd tools/mrelayd
- cd jni && $(MAKE) clean
-
-realclean: clean
- -rm -f jar/$(PKGNAME).jar jar/$(PKGNAME)-src.jar
- cd jni && $(MAKE) realclean
Deleted: trunk/jta/de/mud/jta/Build.java
===================================================================
--- trunk/jta/de/mud/jta/Build.java 2011-09-27 18:11:27 UTC (rev 15071)
+++ trunk/jta/de/mud/jta/Build.java 2011-09-27 19:32:51 UTC (rev 15072)
@@ -1 +0,0 @@
-package de.mud.jta; public class Build implements Version { public String getDate() { return "20040522-1320"; } }
Modified: trunk/jta/debian/changelog
===================================================================
--- trunk/jta/debian/changelog 2011-09-27 18:11:27 UTC (rev 15071)
+++ trunk/jta/debian/changelog 2011-09-27 19:32:51 UTC (rev 15072)
@@ -1,3 +1,11 @@
+jta (2.6+dfsg-4) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Put changes to upstream code in a patch as is required since dpkg 1.16.1.
+ (Closes: 643172).
+
+ -- Miguel Landaeta <miguel at miguel.cc> Tue, 27 Sep 2011 19:32:24 -0430
+
jta (2.6+dfsg-3) unstable; urgency=low
* Team Upload
Added: trunk/jta/debian/patches/fix_build.patch
===================================================================
--- trunk/jta/debian/patches/fix_build.patch (rev 0)
+++ trunk/jta/debian/patches/fix_build.patch 2011-09-27 19:32:51 UTC (rev 15072)
@@ -0,0 +1,90 @@
+Description: Build package with binaries located in $JAVA_HOME
+Author: Arnaud Vandyck <avdyk at debian.org>
+Forwarded: no
+Last-Update: 2011-09-27
+
+--- jta-2.6+dfsg.orig/Makefile
++++ jta-2.6+dfsg/Makefile
+@@ -1,6 +1,6 @@
+-# This file is part of "JTA - Telnet/SSH for the JAVA(tm) platform".
++# This file is part of "The Java Telnet Application".
+ #
+-# (c) Matthias L. Jugel, Marcus Meißner 1996-2005. All Rights Reserved.
++# (c) Matthias L. Jugel, Marcus Meißner 1996-2002. All Rights Reserved.
+ #
+ # Please visit http://javatelnet.org/ for updates and contact.
+ #
+@@ -14,18 +14,19 @@
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+-#
++#
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ # --LICENSE NOTICE--
+ #
+
+-JAVA = java
+-JAR = jar
+-JAVAC = javac
+-JAVADOC = javadoc
+-JAVAH = javah
++#JAVA_HOME=/usr/local/IBMJava2-ppc-142
++JAVA = $(JAVA_HOME)/bin/java
++JAR = $(JAVA_HOME)/bin/jar
++JAVAC = $(JAVA_HOME)/bin/javac
++JAVADOC = $(JAVA_HOME)/bin/javadoc
++JAVAH = $(JAVA_HOME)/bin/javah
+ #JAVA = /q/opt/jdk1.2.2/bin/java
+ #JAR = /q/opt/jdk1.2.2/bin/jar
+ #JAVAC = /q/opt/jdk1.2.2/bin/javac
+@@ -34,7 +35,7 @@ JAVAH = javah
+ DEBUG = -g
+ JFLAGS = -classpath $(CLASSPATH):jar/org.apache.crimson.jar:jar/jdom.jar:jar/gnu-regexp-1.0.8.jar:.
+ SRCDIR = de
+-PKGNAME = jta20
++PKGNAME = jta25
+ VERSION = `java -version 2>&1 | head -1 | \
+ sed 's/^java version //' | sed 's/"//g'`
+ DATE = `date +%Y%m%d-%H%M`
+--- jta-2.6+dfsg.orig/de/mud/jta/Build.java
++++ jta-2.6+dfsg/de/mud/jta/Build.java
+@@ -1,35 +1 @@
+-/*
+- * This file is part of "JTA - Telnet/SSH for the JAVA(tm) platform".
+- *
+- * (c) Matthias L. Jugel, Marcus Meißner 1996-2005. All Rights Reserved.
+- *
+- * Please visit http://javatelnet.org/ for updates and contact.
+- *
+- * --LICENSE NOTICE--
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- * --LICENSE NOTICE--
+- *
+- */
+-
+-package de.mud.jta;
+-
+-/**
+- * The build class shows the date and time if the release
+- */
+-public class Build implements Version {
+- public String getDate() {
+- return "20051219-0941";
+- }
+-}
++package de.mud.jta; public class Build implements Version { public String getDate() { return "20040522-1320"; } }
Modified: trunk/jta/debian/patches/series
===================================================================
--- trunk/jta/debian/patches/series 2011-09-27 18:11:27 UTC (rev 15071)
+++ trunk/jta/debian/patches/series 2011-09-27 19:32:51 UTC (rev 15072)
@@ -1 +1,2 @@
help-file.patch
+fix_build.patch
More information about the pkg-java-commits
mailing list