[pkg-java] r13549 - in trunk/jclassinfo/debian: . patches source
Vincent Fourmond
fourmond at alioth.debian.org
Sun Apr 17 21:57:13 UTC 2011
Author: fourmond
Date: 2011-04-17 21:57:12 +0000 (Sun, 17 Apr 2011)
New Revision: 13549
Added:
trunk/jclassinfo/debian/patches/01-make-static-lib.diff
trunk/jclassinfo/debian/patches/02-use-stdin.diff
trunk/jclassinfo/debian/patches/03-fix-malloc.diff
trunk/jclassinfo/debian/patches/04-newer-jvms.diff
trunk/jclassinfo/debian/patches/05-fix-jstring-memory.diff
trunk/jclassinfo/debian/patches/series
trunk/jclassinfo/debian/source/
trunk/jclassinfo/debian/source/format
Removed:
trunk/jclassinfo/debian/README.source
trunk/jclassinfo/debian/dirs
trunk/jclassinfo/debian/patches/00list
trunk/jclassinfo/debian/patches/01-make-static-lib.dpatch
trunk/jclassinfo/debian/patches/02-use-stdin.dpatch
trunk/jclassinfo/debian/patches/03-fix-malloc.dpatch
Modified:
trunk/jclassinfo/debian/changelog
trunk/jclassinfo/debian/compat
trunk/jclassinfo/debian/control
trunk/jclassinfo/debian/docs
trunk/jclassinfo/debian/rules
Log:
[jclassinfo] quite a few fixes/upgrades
Deleted: trunk/jclassinfo/debian/README.source
===================================================================
--- trunk/jclassinfo/debian/README.source 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/README.source 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,7 +0,0 @@
-Note about the source package of jclassinfo.
-
-This package uses dpatch to manage all modifications to the upstream
-source. See /usr/share/doc/dpatch/README.source.gz to get more
-information on how to use it.
-
- -- Vincent Fourmond <fourmond at debian.org>, Tue, 5 May 2009 20:24:09 +0200
Modified: trunk/jclassinfo/debian/changelog
===================================================================
--- trunk/jclassinfo/debian/changelog 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/changelog 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,3 +1,16 @@
+jclassinfo (0.19.1-6) unstable; urgency=low
+
+ * Switch to dh 7 and its wonderful sequencer
+ * Bump compatibility level accordingly
+ * Now conforms to standards 3.9.2
+ * Switch to format 3.0 (quilt)
+ * Drop dependencies on dpatch
+ * Drop README.source
+ * Now recognizing newer JVMs (closes: #623158)
+ * Find the flaw in the computations of the string size (closes: #613367)
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 17 Apr 2011 23:18:23 +0200
+
jclassinfo (0.19.1-5) unstable; urgency=low
* patches/03-fix-malloc: fix a memory allocation error (closes: #550203)
Modified: trunk/jclassinfo/debian/compat
===================================================================
--- trunk/jclassinfo/debian/compat 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/compat 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1 +1 @@
-5
+7
Modified: trunk/jclassinfo/debian/control
===================================================================
--- trunk/jclassinfo/debian/control 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/control 2011-04-17 21:57:12 UTC (rev 13549)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 5), automake, autoconf,
- autotools-dev, dpatch, libtool, zlib1g-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), automake, autoconf,
+ autotools-dev, libtool, zlib1g-dev
+Standards-Version: 3.9.2
Homepage: http://jclassinfo.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/packages/trunk/jclassinfo/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/packages/trunk/jclassinfo/
@@ -21,3 +21,6 @@
* the version of the virtual machine necessary to run them
* a full disassembly of the bytecode
* other attributes
+ .
+ Its main advantage over other similar programs is that it is written
+ in C, which makes it much faster and more suitable for scripting.
Deleted: trunk/jclassinfo/debian/dirs
===================================================================
--- trunk/jclassinfo/debian/dirs 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/dirs 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1 +0,0 @@
-usr/bin
Modified: trunk/jclassinfo/debian/docs
===================================================================
--- trunk/jclassinfo/debian/docs 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/docs 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,4 +1,3 @@
NEWS
README
-README.win32
TODO
Deleted: trunk/jclassinfo/debian/patches/00list
===================================================================
--- trunk/jclassinfo/debian/patches/00list 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/patches/00list 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,3 +0,0 @@
-01-make-static-lib
-02-use-stdin
-03-fix-malloc
\ No newline at end of file
Copied: trunk/jclassinfo/debian/patches/01-make-static-lib.diff (from rev 13548, trunk/jclassinfo/debian/patches/01-make-static-lib.dpatch)
===================================================================
--- trunk/jclassinfo/debian/patches/01-make-static-lib.diff (rev 0)
+++ trunk/jclassinfo/debian/patches/01-make-static-lib.diff 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-make-static-lib.dpatch by <fourmond at debian.org>
+##
+## DP: Link statically libjclass: we don't want to support a shared library
+## DP: with dubious utility.
+
+ at DPATCH@
+diff -urNad jclassinfo-0.19.1~/jclass/Makefile.am jclassinfo-0.19.1/jclass/Makefile.am
+--- jclassinfo-0.19.1~/jclass/Makefile.am 2004-03-23 05:55:15.000000000 +0100
++++ jclassinfo-0.19.1/jclass/Makefile.am 2007-12-28 10:43:47.000000000 +0100
+@@ -3,7 +3,7 @@
+ INCLUDES=
+
+ lib_LTLIBRARIES = libjclass.la
+-libjclass_la_LDFLAGS = -no-undefined -version-info @JCLASS_CURRENT@:@JCLASS_RELEASE@:@JCLASS_AGE@
++libjclass_la_LDFLAGS = -no-undefined -version-info @JCLASS_CURRENT@:@JCLASS_RELEASE@:@JCLASS_AGE@ -static
+
+ library_includedir=$(includedir)/jclass/jclass
+
Deleted: trunk/jclassinfo/debian/patches/01-make-static-lib.dpatch
===================================================================
--- trunk/jclassinfo/debian/patches/01-make-static-lib.dpatch 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/patches/01-make-static-lib.dpatch 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-make-static-lib.dpatch by <fourmond at debian.org>
-##
-## DP: Link statically libjclass: we don't want to support a shared library
-## DP: with dubious utility.
-
- at DPATCH@
-diff -urNad jclassinfo-0.19.1~/jclass/Makefile.am jclassinfo-0.19.1/jclass/Makefile.am
---- jclassinfo-0.19.1~/jclass/Makefile.am 2004-03-23 05:55:15.000000000 +0100
-+++ jclassinfo-0.19.1/jclass/Makefile.am 2007-12-28 10:43:47.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES=
-
- lib_LTLIBRARIES = libjclass.la
--libjclass_la_LDFLAGS = -no-undefined -version-info @JCLASS_CURRENT@:@JCLASS_RELEASE@:@JCLASS_AGE@
-+libjclass_la_LDFLAGS = -no-undefined -version-info @JCLASS_CURRENT@:@JCLASS_RELEASE@:@JCLASS_AGE@ -static
-
- library_includedir=$(includedir)/jclass/jclass
-
Copied: trunk/jclassinfo/debian/patches/02-use-stdin.diff (from rev 13548, trunk/jclassinfo/debian/patches/02-use-stdin.dpatch)
===================================================================
--- trunk/jclassinfo/debian/patches/02-use-stdin.diff (rev 0)
+++ trunk/jclassinfo/debian/patches/02-use-stdin.diff 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1,187 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-use-stdin.dpatch by <fourmond at debian.org>
+##
+## DP: Adds some code so that the "-" argument for stdin works.
+
+ at DPATCH@
+diff -urNad jclassinfo-0.19.1~/jclass/Makefile.am jclassinfo-0.19.1/jclass/Makefile.am
+--- jclassinfo-0.19.1~/jclass/Makefile.am 2007-12-28 18:41:58.000000000 +0100
++++ jclassinfo-0.19.1/jclass/Makefile.am 2007-12-28 18:41:58.000000000 +0100
+@@ -29,8 +29,9 @@
+ constant_pool.c \
+ field.c \
+ jar.c \
+- java_file.c \
++ java_file.c \
+ java_buf.c \
+ jstring.c \
+ manifest.c \
++ open.h open.c \
+ strtok_r.h strtok_r.c
+diff -urNad jclassinfo-0.19.1~/jclass/class.c jclassinfo-0.19.1/jclass/class.c
+--- jclassinfo-0.19.1~/jclass/class.c 2004-05-07 13:44:44.000000000 +0200
++++ jclassinfo-0.19.1/jclass/class.c 2007-12-28 18:41:58.000000000 +0100
+@@ -28,6 +28,8 @@
+ #include <jclass/jstring.h>
+ #include <jclass/class_loader.h>
+
++#include <jclass/open.h>
++
+ /*
+ *
+ * libjclass API reference
+@@ -74,7 +76,7 @@
+ if(filename == NULL)
+ return NULL;
+
+- is_filename = (strlen(filename) > 6) && !strcmp(".class", &filename[strlen(filename) - 6]);
++ is_filename = ((strlen(filename) > 6) && !strcmp(".class", &filename[strlen(filename) - 6]) || (!strcmp(filename, "-")));
+
+ if(!is_filename)
+ {
+@@ -96,7 +98,7 @@
+ }
+ else
+ {
+- classfile = fopen(filename, "rb");
++ classfile = my_open(filename, "rb");
+ new_class = jclass_class_new_from_file(classfile);
+ }
+
+diff -urNad jclassinfo-0.19.1~/jclass/class_loader.c jclassinfo-0.19.1/jclass/class_loader.c
+--- jclassinfo-0.19.1~/jclass/class_loader.c 2004-07-10 17:15:10.000000000 +0200
++++ jclassinfo-0.19.1/jclass/class_loader.c 2007-12-28 18:41:58.000000000 +0100
+@@ -40,6 +40,8 @@
+ #include <jclass/jstring.h>
+ #include <jclass/jar.h>
+
++#include <jclass/open.h>
++
+ #include "strtok_r.h"
+
+ #ifdef __WIN32__
+@@ -212,7 +214,7 @@
+ absolute_class_filename[path_len + 1] = '\0';
+ strcat(absolute_class_filename, class_filename);
+
+- file_ptr = fopen(absolute_class_filename,"rb");
++ file_ptr = my_open(absolute_class_filename,"rb");
+ if (file_ptr) {
+ fclose(file_ptr);
+ break;
+@@ -292,7 +294,7 @@
+ absolute_class_filename[path_len + 1] = '\0';
+ strcat(absolute_class_filename, class_filename);
+
+- class_file_info->file_ptr = fopen(absolute_class_filename,"rb");
++ class_file_info->file_ptr = my_open(absolute_class_filename,"rb");
+ free(absolute_class_filename);
+ if(class_file_info->file_ptr != NULL)
+ break;
+diff -urNad jclassinfo-0.19.1~/jclass/jar.c jclassinfo-0.19.1/jclass/jar.c
+--- jclassinfo-0.19.1~/jclass/jar.c 2004-03-21 06:04:10.000000000 +0100
++++ jclassinfo-0.19.1/jclass/jar.c 2007-12-28 18:41:58.000000000 +0100
+@@ -38,6 +38,8 @@
+ #include <zlib.h>
+ #include <jclass/jar.h>
+
++#include <jclass/open.h>
++
+ static int readcompresszip(JarFile*, const JarEntry*, char*);
+ static int seekcompresszip (JarFile*, const JarEntry*);
+ static uint16_t read_word (char*);
+@@ -211,7 +213,7 @@
+ JarFile *zip = (JarFile *) malloc (sizeof (JarFile));
+
+ /* open */
+- zip->fp = fopen (zipfile, "rb");
++ zip->fp = my_open (zipfile, "rb");
+ if (zip->fp == NULL)
+ {
+ free (zip);
+diff -urNad jclassinfo-0.19.1~/jclass/open.c jclassinfo-0.19.1/jclass/open.c
+--- jclassinfo-0.19.1~/jclass/open.c 1970-01-01 01:00:00.000000000 +0100
++++ jclassinfo-0.19.1/jclass/open.c 2007-12-28 18:41:58.000000000 +0100
+@@ -0,0 +1,32 @@
++/* open.c: a small wrapper around fopen to take care of "-"
++ Copyright 2007 by Vincent Fourmond
++
++ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++*/
++
++#include <stdio.h>
++#include <string.h>
++
++FILE * my_open(const char * file, const char * mode)
++{
++ if(! strcmp(file, "-")) {
++ if(strchr(mode, 'r')) /* Read mode */
++ return fdopen(0, "r");
++ else
++ return fdopen(1, "w");
++ }
++ return fopen(file, mode);
++}
+diff -urNad jclassinfo-0.19.1~/jclass/open.h jclassinfo-0.19.1/jclass/open.h
+--- jclassinfo-0.19.1~/jclass/open.h 1970-01-01 01:00:00.000000000 +0100
++++ jclassinfo-0.19.1/jclass/open.h 2007-12-28 18:41:58.000000000 +0100
+@@ -0,0 +1,20 @@
++/* open.h: a small wrapper around fopen to take care of "-"
++ Copyright 2007 by Vincent Fourmond
++
++ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++*/
++
++FILE * my_open(const char * file, const char * mode);
+diff -urNad jclassinfo-0.19.1~/jclassinfo.1 jclassinfo-0.19.1/jclassinfo.1
+--- jclassinfo-0.19.1~/jclassinfo.1 2004-05-07 13:49:00.000000000 +0200
++++ jclassinfo-0.19.1/jclassinfo.1 2007-12-28 18:43:10.000000000 +0100
+@@ -1,4 +1,4 @@
+-.TH "jclassinfo" "1" "0.18" "jclassinfo" "utils"
++.TH "jclassinfo" "1" "0.19" "jclassinfo" "utils"
+ .SH "NAME"
+ .LP
+ jclassinfo \- Provides information for Java class files.
+@@ -8,7 +8,15 @@
+
+ .SH "DESCRIPTION"
+ .LP
+-jclassinfo reads a class file and provides all sorts of information about it.
++jclassinfo reads a class file and provides all sorts of information
++about it.
++.I file
++can be
++.I -
++then
++.B jclassinfo
++reads a classfile from standard input.
++
+ .SH "OPTIONS"
+ .LP
+ .TP
Deleted: trunk/jclassinfo/debian/patches/02-use-stdin.dpatch
===================================================================
--- trunk/jclassinfo/debian/patches/02-use-stdin.dpatch 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/patches/02-use-stdin.dpatch 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,187 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-use-stdin.dpatch by <fourmond at debian.org>
-##
-## DP: Adds some code so that the "-" argument for stdin works.
-
- at DPATCH@
-diff -urNad jclassinfo-0.19.1~/jclass/Makefile.am jclassinfo-0.19.1/jclass/Makefile.am
---- jclassinfo-0.19.1~/jclass/Makefile.am 2007-12-28 18:41:58.000000000 +0100
-+++ jclassinfo-0.19.1/jclass/Makefile.am 2007-12-28 18:41:58.000000000 +0100
-@@ -29,8 +29,9 @@
- constant_pool.c \
- field.c \
- jar.c \
-- java_file.c \
-+ java_file.c \
- java_buf.c \
- jstring.c \
- manifest.c \
-+ open.h open.c \
- strtok_r.h strtok_r.c
-diff -urNad jclassinfo-0.19.1~/jclass/class.c jclassinfo-0.19.1/jclass/class.c
---- jclassinfo-0.19.1~/jclass/class.c 2004-05-07 13:44:44.000000000 +0200
-+++ jclassinfo-0.19.1/jclass/class.c 2007-12-28 18:41:58.000000000 +0100
-@@ -28,6 +28,8 @@
- #include <jclass/jstring.h>
- #include <jclass/class_loader.h>
-
-+#include <jclass/open.h>
-+
- /*
- *
- * libjclass API reference
-@@ -74,7 +76,7 @@
- if(filename == NULL)
- return NULL;
-
-- is_filename = (strlen(filename) > 6) && !strcmp(".class", &filename[strlen(filename) - 6]);
-+ is_filename = ((strlen(filename) > 6) && !strcmp(".class", &filename[strlen(filename) - 6]) || (!strcmp(filename, "-")));
-
- if(!is_filename)
- {
-@@ -96,7 +98,7 @@
- }
- else
- {
-- classfile = fopen(filename, "rb");
-+ classfile = my_open(filename, "rb");
- new_class = jclass_class_new_from_file(classfile);
- }
-
-diff -urNad jclassinfo-0.19.1~/jclass/class_loader.c jclassinfo-0.19.1/jclass/class_loader.c
---- jclassinfo-0.19.1~/jclass/class_loader.c 2004-07-10 17:15:10.000000000 +0200
-+++ jclassinfo-0.19.1/jclass/class_loader.c 2007-12-28 18:41:58.000000000 +0100
-@@ -40,6 +40,8 @@
- #include <jclass/jstring.h>
- #include <jclass/jar.h>
-
-+#include <jclass/open.h>
-+
- #include "strtok_r.h"
-
- #ifdef __WIN32__
-@@ -212,7 +214,7 @@
- absolute_class_filename[path_len + 1] = '\0';
- strcat(absolute_class_filename, class_filename);
-
-- file_ptr = fopen(absolute_class_filename,"rb");
-+ file_ptr = my_open(absolute_class_filename,"rb");
- if (file_ptr) {
- fclose(file_ptr);
- break;
-@@ -292,7 +294,7 @@
- absolute_class_filename[path_len + 1] = '\0';
- strcat(absolute_class_filename, class_filename);
-
-- class_file_info->file_ptr = fopen(absolute_class_filename,"rb");
-+ class_file_info->file_ptr = my_open(absolute_class_filename,"rb");
- free(absolute_class_filename);
- if(class_file_info->file_ptr != NULL)
- break;
-diff -urNad jclassinfo-0.19.1~/jclass/jar.c jclassinfo-0.19.1/jclass/jar.c
---- jclassinfo-0.19.1~/jclass/jar.c 2004-03-21 06:04:10.000000000 +0100
-+++ jclassinfo-0.19.1/jclass/jar.c 2007-12-28 18:41:58.000000000 +0100
-@@ -38,6 +38,8 @@
- #include <zlib.h>
- #include <jclass/jar.h>
-
-+#include <jclass/open.h>
-+
- static int readcompresszip(JarFile*, const JarEntry*, char*);
- static int seekcompresszip (JarFile*, const JarEntry*);
- static uint16_t read_word (char*);
-@@ -211,7 +213,7 @@
- JarFile *zip = (JarFile *) malloc (sizeof (JarFile));
-
- /* open */
-- zip->fp = fopen (zipfile, "rb");
-+ zip->fp = my_open (zipfile, "rb");
- if (zip->fp == NULL)
- {
- free (zip);
-diff -urNad jclassinfo-0.19.1~/jclass/open.c jclassinfo-0.19.1/jclass/open.c
---- jclassinfo-0.19.1~/jclass/open.c 1970-01-01 01:00:00.000000000 +0100
-+++ jclassinfo-0.19.1/jclass/open.c 2007-12-28 18:41:58.000000000 +0100
-@@ -0,0 +1,32 @@
-+/* open.c: a small wrapper around fopen to take care of "-"
-+ Copyright 2007 by Vincent Fourmond
-+
-+ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+*/
-+
-+#include <stdio.h>
-+#include <string.h>
-+
-+FILE * my_open(const char * file, const char * mode)
-+{
-+ if(! strcmp(file, "-")) {
-+ if(strchr(mode, 'r')) /* Read mode */
-+ return fdopen(0, "r");
-+ else
-+ return fdopen(1, "w");
-+ }
-+ return fopen(file, mode);
-+}
-diff -urNad jclassinfo-0.19.1~/jclass/open.h jclassinfo-0.19.1/jclass/open.h
---- jclassinfo-0.19.1~/jclass/open.h 1970-01-01 01:00:00.000000000 +0100
-+++ jclassinfo-0.19.1/jclass/open.h 2007-12-28 18:41:58.000000000 +0100
-@@ -0,0 +1,20 @@
-+/* open.h: a small wrapper around fopen to take care of "-"
-+ Copyright 2007 by Vincent Fourmond
-+
-+ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+*/
-+
-+FILE * my_open(const char * file, const char * mode);
-diff -urNad jclassinfo-0.19.1~/jclassinfo.1 jclassinfo-0.19.1/jclassinfo.1
---- jclassinfo-0.19.1~/jclassinfo.1 2004-05-07 13:49:00.000000000 +0200
-+++ jclassinfo-0.19.1/jclassinfo.1 2007-12-28 18:43:10.000000000 +0100
-@@ -1,4 +1,4 @@
--.TH "jclassinfo" "1" "0.18" "jclassinfo" "utils"
-+.TH "jclassinfo" "1" "0.19" "jclassinfo" "utils"
- .SH "NAME"
- .LP
- jclassinfo \- Provides information for Java class files.
-@@ -8,7 +8,15 @@
-
- .SH "DESCRIPTION"
- .LP
--jclassinfo reads a class file and provides all sorts of information about it.
-+jclassinfo reads a class file and provides all sorts of information
-+about it.
-+.I file
-+can be
-+.I -
-+then
-+.B jclassinfo
-+reads a classfile from standard input.
-+
- .SH "OPTIONS"
- .LP
- .TP
Copied: trunk/jclassinfo/debian/patches/03-fix-malloc.diff (from rev 13548, trunk/jclassinfo/debian/patches/03-fix-malloc.dpatch)
===================================================================
--- trunk/jclassinfo/debian/patches/03-fix-malloc.diff (rev 0)
+++ trunk/jclassinfo/debian/patches/03-fix-malloc.diff 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Author: Vincent Fourmond <fourmond at debian.org>
+## Description: fix memory allocation error
+##
+
+ at DPATCH@
+diff -urNad jclassinfo-0.19.1~/jclass/jstring.c jclassinfo-0.19.1/jclass/jstring.c
+--- jclassinfo-0.19.1~/jclass/jstring.c 2004-03-21 05:33:07.000000000 +0100
++++ jclassinfo-0.19.1/jclass/jstring.c 2010-01-26 20:48:45.091764004 +0100
+@@ -199,7 +199,8 @@
+ number = strdup("0");
+ else
+ {
+- number = (char*) malloc(40);
++ /* Of course... */
++ number = (char*) malloc(41);
+ number[40] = '\0';
+
+ /* set sign */
Deleted: trunk/jclassinfo/debian/patches/03-fix-malloc.dpatch
===================================================================
--- trunk/jclassinfo/debian/patches/03-fix-malloc.dpatch 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/patches/03-fix-malloc.dpatch 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Author: Vincent Fourmond <fourmond at debian.org>
-## Description: fix memory allocation error
-##
-
- at DPATCH@
-diff -urNad jclassinfo-0.19.1~/jclass/jstring.c jclassinfo-0.19.1/jclass/jstring.c
---- jclassinfo-0.19.1~/jclass/jstring.c 2004-03-21 05:33:07.000000000 +0100
-+++ jclassinfo-0.19.1/jclass/jstring.c 2010-01-26 20:48:45.091764004 +0100
-@@ -199,7 +199,8 @@
- number = strdup("0");
- else
- {
-- number = (char*) malloc(40);
-+ /* Of course... */
-+ number = (char*) malloc(41);
- number[40] = '\0';
-
- /* set sign */
Added: trunk/jclassinfo/debian/patches/04-newer-jvms.diff
===================================================================
--- trunk/jclassinfo/debian/patches/04-newer-jvms.diff (rev 0)
+++ trunk/jclassinfo/debian/patches/04-newer-jvms.diff 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1,30 @@
+Author: Vincent Fourmond <fourmond at debian.org>
+Description: Allow jclassinfo to recognize class files written by
+ recent JVM (numbers come from http://en.wikipedia.org/wiki/Java_class_file)
+
+Index: jclassinfo-0.19.1/jclass/class.c
+===================================================================
+--- jclassinfo-0.19.1.orig/jclass/class.c 2011-04-17 23:02:46.611166770 +0200
++++ jclassinfo-0.19.1/jclass/class.c 2011-04-17 23:03:21.219166790 +0200
+@@ -181,7 +181,7 @@
+ const char* jclass_class_get_vm_spec(JavaClass* class_struct)
+ {
+ char* vm_spec;
+- static char* spec_string[] = { "unknown", "1.1", "1.2", "1.3", "1.4"};
++ static char* spec_string[] = { "unknown", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6" };
+
+ if(class_struct == NULL)
+ return NULL;
+@@ -200,6 +200,12 @@
+ case 48:
+ vm_spec = spec_string[4];
+ break;
++ case 49:
++ vm_spec = spec_string[5];
++ break;
++ case 50:
++ vm_spec = spec_string[6];
++ break;
+ default:
+ vm_spec = spec_string[0];
+ }
Added: trunk/jclassinfo/debian/patches/05-fix-jstring-memory.diff
===================================================================
--- trunk/jclassinfo/debian/patches/05-fix-jstring-memory.diff (rev 0)
+++ trunk/jclassinfo/debian/patches/05-fix-jstring-memory.diff 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1,17 @@
+Author: Vincent Fourmond <fourmond at debian.org>
+Description: Fix a small flaw in the computation of the display string length
+
+Index: jclassinfo-0.19.1/jclass/jstring.c
+===================================================================
+--- jclassinfo-0.19.1.orig/jclass/jstring.c 2011-04-17 23:09:38.523167000 +0200
++++ jclassinfo-0.19.1/jclass/jstring.c 2011-04-17 23:15:30.663167194 +0200
+@@ -114,6 +114,9 @@
+ string_length++;
+ else if(*str_ptr < ' ')
+ string_length += 2;
++ else if(*str_ptr == '\\' ||
++ *str_ptr == '"')
++ string_length++;
+
+ str_ptr++;
+ }
Copied: trunk/jclassinfo/debian/patches/series (from rev 13548, trunk/jclassinfo/debian/patches/00list)
===================================================================
--- trunk/jclassinfo/debian/patches/series (rev 0)
+++ trunk/jclassinfo/debian/patches/series 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1,5 @@
+01-make-static-lib.diff
+02-use-stdin.diff
+03-fix-malloc.diff
+04-newer-jvms.diff
+05-fix-jstring-memory.diff
Modified: trunk/jclassinfo/debian/rules
===================================================================
--- trunk/jclassinfo/debian/rules 2011-04-17 17:55:48 UTC (rev 13548)
+++ trunk/jclassinfo/debian/rules 2011-04-17 21:57:12 UTC (rev 13549)
@@ -1,90 +1,12 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-include /usr/share/dpatch/dpatch.make
-
-config.status: configure patch-stamp
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
+override_dh_auto_configure:
+# We modify one of the Makefile.am stuff, we need to re-run the AM/AC tools
libtoolize -f
aclocal
automake
autoconf
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-
-build-stamp: patch-stamp config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -r Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/jclassinfo.
- cd jclassinfo && $(MAKE) DESTDIR=$(CURDIR)/debian/jclassinfo install
- cd xml && $(MAKE) DESTDIR=$(CURDIR)/debian/jclassinfo install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installman
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ dh_auto_configure
Added: trunk/jclassinfo/debian/source/format
===================================================================
--- trunk/jclassinfo/debian/source/format (rev 0)
+++ trunk/jclassinfo/debian/source/format 2011-04-17 21:57:12 UTC (rev 13549)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list