[Debian-astro-commits] [cpl] 01/02: Drop libcplgasgano26 package
Ole Streicher
olebole at moszumanska.debian.org
Wed Sep 6 18:31:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository cpl.
commit 031b657975f547ec0cccd65866eedeb756cb4806
Author: Ole Streicher <olebole at debian.org>
Date: Wed Sep 6 17:37:52 2017 +0200
Drop libcplgasgano26 package
This library is very rarely used (popcon=1), and depends on an
outdated non-free package (Gasgano). Therefore it must go to contrib,
which makes it difficult to migrate (due to some bug in britney).
---
debian/control | 17 ---------
debian/libcplgasgano26.install | 1 -
debian/libcplgasgano26.symbols | 14 --------
debian/patches/build-cpljava.patch | 70 --------------------------------------
debian/patches/series | 1 -
debian/rules | 2 +-
6 files changed, 1 insertion(+), 104 deletions(-)
diff --git a/debian/control b/debian/control
index fd8d80b..f6041c3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.
Uploaders: Ole Streicher <olebole at debian.org>
Build-Depends: automake (>= 1.13),
debhelper (>= 9),
- default-jdk,
dh-autoreconf,
doxygen,
libcfitsio-dev (>= 3.310) | libcfitsio3-dev (>= 3.310),
@@ -181,19 +180,3 @@ Description: API documentation for ESO's C utility library libcext
(maps, linked lists, queues), memory management, strings, logging and others.
.
The package contains the API documentation for libcpl.
-
-Package: libcplgasgano26
-Architecture: any
-Multi-Arch: same
-Section: contrib/libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Recommends: gasgano
-Description: CPL Java Native Interface library
- This package provides a Java native interface of ESO's Common Pipeline
- Library (CPL) for use with their Gasgano package.
- .
- The Common Pipeline Library (CPL) comprises a set of ISO-C libraries that
- provide a comprehensive, efficient and robust software toolkit. It forms a
- basis for the creation of automated astronomical data-reduction tasks (known
- as "pipelines").
diff --git a/debian/libcplgasgano26.install b/debian/libcplgasgano26.install
deleted file mode 100644
index e290291..0000000
--- a/debian/libcplgasgano26.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libcplgasgano*.so.*
diff --git a/debian/libcplgasgano26.symbols b/debian/libcplgasgano26.symbols
deleted file mode 100644
index 4795cd0..0000000
--- a/debian/libcplgasgano26.symbols
+++ /dev/null
@@ -1,14 +0,0 @@
-libcplgasgano.so.26 libcplgasgano26 #MINVER#
- Java_org_eso_cpl_jni_CPLControl_nativeEnsureSetup at Base 6.1
- Java_org_eso_cpl_jni_CPLControl_nativeGetVersion at Base 6.1
- Java_org_eso_cpl_jni_JNIParameterImp_nativeSetValue at Base 6.1
- Java_org_eso_cpl_jni_JNIRecipe_nativeDeinitialize at Base 6.1
- Java_org_eso_cpl_jni_JNIRecipe_nativeExecute at Base 6.1
- Java_org_eso_cpl_jni_JNIRecipe_nativeGetFrameArray at Base 6.1
- Java_org_eso_cpl_jni_JNIRecipe_nativeGetParameterArray at Base 6.1
- Java_org_eso_cpl_jni_JNIRecipe_nativeInitialize at Base 6.1
- Java_org_eso_cpl_jni_JNIRecipe_nativeSetFrameArray at Base 6.1
- Java_org_eso_cpl_jni_LibraryLoader_nativeLTDLExit at Base 6.1
- Java_org_eso_cpl_jni_LibraryLoader_nativeLTDLInit at Base 6.1
- Java_org_eso_cpl_jni_LibraryLoader_nativeMakeLibrary at Base 6.1
- Java_org_eso_cpl_jni_PluginLibrary_nativeUnload at Base 6.1
diff --git a/debian/patches/build-cpljava.patch b/debian/patches/build-cpljava.patch
deleted file mode 100644
index c00efbe..0000000
--- a/debian/patches/build-cpljava.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Author: Sergio Gelato
-Description: Allow building that JNI interface without having Gasgano
- installed. This helps to keep the main packages in main, since Gasgano
- is non-free.
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -615,7 +615,6 @@
- [
-
- AC_REQUIRE([CPL_PATH_JAVA])
-- AC_REQUIRE([CPL_CLASSPATH_GASGANO])
-
- AC_ARG_ENABLE(gasgano,
- AC_HELP_STRING([--enable-gasgano],
-@@ -629,7 +628,7 @@
- cpl_gasgano_support="no"
- AC_MSG_RESULT([no])
- else
-- if test -n "$JAVA_INCLUDES" && test -n "$GASGANO_CLASSPATH"; then
-+ if test -n "$JAVA_INCLUDES"; then
- cpl_gasgano_support="yes"
- AC_MSG_RESULT([yes])
- else
---- a/cpljava/Makefile.am
-+++ b/cpljava/Makefile.am
-@@ -32,26 +32,10 @@
- AM_CPPFLAGS = $(CPLCORE_INCLUDES) $(CPLUI_INCLUDES) $(CPLDFS_INCLUDES) \
- $(CX_INCLUDES) $(JAVA_INCLUDES) $(INCLTDL)
-
--GASGANO_NATIVE_INCLUDES = org_eso_cpl_jni_CPLControl.h \
-- org_eso_cpl_jni_JNIParameterImp.h \
-- org_eso_cpl_jni_JNIRecipe.h \
-- org_eso_cpl_jni_LibraryLoader.h \
-- org_eso_cpl_jni_PluginLibrary.h
--
--BUILT_SOURCES = $(GASGANO_NATIVE_INCLUDES)
--
- lib_LTLIBRARIES = libcplgasgano.la
-
--nodist_noinst_HEADERS = $(GASGANO_NATIVE_INCLUDES)
--
- libcplgasgano_la_SOURCES = cpl_gasgano.c
-
- libcplgasgano_la_LDFLAGS = $(CX_LDFLAGS) $(GASGANO_SHREXT) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libcplgasgano_la_LIBADD = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCEXT) $(LIBLTDL)
- libcplgasgano_la_DEPENDENCIES = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBLTDL)
--
--
--$(GASGANO_NATIVE_INCLUDES):
-- @class="`echo $@ | sed -e 's/\.h$$//' | sed -e 's/_/\./g'`"; \
-- echo "$(JAVAH) -classpath $(GASGANO_CLASSPATH) $$class"; \
-- $(JAVAH) -classpath $(GASGANO_CLASSPATH) $$class;
---- a/cpljava/cpl_gasgano.c
-+++ b/cpljava/cpl_gasgano.c
-@@ -58,6 +58,7 @@
- #include "cpl_version.h"
- #include "cpl_memory.h"
-
-+#if 0 /* headers not shipped with CPL, not needed for building */
- #include "org_eso_cpl_jni_CPLControl.h"
- #include "org_eso_cpl_jni_JNIParameterImp.h"
- #include "org_eso_cpl_jni_JNIRecipe.h"
-@@ -68,6 +69,7 @@
- defined (ENABLE_NATIVE_TESTS)
- # include "org_eso_cpl_test_NativeTest.h"
- #endif
-+#endif
-
- #ifdef _OPENMP
- #include <omp.h>
diff --git a/debian/patches/series b/debian/patches/series
index 31fed0f..779f77c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ remove-wcs-versioninfo.patch
remove-cfitsio-version-check.patch
use-std-paths-for-libs.patch
remove-private-ltdl.patch
-build-cpljava.patch
loose_cplfit_test.patch
no_compiletime_cpucheck.patch
fix_required_versions.patch
diff --git a/debian/rules b/debian/rules
index ebb0652..0fb84fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
dh $@ --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- --enable-maintainer-mode --with-java=/usr/lib/jvm/default-java --with-java-includes-md=/usr/lib/jvm/default-java/include/linux
+ dh_auto_configure -- --enable-maintainer-mode
#override_dh_auto_test:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl.git
More information about the Debian-astro-commits
mailing list