r1840 - in trunk/jmp/debian: . patches

Wolfgang Bär wbaer-guest at costa.debian.org
Wed Feb 1 19:57:02 UTC 2006 

Author: wbaer-guest
Date: 2006-02-01 19:57:02 +0000 (Wed, 01 Feb 2006)
New Revision: 1840

Removed:
   trunk/jmp/debian/jmp.1
   trunk/jmp/debian/patches/02_de_po.dpatch
Modified:
   trunk/jmp/debian/README.Debian
   trunk/jmp/debian/changelog
   trunk/jmp/debian/control
   trunk/jmp/debian/manpages
   trunk/jmp/debian/patches/00list
   trunk/jmp/debian/patches/01_Makefile_in.dpatch
   trunk/jmp/debian/rules
Log:
New upstream

Modified: trunk/jmp/debian/README.Debian
===================================================================
--- trunk/jmp/debian/README.Debian	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/README.Debian	2006-02-01 19:57:02 UTC (rev 1840)
@@ -18,6 +18,9 @@
 
 $ kaffe -Xrunjmp HelloWorld
 
+For non-gui apps you need to stop termination of program by requesting some
+input. Put a System.in.read() before the end of the main method.
+
 Further informations and explanation of the different options
 for jmp are available in the manpage (man jmp). 
 

Modified: trunk/jmp/debian/changelog
===================================================================
--- trunk/jmp/debian/changelog	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/changelog	2006-02-01 19:57:02 UTC (rev 1840)
@@ -1,3 +1,14 @@
+jmp (0.48-1) unstable; urgency=low
+
+  * New upstream release
+  * de.po fixes and manpage was added upstream - remove de.po patch
+    and the manpage in the debian directory.
+  * Extended README.Debian to mention the System.in.read() hack
+  * Use DESTDIR for installation to correctly install manpage
+  * Build-dep and use chrpath to remove rpath and fix lintian warning
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 31 Jan 2006 17:44:25 +0100
+
 jmp (0.47-1) unstable; urgency=low
 
   * New upstream release (closes: #280636)

Modified: trunk/jmp/debian/control
===================================================================
--- trunk/jmp/debian/control	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/control	2006-02-01 19:57:02 UTC (rev 1840)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), kaffe-dev (>= 2:1.1.6-3), pkg-config (>= 0.11.0), libglib2.0-dev (>= 2.0.1), libgtk2.0-dev (>= 2.0.2), libpango1.0-dev (>= 1.0.1), dpatch
+Build-Depends: debhelper (>= 4.2.30), kaffe-dev (>= 2:1.1.6-3), pkg-config (>= 0.11.0), libglib2.0-dev (>= 2.0.1), libgtk2.0-dev (>= 2.0.2), libpango1.0-dev (>= 1.0.1), dpatch, chrpath
 Standards-Version: 3.6.2
  
 Package: jmp

Deleted: trunk/jmp/debian/jmp.1
===================================================================
--- trunk/jmp/debian/jmp.1	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/jmp.1	2006-02-01 19:57:02 UTC (rev 1840)
@@ -1,80 +0,0 @@
-.TH jmp 1 "September 2005" "Debian/GNU Linux"
-.SH NAME
-jmp \- a Java Memory Profiler.
-
-.SH SYNOPSIS
-
-\fBjava -Xrunjmp:\fR[\fIOPTION1,OPTION2,...\fR] \fIMainClass\fR
-
-.SH DESCRIPTION
-
-.B jmp 
-is a Java memory profiler which is dynamically loaded by executing the java
-program with the -Xrunjmp option. Currently the kaffe virtual machine and the
-non-free JDK/JREs are supporting the profiling extensions.
-
-.SH OPTIONS
-
-.TP
-\fBhelp\fR
-print available options
-.TP
-\fBnogui\fR
-run jmp without an user interface
-.TP
-\fBdumpdir=\fR<\fIdirectory\fR>
-specifies a directory for writing the data and heap files
-.TP
-\fBdumptimer=\fR<\fIseconds\fR>
-specifies to dump the data at a fixed intervall
-.TP
-\fBfilter=\fR\fI[[+-][filtertype:]][name]\fR
-adds an initial filter for name. It is possible to give several filter to include more than one package. If you want several filters you have to write them as multiple options. Use + for and inclusive filter, use - for an exclude filter. + is the default and may be left out.
-
-The available filtertypes are \fIclass\fR, \fIpackage\fR, \fIrecursive\fR and \fIall\fR. The name is either the class name (for filtertype class), a package name (for filtertype package and recursive) or any free text (for the filtertype all). Filters apply in the ordering given on the command line.
-
-Example: filter=package1,filter=some.package,filter=-package:some.package.sub
-
-.TP
-\fBthreadtime\fR
-use thread time instead of absolute time
-.TP
-\fBnoobjects\fR
-turn object profiling off
-.TP
-\fBnomethods\fR
-turn method profiling off
-.TP
-\fBnomonitors\fR
-turn monitor profiling off
-.TP
-\fBallocfollowsfilter\fR
-group object allocations into filtered methods
-
-.SH EXAMPLES
-
-Examples of how jmp can be run for different profiling tasks.
-
-\fBjava -Xrunjmp:noobjects,nomethods,nomonitors my.MainClass\fR
-
-This will start jmp with a minimum of tracing. This is very useful if you have an initialization that takes much time.
-Once your application has reached a suitable state for profiling you enable the profiling you need.
-
-\fBjava -Xrunjmp:noobjects,nomonitors,filter=my my.MainClass\fR
-
-This will start jmp with only method tracing on. An initial filter for classes in my and sub packages is also set.
-
-\fBjava -Xrunjmp:nomethods,nomonitors,filter=my my.MainClass\fR
-
-This will start jmp with only object tracing on. Filter as above.
-
-\fBjava -Xrunjmp:nomonitors,filter=my my.MainClass\fR
-
-This will start jmp with object and method tracing. Filter as above.
-
-.SH SEE ALSO
-the website for further information <http://www.khelekore.org/jmp/>
-
-.SH AUTHOR
-This manpage is based on the jmp user guide and written by Wolfgang Baer <WBaer at gmx.de>, for the Debian project (but may
-be used by others).

Modified: trunk/jmp/debian/manpages
===================================================================
--- trunk/jmp/debian/manpages	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/manpages	2006-02-01 19:57:02 UTC (rev 1840)
@@ -1 +1 @@
-debian/jmp.1
+jmp.1

Modified: trunk/jmp/debian/patches/00list
===================================================================
--- trunk/jmp/debian/patches/00list	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/patches/00list	2006-02-01 19:57:02 UTC (rev 1840)
@@ -1,2 +1 @@
 01_Makefile_in.dpatch
-02_de_po.dpatch

Modified: trunk/jmp/debian/patches/01_Makefile_in.dpatch
===================================================================
--- trunk/jmp/debian/patches/01_Makefile_in.dpatch	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/patches/01_Makefile_in.dpatch	2006-02-01 19:57:02 UTC (rev 1840)
@@ -7,9 +7,9 @@
 
 @DPATCH@
 
---- ./Makefile.in	2005-05-22 15:20:23.000000000 +0200
-+++ ./Makefile.in	2005-10-14 22:28:19.000000000 +0200
-@@ -551,16 +551,16 @@
+--- ./Makefile.in.orig	2005-10-29 21:48:51.000000000 +0200
++++ ./Makefile.in	2006-01-20 11:46:31.000000000 +0100
+@@ -702,16 +702,16 @@
  	gcc -shared -o $@ ${OBJECTS} -Wl,--kill-at
  
  jmp/JMPController.class : java/jmp/JMPController.java	

Deleted: trunk/jmp/debian/patches/02_de_po.dpatch
===================================================================
--- trunk/jmp/debian/patches/02_de_po.dpatch	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/patches/02_de_po.dpatch	2006-02-01 19:57:02 UTC (rev 1840)
@@ -1,263 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_de_po.dpatch by  <wbaer at gmx.de>
-##
-## Patch de po file !
-
- at DPATCH@
- 
---- ./po/de.po	2005-10-14 22:06:37.000000000 +0200
-+++ ./po/de.po	2005-10-14 22:12:17.000000000 +0200
-@@ -125,9 +125,9 @@
- msgstr "Kein Filter"
- 
- #: heap_dump.c:91
--#, fuzzy, c-format
-+#, c-format
- msgid "createing heap dump file: %s"
--msgstr "Schreibe Dump-Datei: jmp_heap_dump_%d"
-+msgstr "Erzeuge Speicherauszug-Datei: jmp_heap_dump_%d"
- 
- #: instance_owners.c:133
- #, c-format
-@@ -147,9 +147,7 @@
- #: instance_owners.c:150
- #, c-format
- msgid "not able to determine class(%p) or parent class(%p), probably GC:ed"
--msgstr ""
--"Kann die Klasse (%p)  oder Elternklasse (%p) nicht feststellen, (Garbage "
--"Collection?)"
-+msgstr "Kann die Klasse (%p) oder Elternklasse (%p) nicht feststellen, evtl. bereits vom Speicher entfernt"
- 
- #: instance_owners.c:220 instance_owners.c:514 method_info.c:63
- #: methodlist_menu.c:103 object_dump.c:519 object_dump.c:654
-@@ -159,12 +157,12 @@
- 
- #: instance_owners.c:271
- msgid "expand"
--msgstr ""
-+msgstr "erweitern"
- 
- #: instance_owners.c:277
--#, fuzzy, c-format
-+#, c-format
- msgid "show other instances owned by %s"
--msgstr "Zeige erzeugte Objekte"
-+msgstr "Zeige andere Instanzen die %s gehören"
- 
- #: instance_owners.c:326
- msgid "Instance owners"
-@@ -183,7 +181,7 @@
- 
- #: instance_owners.c:336
- msgid "Expand nodes with right-click menu"
--msgstr ""
-+msgstr "Erweitere Knoten mit Kontext Menü"
- 
- #: instance_owners.c:362
- #, c-format
-@@ -204,17 +202,17 @@
- 
- #: instance_owners.c:550
- msgid "unable to find object"
--msgstr ""
-+msgstr "Kann Objekt nicht finden"
- 
- #: jmp.c:456
- #, c-format
- msgid "teardown called, freeing jmp-data..\n"
--msgstr "Herunterfahren: Gebe JMP-Resourcen frei ...\n"
-+msgstr "Herunterfahren: Gebe JMP-Ressourcen frei ...\n"
- 
- #: jmp.c:474
- #, c-format
- msgid "done freeing jmp-data..\n"
--msgstr "JMP-Resourcen freigegeben.\n"
-+msgstr "JMP-Ressourcen freigegeben.\n"
- 
- #: jmp.c:477
- #, c-format
-@@ -230,9 +228,8 @@
- msgid ""
- "Garbage collection completed: %ld objects moved, %ld objects freed in %lld.%"
- "06lld seconds"
--msgstr ""
--"Speicherbereinigung abgeschlossen: %ld Objekte verschoben, %ld bereinigt "
--"(Zeit: %lld.%06lld Sekunden)"
-+msgstr "Speicherbereinigung abgeschlossen: %ld Objekte verschoben, %ld Objekte freigegeben in %lld.%"
-+"06lld Sekunden"
- 
- #: jmp.c:891
- #, c-format
-@@ -294,14 +291,12 @@
- msgstr "Aufrufgraph"
- 
- #: methodlist_menu.c:166
--#, fuzzy
- msgid "show called methods (down)"
--msgstr "Zeige aufgerufene Methoden"
-+msgstr "Zeige aufgerufene Methoden (abwärts)"
- 
- #: methodlist_menu.c:167
--#, fuzzy
- msgid "show callee methods (up)"
--msgstr "Zeige aufgerufene Methoden"
-+msgstr "Zeige aufgerufene Methoden (aufwärts)"
- 
- #: methodlist_menu.c:168
- msgid "show method info"
-@@ -309,7 +304,7 @@
- 
- #: methodlist_menu.c:170
- msgid "write code usage dump"
--msgstr ""
-+msgstr "Schreibe Auszug der Codenutzung"
- 
- #: object_dump.c:513
- msgid "Owned object statistics"
-@@ -341,9 +336,8 @@
- msgstr "Statistik über die zugehörigen Objekte"
- 
- #: object_dump.c:615
--#, fuzzy
- msgid "show owner"
--msgstr "Zeige Objekteigentümer"
-+msgstr "Zeige Eigentümer"
- 
- #: object_dump.c:646
- msgid "Object dump"
-@@ -476,7 +470,7 @@
- 
- #: ui.c:114
- msgid "Counters restored"
--msgstr "Zählerstände wiede hergestellt."
-+msgstr "Zählerstände wieder hergestellt."
- 
- #: ui.c:120
- msgid "UI updating continued"
-@@ -492,7 +486,7 @@
- 
- #: ui.c:123
- msgid "Un_freeze"
--msgstr "Ausgabe _fortsetzen"
-+msgstr "Ausgabe fortsetzen"
- 
- #: ui.c:171
- msgid "/_File"
-@@ -500,27 +494,27 @@
- 
- #: ui.c:172
- msgid "/File/_Dump"
--msgstr "/Datei/_Bericht"
-+msgstr "/Datei/Bericht"
- 
- #: ui.c:173
- msgid "/File/_Reset counters"
--msgstr "/Datei/_Zähler löschen"
-+msgstr "/Datei/Zähler löschen"
- 
- #: ui.c:174
- msgid "/File/Re_store counters"
--msgstr "/Datei/Zähler _wiederherstellen"
-+msgstr "/Datei/Zähler wiederherstellen"
- 
- #: ui.c:175
- msgid "/File/System GC"
--msgstr "/Datei/Speicher_bereinigung"
-+msgstr "/Datei/Speicherbereinigung"
- 
- #: ui.c:176
- msgid "/File/_Heapdump"
--msgstr "/Datei/Speic_herauszug"
-+msgstr "/Datei/Speicherauszug"
- 
- #: ui.c:177
- msgid "/File/_Monitors"
--msgstr "/Datei/_Monitore"
-+msgstr "/Datei/Monitore"
- 
- #: ui.c:178
- msgid "/File/_Freeze UI"
-@@ -536,16 +530,15 @@
- 
- #: ui.c:181
- msgid "/Options/Filter"
--msgstr "/Optionen/_Filter"
-+msgstr "/Optionen/Filter"
- 
- #: ui.c:182
- msgid "/Options/Events"
--msgstr "/Optionen/_Monitor"
-+msgstr "/Optionen/Ereignisse"
- 
- #: ui.c:183
--#, fuzzy
- msgid "/Options/Visible Rows"
--msgstr "/Optionen/_Filter"
-+msgstr "/Optionen/Sichtbare Zeilen"
- 
- #: ui.c:184
- msgid "/_Help"
-@@ -553,7 +546,7 @@
- 
- #: ui.c:185
- msgid "/_Help/About"
--msgstr "/Hilfe/_Über"
-+msgstr "/Hilfe/Über"
- 
- #: ui.c:197
- msgid "Java Memory Profiler - Main"
-@@ -561,7 +554,7 @@
- 
- #: ui.c:215
- msgid "_Dump"
--msgstr "_Bericht"
-+msgstr "Bericht"
- 
- #: ui.c:215
- msgid "Dump data to a text file"
-@@ -569,7 +562,7 @@
- 
- #: ui.c:217
- msgid "_Reset"
--msgstr "_Reset"
-+msgstr "Rücksetzen"
- 
- #: ui.c:217
- msgid "Reset counters to zero"
-@@ -577,15 +570,15 @@
- 
- #: ui.c:219
- msgid "Re_store"
--msgstr "_Wiederherstellen"
-+msgstr "Wiederherstellen"
- 
- #: ui.c:219
- msgid "Restore counters to the standard (full) values"
--msgstr "Setzt die Zählerstände auf die standardmässigen (vollen) Werte."
-+msgstr "Setzt die Zählerstände auf die standardmäßigen (vollen) Werte."
- 
- #: ui.c:221
- msgid "System._GC"
--msgstr "Speicher_bereinigung"
-+msgstr "Speicherbereinigung"
- 
- #: ui.c:221
- msgid "Run the java virtual machines garbage collector"
-@@ -593,7 +586,7 @@
- 
- #: ui.c:223
- msgid "_Heapdump"
--msgstr "_Heapdump"
-+msgstr "Speicherauszug"
- 
- #: ui.c:223
- msgid "Show the current heap"
-@@ -617,7 +610,7 @@
- 
- #: ui.c:276
- msgid "Ok"
--msgstr "Läuft ..."
-+msgstr "Ok"
- 
- #: ui.c:377
- #, c-format

Modified: trunk/jmp/debian/rules
===================================================================
--- trunk/jmp/debian/rules	2006-01-29 22:11:40 UTC (rev 1839)
+++ trunk/jmp/debian/rules	2006-02-01 19:57:02 UTC (rev 1840)
@@ -10,7 +10,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+	./configure --disable-rpath --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
 	touch configure-stamp
 
 
@@ -27,7 +27,6 @@
 	dh_testroot
 	-$(MAKE) distclean
 	rm -f config.log build-stamp configure-stamp jmp/JMPController.class
-	rm -f po/de.gmo
 	dh_clean
 
 
@@ -37,7 +36,9 @@
 	dh_clean -k
 	dh_installdirs
 	# Add here commands to install the package into debian/jmp.
-	$(MAKE) install prefix=$(CURDIR)/debian/jmp/usr
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/jmp
+	# remove rpath
+	chrpath -d debian/jmp/usr/lib/libjmp.so.0.0.1
 	# install lintian overrides
 	install -d $(CURDIR)/debian/jmp/usr/share/lintian/overrides/
 	install -m 644 $(CURDIR)/debian/lintian $(CURDIR)/debian/jmp/usr/share/lintian/overrides/jmp

More information about the pkg-java-commits mailing list