The following commit has been merged in the master branch: commit d2efc459c4d3ce1c46474d7f4361299a81f0275c Author: Scott Howard <show...@debian.org> Date: Mon Oct 31 03:04:23 2011 -0400
Added librxtx-java-dbg package and added uninstall target (Closes: #646356) diff --git a/debian/changelog b/debian/changelog index 1350400..100b8e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,10 @@ rxtx (2.2pre2-10) UNRELEASED; urgency=low * debian/patches/multiple_property_dirs.patch - handles the case where the "java.ext.dirs" system property contains more than one directory. (Closes: #646069) Thanks Philip Ashmore. - * Added librxtx-java-dbg package + * Added librxtx-java-dbg package and added uninstall target + (Closes: #646356) - -- Scott Howard <show...@debian.org> Sun, 30 Oct 2011 09:05:27 -0400 + -- Scott Howard <show...@debian.org> Mon, 31 Oct 2011 02:00:03 -0400 rxtx (2.2pre2-9) unstable; urgency=low diff --git a/debian/control b/debian/control index 2ca9d21..513efdd 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Homepage: http://www.rxtx.org Vcs-Git: git://git.debian.org/pkg-java/rxtx.git Vcs-Browser: http://git.debian.org/?p=pkg-java/rxtx.git - Package: librxtx-java Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends} @@ -19,18 +18,18 @@ Recommends: ${java:Recommends} Provides: lib-rxtx-java Conflicts: lib-rxtx-java Description: Full Java CommAPI implementation - RXTX is a full implementation of the Java CommAPI from Sun. It contains - native libraries providing serial and parallel communication for the - Java Development Toolkit. + RXTX is a full implementation of the Java CommAPI from Sun. It + contains native libraries providing serial and parallel + communication for the Java Development Toolkit. Package: librxtx-java-dbg Architecture: any Section: debug -Priority:extra +Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, librxtx-java (= ${binary:Version}) Description: Full Java CommAPI implementation, Debugging Symbols - RXTX is a full implementation of the Java CommAPI from Sun. It contains - native libraries providing serial and parallel communication for the - Java Development Toolkit. + RXTX is a full implementation of the Java CommAPI from Sun. It + contains native libraries providing serial and parallel + communication for the Java Development Toolkit. . This package contains the debugging symbols for librxtx-java. diff --git a/debian/librxtx-java.dirs b/debian/librxtx-java.dirs index d462b3d..956d28f 100644 --- a/debian/librxtx-java.dirs +++ b/debian/librxtx-java.dirs @@ -1 +1,2 @@ usr/lib/jni +usr/share/java diff --git a/debian/patches/original_debian_changes.patch b/debian/patches/original_debian_changes.patch index dd5fba5..32e9913 100644 --- a/debian/patches/original_debian_changes.patch +++ b/debian/patches/original_debian_changes.patch @@ -3,8 +3,8 @@ Origin: Mario Joussen <jous...@debian.org>, edited by Scott Howard <showard314@g Index: rxtx/src/RS485Imp.c =================================================================== ---- rxtx.orig/src/RS485Imp.c 2011-02-06 12:48:09.014571293 -0500 -+++ rxtx/src/RS485Imp.c 2011-02-06 12:48:09.074567537 -0500 +--- rxtx.orig/src/RS485Imp.c 2011-10-31 02:58:18.280985274 -0400 ++++ rxtx/src/RS485Imp.c 2011-10-31 02:58:21.300985346 -0400 @@ -127,6 +127,7 @@ #endif /* !__FreeBSD_kernel__ */ #if defined(__linux__) @@ -23,9 +23,9 @@ Index: rxtx/src/RS485Imp.c } Index: rxtx/src/RawImp.c =================================================================== ---- rxtx.orig/src/RawImp.c 2011-02-06 12:48:09.034570041 -0500 -+++ rxtx/src/RawImp.c 2011-02-06 12:48:09.074567537 -0500 -@@ -280,6 +280,7 @@ +--- rxtx.orig/src/RawImp.c 2011-10-31 02:58:18.280985274 -0400 ++++ rxtx/src/RawImp.c 2011-10-31 02:58:21.300985346 -0400 +@@ -272,6 +272,7 @@ #endif /* !__FreeBSD_kernel__ */ #if defined(__linux__) /* Lets let people who upgraded kernels know they may have problems */ @@ -33,7 +33,7 @@ Index: rxtx/src/RawImp.c if (uname (&name) == -1) { fprintf(stderr,"RXTX WARNING: cannot get system name\n"); -@@ -290,6 +291,7 @@ +@@ -282,6 +283,7 @@ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); getchar(); } @@ -43,8 +43,8 @@ Index: rxtx/src/RawImp.c } Index: rxtx/src/SerialImp.c =================================================================== ---- rxtx.orig/src/SerialImp.c 2011-02-06 12:48:09.014571293 -0500 -+++ rxtx/src/SerialImp.c 2011-02-06 12:48:09.074567537 -0500 +--- rxtx.orig/src/SerialImp.c 2011-10-31 02:58:18.284985274 -0400 ++++ rxtx/src/SerialImp.c 2011-10-31 02:58:21.304985346 -0400 @@ -320,6 +320,7 @@ #endif /* DEBUG_TIMING */ #if defined(DEBUG) && defined(__linux__) @@ -63,8 +63,8 @@ Index: rxtx/src/SerialImp.c } Index: rxtx/src/I2CImp.c =================================================================== ---- rxtx.orig/src/I2CImp.c 2011-02-06 12:48:09.014571293 -0500 -+++ rxtx/src/I2CImp.c 2011-02-06 12:48:09.074567537 -0500 +--- rxtx.orig/src/I2CImp.c 2011-10-31 02:58:18.284985274 -0400 ++++ rxtx/src/I2CImp.c 2011-10-31 02:58:21.304985346 -0400 @@ -127,6 +127,7 @@ #endif /* !__FreeBSD_kernel__ */ #if defined(__linux__) @@ -83,8 +83,8 @@ Index: rxtx/src/I2CImp.c } Index: rxtx/src/SerialImp.cpp =================================================================== ---- rxtx.orig/src/SerialImp.cpp 2011-02-06 12:48:09.014571293 -0500 -+++ rxtx/src/SerialImp.cpp 2011-02-06 12:48:09.074567537 -0500 +--- rxtx.orig/src/SerialImp.cpp 2011-10-31 02:58:18.284985274 -0400 ++++ rxtx/src/SerialImp.cpp 2011-10-31 02:58:21.304985346 -0400 @@ -142,6 +142,7 @@ #endif /* !__FreeBSD_kernel__ */ #ifdef DEBUG @@ -103,17 +103,9 @@ Index: rxtx/src/SerialImp.cpp #endif /* WIN32 */ Index: rxtx/Makefile.am =================================================================== ---- rxtx.orig/Makefile.am 2011-02-06 12:47:42.176251117 -0500 -+++ rxtx/Makefile.am 2011-02-06 12:49:00.791328665 -0500 -@@ -127,7 +127,6 @@ - echo $$i; \ - fi; \ - done` $(RXTX_PATH) -- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ - - clean-generic: - rm -rf $(DEST) $(TOP)/$(CLASSTOP) -@@ -137,7 +136,8 @@ +--- rxtx.orig/Makefile.am 2011-10-31 02:55:54.600981860 -0400 ++++ rxtx/Makefile.am 2011-10-31 02:58:21.304985346 -0400 +@@ -137,7 +137,8 @@ # create the javadoc files. docs: $(CLASSES) diff --git a/debian/patches/series b/debian/patches/series index 9a4ec0f..a3939a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ kfreebsd_libpthread.patch sys_io_h_check.patch port_to_hurd.patch multiple_property_dirs.patch +uninstall_target.patch diff --git a/debian/patches/uninstall_target.patch b/debian/patches/uninstall_target.patch new file mode 100644 index 0000000..a0e8c55 --- /dev/null +++ b/debian/patches/uninstall_target.patch @@ -0,0 +1,18 @@ +Description: adds uninstall target to Makefile +Author: Scott Howard <show...@debian.org> +Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646069 +Index: rxtx/Makefile.am +=================================================================== +--- rxtx.orig/Makefile.am 2011-10-31 02:43:21.532963961 -0400 ++++ rxtx/Makefile.am 2011-10-31 02:46:03.348967808 -0400 +@@ -129,6 +129,10 @@ + done` $(RXTX_PATH) + $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ + ++uninstall: ++ cd $(RXTX_PATH) && $(RM) librxtx* ++ $(RM) $(JHOME)/$(JARTARGET) ++ + clean-generic: + rm -rf $(DEST) $(TOP)/$(CLASSTOP) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -- Packaging for rxtx _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits