[packages/libdsk.git] / libdsk-java.patch

--- libdsk-1.3.5/lib/Makefile.am.orig	2014-03-02 02:09:38.000000000 +0100
+++ libdsk-1.3.5/lib/Makefile.am	2014-03-03 08:05:02.361397724 +0100
@@ -87,7 +87,7 @@
 CLEANFILES=$(JARCLASSES) $(JARHEADERS)
 
 libdsk.jar:	$(JARCLASSES)
-	$(JAR) c0f $@ uk/*
+	$(JAR) c0f $@ uk/co/demon/seasip/libdsk/*.class
 	$(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE)
 
 $(CLASSDPRE)/%.class:   $(srcdir)/$(CLASSDPRE)/%.java
@@ -103,7 +103,9 @@
 
 $(srcdir)/dskjni.c:	$(JARHEADERS)
 
+javadir = /usr/share/java
+
 install-exec-local:
-	$(mkinstalldirs) $(libdir)
-	if test x@LIBDSKJAR@ = x; then true; else $(INSTALL_DATA) @LIBDSKJAR@ $(DESTDIR)/$(libdir); fi
+	$(mkinstalldirs) $(DESTDIR)$(javadir)
+	if test x@LIBDSKJAR@ = x; then true; else $(INSTALL_DATA) @LIBDSKJAR@ $(DESTDIR)$(javadir); fi
 
--- libdsk-1.4.0/lib/uk/co/demon/seasip/libdsk/Drive.java.orig	2015-04-28 22:06:20.000000000 +0200
+++ libdsk-1.4.0/lib/uk/co/demon/seasip/libdsk/Drive.java	2016-08-01 18:33:24.505272401 +0200
@@ -120,7 +120,7 @@
   * @param cyl The physical cylinder containing the sector. 
   * @param head The physical head to use.
   * @param cylExpected The expected cylinder number in the sector header.
-  * @param cylExpected The expected head number in the sector header.
+  * @param headExpected The expected head number in the sector header.
   * @param sector The number of the sector.
   * @param sectorLen The number of bytes to transfer (may be less than a 
   *                 full sector).
@@ -165,7 +165,7 @@
   * @param cyl The physical cylinder containing the sector. 
   * @param head The physical head to use.
   * @param cylExpected The expected cylinder number in the sector header.
-  * @param cylExpected The expected head number in the sector header.
+  * @param headExpected The expected head number in the sector header.
   * @param sector The number of the sector.
   * @param sectorLen The number of bytes to transfer (may be less than a 
   *                 full sector).
@@ -209,7 +209,7 @@
   * @param cyl The physical cylinder containing the sector. 
   * @param head The physical head to use.
   * @param cylExpected The expected cylinder number in the sector header.
-  * @param cylExpected The expected head number in the sector header.
+  * @param headExpected The expected head number in the sector header.
   * @param sector The number of the sector.
   * @param sectorLen The number of bytes to transfer (may be less than a 
   *                 full sector).
@@ -228,7 +228,7 @@
 /** Format a track, using physical cylinder/sector.
  *
  * @param g The drive geometry to use.
- * @param c The physical cylinder to use. 
+ * @param cyl The physical cylinder to use. 
  * @param h The physical head to use.
  * @param fd An array of FormatData objects containing sector headers.
  * @param filler The byte with which to fill the empty sectors. 
@@ -252,7 +252,7 @@
   * it will just do repeated sector reads.
   * @param g The drive geometry to use. 
   * @param buf The buffer to be filled with data. 
-  * @param cyl The physical cylinder to use. 
+  * @param cylinder The physical cylinder to use. 
   * @param head The physical head to use.
   * @exception DskException If the read failed for any reason, or the driver cannot
   *                     read sectors.
@@ -280,10 +280,10 @@
   * use this call.
   * @param g The drive geometry to use. 
   * @param buf The buffer to be filled with data. 
-  * @param cyl The physical cylinder to use. 
+  * @param cylinder The physical cylinder to use. 
   * @param head The physical head to use.
   * @param cylExpected The expected cylinder number in the sector header.
-  * @param cylExpected The expected head number in the sector header.
+  * @param headExpected The expected head number in the sector header.
   * @exception DskException If the read failed for any reason, or the driver cannot
   *                     read sectors.
   */
@@ -294,7 +294,7 @@
  * Linux floppies.
  *
  * @param g The drive geometry to use.
- * @param cyl The physical cylinder to use. 
+ * @param cylinder The physical cylinder to use. 
  * @param head The physical head to use.
  * @param filler The byte with which to fill the empty sectors. 
  * @exception DskException If the format failed for any reason, or the driver cannot
@@ -402,7 +402,7 @@
 	public native void setComment(String c) throws DskException;
 
 /** Set the number of times an operation will be retried.
- * @param n The number of times to retry a read, write or format, 1 or more. 
+ * @param c The number of times to retry a read, write or format, 1 or more. 
  * @exception DskException If the number passed is 0. */
 	public native void setRetry(int c) throws DskException;
Commit	Line	Data
2f351824 JB	1	--- libdsk-1.3.5/lib/Makefile.am.orig 2014-03-02 02:09:38.000000000 +0100
	2	+++ libdsk-1.3.5/lib/Makefile.am 2014-03-03 08:05:02.361397724 +0100
	3	@@ -87,7 +87,7 @@
	4	CLEANFILES=$(JARCLASSES) $(JARHEADERS)
	5
	6	libdsk.jar: $(JARCLASSES)
	7	- $(JAR) c0f $@ uk/*
	8	+ $(JAR) c0f $@ uk/co/demon/seasip/libdsk/*.class
	9	$(JAVADOC) -d $(top_srcdir)/doc/jni $(CLASSCPRE)
	10
	11	$(CLASSDPRE)/%.class: $(srcdir)/$(CLASSDPRE)/%.java
	12	@@ -103,7 +103,9 @@
	13
	14	$(srcdir)/dskjni.c: $(JARHEADERS)
	15
	16	+javadir = /usr/share/java
	17	+
	18	install-exec-local:
	19	- $(mkinstalldirs) $(libdir)
	20	- if test x@LIBDSKJAR@ = x; then true; else $(INSTALL_DATA) @LIBDSKJAR@ $(DESTDIR)/$(libdir); fi
	21	+ $(mkinstalldirs) $(DESTDIR)$(javadir)
	22	+ if test x@LIBDSKJAR@ = x; then true; else $(INSTALL_DATA) @LIBDSKJAR@ $(DESTDIR)$(javadir); fi
	23
e823c600 JB	24	--- libdsk-1.4.0/lib/uk/co/demon/seasip/libdsk/Drive.java.orig 2015-04-28 22:06:20.000000000 +0200
	25	+++ libdsk-1.4.0/lib/uk/co/demon/seasip/libdsk/Drive.java 2016-08-01 18:33:24.505272401 +0200
	26	@@ -120,7 +120,7 @@
	27	* @param cyl The physical cylinder containing the sector.
	28	* @param head The physical head to use.
	29	* @param cylExpected The expected cylinder number in the sector header.
	30	- * @param cylExpected The expected head number in the sector header.
	31	+ * @param headExpected The expected head number in the sector header.
	32	* @param sector The number of the sector.
	33	* @param sectorLen The number of bytes to transfer (may be less than a
	34	* full sector).
	35	@@ -165,7 +165,7 @@
	36	* @param cyl The physical cylinder containing the sector.
	37	* @param head The physical head to use.
	38	* @param cylExpected The expected cylinder number in the sector header.
	39	- * @param cylExpected The expected head number in the sector header.
	40	+ * @param headExpected The expected head number in the sector header.
	41	* @param sector The number of the sector.
	42	* @param sectorLen The number of bytes to transfer (may be less than a
	43	* full sector).
	44	@@ -209,7 +209,7 @@
	45	* @param cyl The physical cylinder containing the sector.
	46	* @param head The physical head to use.
	47	* @param cylExpected The expected cylinder number in the sector header.
	48	- * @param cylExpected The expected head number in the sector header.
	49	+ * @param headExpected The expected head number in the sector header.
	50	* @param sector The number of the sector.
	51	* @param sectorLen The number of bytes to transfer (may be less than a
	52	* full sector).
	53	@@ -228,7 +228,7 @@
	54	/** Format a track, using physical cylinder/sector.
	55	*
	56	* @param g The drive geometry to use.
	57	- * @param c The physical cylinder to use.
	58	+ * @param cyl The physical cylinder to use.
	59	* @param h The physical head to use.
	60	* @param fd An array of FormatData objects containing sector headers.
	61	* @param filler The byte with which to fill the empty sectors.
	62	@@ -252,7 +252,7 @@
	63	* it will just do repeated sector reads.
	64	* @param g The drive geometry to use.
	65	* @param buf The buffer to be filled with data.
	66	- * @param cyl The physical cylinder to use.
	67	+ * @param cylinder The physical cylinder to use.
	68	* @param head The physical head to use.
	69	* @exception DskException If the read failed for any reason, or the driver cannot
	70	* read sectors.
	71	@@ -280,10 +280,10 @@
	72	* use this call.
	73	* @param g The drive geometry to use.
	74	* @param buf The buffer to be filled with data.
	75	- * @param cyl The physical cylinder to use.
	76	+ * @param cylinder The physical cylinder to use.
	77	* @param head The physical head to use.
	78	* @param cylExpected The expected cylinder number in the sector header.
	79	- * @param cylExpected The expected head number in the sector header.
	80	+ * @param headExpected The expected head number in the sector header.
	81	* @exception DskException If the read failed for any reason, or the driver cannot
	82	* read sectors.
	83	*/
	84	@@ -294,7 +294,7 @@
	85	* Linux floppies.
	86	*
	87	* @param g The drive geometry to use.
88	- * @param cyl The physical cylinder to use.
89	+ * @param cylinder The physical cylinder to use.
90	* @param head The physical head to use.
91	* @param filler The byte with which to fill the empty sectors.
92	* @exception DskException If the format failed for any reason, or the driver cannot
93	@@ -402,7 +402,7 @@
94	public native void setComment(String c) throws DskException;
95
96	/** Set the number of times an operation will be retried.
97	- * @param n The number of times to retry a read, write or format, 1 or more.
98	+ * @param c The number of times to retry a read, write or format, 1 or more.
99	* @exception DskException If the number passed is 0. */
100	public native void setRetry(int c) throws DskException;
101