[f2j] 30/31: Remove non-free references from code and d/copyright
Andreas Tille
tille at debian.org
Fri Jan 29 15:35:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository f2j.
commit 7dc3bda6327c2d01ed718d14e529d8c10d840b76
Author: Andreas Tille <tille at debian.org>
Date: Fri Jan 29 16:28:00 2016 +0100
Remove non-free references from code and d/copyright
---
debian/control | 1 +
debian/copyright | 71 ------------------------------
debian/f2j.install | 1 -
debian/f2j.manpages | 3 +-
debian/javab.1 | 12 -----
debian/patches/remove_non-free_parts.patch | 52 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
8 files changed, 56 insertions(+), 87 deletions(-)
diff --git a/debian/control b/debian/control
index 40b7570..c83b133 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Olivier Sallou <osallou at debian.org>,
Section: java
Priority: optional
Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
default-jdk,
bison,
javahelper
diff --git a/debian/copyright b/debian/copyright
index 281ec7c..23ca8ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,77 +8,6 @@ Files-Excluded: goto_trans
*/*~
util/org/j_paine/formatter/PrintfFormat.java
-Files: goto_trans/*
-Copyright: 2008 Aart J.C. Bik
- 2008 Indiana University
-License: Indiana University
- This prototype bytecode parallelization tool has been developed
- at the Indiana University by Aart J.C. Bik. This software is *not*
- in the public domain. However, it is freely available without
- fee for education, research, and non-profit purposes. By obtaining
- copies of this, you, the Licensee, agree to abide by the following
- conditions and understandings with respect to the copyrighted software:
- .
- 1. The software is copyrighted by Indiana University (IU) and
- Aart J.C. Bik and they retain ownership of the software.
- .
- 2. Permission to use and modify this software and its documentation
- for education, research, and non-profit purposes is hereby granted to
- Licensee, provided that the copyright notice, the original author's
- names and unit identification, and this permission notice appear on
- all such works, and that no charge be made for such copies.
- .
- 3. Any entity desiring permission to incorporate this software into
- commercial products should contact:
- .
- Dennis Gannon gannon at cs.indiana.edu
- 215 Lindley Hall
- Department of Computer Science
- Indiana University
- Bloomington, IN 47405-4101 USA
- .
- 4. Licensee may not use the name, logo, or any other symbol of
- IU nor the names of any of its employees nor any adaptation thereof
- in advertising or publicity pertaining to the software without
- specific prior written approval of the IU.
- .
- 5. THE COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY
- OF THE SOFTWARE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS
- OR IMPLIED WARRANTY.
- .
- 6. The copyright holders shall not be liable for any damages suffered
- by Licensee from the use of this software.
- .
- 7. The software was developed under agreements between the IU and
- the Federal Government which entitle the Government to certain rights.
- .
- Your courtesy in mentioning the use of this bytecode compiler in any scientific
- work that presents results obtained by using (extensions or modifications
- of) this bytecode compiler is highly appreciated.
-
-
-Files: util/org/j_paine/formatter/PrintfFormat.java
-Copyright: 2000 Sun Microsystems, Inc.
-License: SUN
- Permission to use, copy, modify, and distribute this Software and its
- documentation for NON-COMMERCIAL or COMMERCIAL purposes and without fee is
- hereby granted.
- .
- This Software is provided "AS IS". All express warranties, including any
- implied warranty of merchantability, satisfactory quality, fitness for a
- particular purpose, or non-infringement, are disclaimed, except to the extent
- that such disclaimers are held to be legally invalid.
- .
- You acknowledge that Software is not designed, licensed or intended for use in
- the design, construction, operation or maintenance of any nuclear facility
- ("High Risk Activities"). Sun disclaims any express or implied warranty of
- fitness for such uses.
- .
- Please refer to the file http://www.sun.com/policies/trademarks/ for further
- important trademark information and to
- http://java.sun.com/nav/business/index.html for further important licensing
- information for the Java Technology.
-
Files: *
Copyright: 2008 Keith Seymour <seymour at cs.utk.edu>
License: GPL-2+
diff --git a/debian/f2j.install b/debian/f2j.install
index f2dfa7c..2ace2ac 100644
--- a/debian/f2j.install
+++ b/debian/f2j.install
@@ -1,2 +1 @@
-goto_trans/javab usr/bin/
src/f2java usr/bin
diff --git a/debian/f2j.manpages b/debian/f2j.manpages
index 86cb0cb..0f65186 100644
--- a/debian/f2j.manpages
+++ b/debian/f2j.manpages
@@ -1,2 +1 @@
-debian/f2java.1
-debian/javab.1
+debian/*.1
diff --git a/debian/javab.1 b/debian/javab.1
deleted file mode 100644
index f50a7ef..0000000
--- a/debian/javab.1
+++ /dev/null
@@ -1,12 +0,0 @@
-.TH blastb 1 "January 24, 2012" "version 0.8.1" "USER COMMANDS"
-.SH NAME
-blastb - converts GOGO statements in java class files
-.SH SYNOPSIS
-.B blastb file
-.I file class file generated by f2java
-.SH DESCRIPTION
-To recompile java source files generated by f2java, using javac command, the generated class file must be post-treated with the javab tool.
- It converts the GOTO statements in the class file and remove warnings such as "Untransformed goto remaining in program).
-.SH AUTHOR
-Man page by Olivier Sallou <olivier.sallou at irisa.fr>
-f2java project by Keith Seymour <seymour at cs.utk.edu>
diff --git a/debian/patches/remove_non-free_parts.patch b/debian/patches/remove_non-free_parts.patch
new file mode 100644
index 0000000..e80e656
--- /dev/null
+++ b/debian/patches/remove_non-free_parts.patch
@@ -0,0 +1,52 @@
+--- a/configure.in
++++ b/configure.in
+@@ -39,5 +39,5 @@ AC_SUBST(BYTE_DIR)
+ F2J_PACKAGE_STRING=AC_PACKAGE_NAME-AC_PACKAGE_VERSION
+ AC_SUBST(F2J_PACKAGE_STRING)
+
+-AC_CONFIG_FILES(Makefile src/make.def goto_trans/make.def util/make.def)
++AC_CONFIG_FILES(Makefile src/make.def util/make.def)
+ AC_OUTPUT(src/f2j-config.h)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,6 @@ all: f2java javab
+
+ install:
+ cd util; $(MAKE) install
+- cd goto_trans; $(MAKE) install
+ cd libbytecode; $(MAKE) install
+ cd src; $(MAKE) install
+
+@@ -25,7 +24,7 @@ f2java: libbytecode/libbytecode.a util/f
+ cd src; $(MAKE)
+
+ javab:
+- cd goto_trans; $(MAKE)
++ echo "javab will not be created since it is non-free and most probably not needed any more"
+
+ srcdist: srcdist_common
+ zip -r $(F2J_PACKAGE_NAME).zip $(F2J_PACKAGE_NAME)
+@@ -36,10 +35,8 @@ srcdist_common:
+ mkdir -p $(F2J_PACKAGE_NAME)/bin
+ mkdir -p $(F2J_PACKAGE_NAME)/src
+ mkdir -p $(F2J_PACKAGE_NAME)/doc
+- mkdir -p $(F2J_PACKAGE_NAME)/goto_trans
+ mkdir -p $(F2J_PACKAGE_NAME)/libbytecode
+ mkdir -p $(F2J_PACKAGE_NAME)/util/org/netlib/util
+- cd goto_trans; cp *.[ch] make.def.in README LICENSE Makefile ../$(F2J_PACKAGE_NAME)/goto_trans
+ cd libbytecode; cp *.[ch] *.in configure ../$(F2J_PACKAGE_NAME)/libbytecode
+ cd src; cp *.[chy] make.def.in LICENSE Makefile f2j-config.h.in ../$(F2J_PACKAGE_NAME)/src
+ cd util; cp make.def.in Makefile ../$(F2J_PACKAGE_NAME)/util
+@@ -50,7 +47,6 @@ srcdist_common:
+
+ clean:
+ /bin/rm -rf $(F2J_PACKAGE_NAME) $(F2J_PACKAGE_NAME).zip $(F2J_PACKAGE_NAME).tgz f2jsrc.tgz f2jsrc.zip
+- cd goto_trans; $(MAKE) realclean
+ cd libbytecode; $(MAKE) clean
+ cd src; $(MAKE) clean
+ cd util; $(MAKE) clean
+@@ -60,4 +56,3 @@ configclean: clean
+ cd libbytecode; $(MAKE) configclean
+ /bin/rm -rf autom4te.cache
+ /bin/rm -f config.log config.status config.cache Makefile src/make.def
+- /bin/rm -f configure goto_trans/make.def util/make.def
diff --git a/debian/patches/series b/debian/patches/series
index 952bfff..0f94d65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix_clean_target
generate_doc
+remove_non-free_parts.patch
diff --git a/debian/rules b/debian/rules
index 9d55130..f4662c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
JAVA_HOME=/usr/lib/jvm/default-java
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_install:
jh_installlibs --package=libf2j-java util/f2jutil.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/f2j.git
More information about the pkg-java-commits
mailing list