[Git][debian-gis-team/jeolib-jiplib][master] 3 commits: Add lintian override for no-symbols-control-file.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Mar 27 11:51:46 GMT 2025
Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-jiplib
Commits:
9947a8c6 by Bas Couwenberg at 2025-03-27T12:32:12+01:00
Add lintian override for no-symbols-control-file.
- - - - -
42fad47e by Bas Couwenberg at 2025-03-27T12:41:16+01:00
Add patch to fix spelling errors.
- - - - -
c52183ef by Bas Couwenberg at 2025-03-27T12:50:13+01:00
Clean up rules.
* Disable DH_VERBOSE.
* Remove templating.
* Include architecture.mk instead of dpkg-architecture calls.
* Drop useless dh_python3 override.
- - - - -
4 changed files:
- + debian/libjiplib1.lintian-overrides
- debian/patches/series
- + debian/patches/spelling-errors.patch
- debian/rules
Changes:
=====================================
debian/libjiplib1.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Symbols are problematic for C++ libraries
+no-symbols-control-file *
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
jeolib-jiplib_swig4.3.patch
pip-break-sys-pkg.patch
+spelling-errors.patch
=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -0,0 +1,193 @@
+Description: Fix spelling errors.
+ * afer -> after
+ * datatset -> dataset
+ * emtpy -> empty
+ * mininum -> minimum
+ * ommit -> omit
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/5
+
+--- a/src/imageclasses/jlextractogr_lib.cc
++++ b/src/imageclasses/jlextractogr_lib.cc
+@@ -2851,7 +2851,7 @@ CPLErr Jim::extractSample(VectorOgr& ogr
+ std::cout << "out of region: " << outOfRegion << " from " << trials << " trials"<< std::endl;
+ if(!ipoint){
+ ostringstream ess;
+- ess << "Error: no random point created afer " << trials << " trials" << endl;
++ ess << "Error: no random point created after " << trials << " trials" << endl;
+ throw(ess.str());
+ }
+ else if(trials>=maxTrials)
+--- a/src/imageclasses/jlpolygonize_lib.cc
++++ b/src/imageclasses/jlpolygonize_lib.cc
+@@ -112,7 +112,7 @@ void Jim::polygonize(VectorOgr&ogrWriter
+ }
+ }
+ else{
+- std::string errorString="Error: clould not create memory dataset for mask datatset";
++ std::string errorString="Error: clould not create memory dataset for mask dataset";
+ throw(errorString);
+ }
+ }
+@@ -165,7 +165,7 @@ void Jim::polygonize(VectorOgr&ogrWriter
+ }
+ }
+ else{
+- std::string errorString="Error: clould not create memory dataset for input datatset";
++ std::string errorString="Error: clould not create memory dataset for input dataset";
+ throw(errorString);
+ }
+ }
+--- a/src/imageclasses/jlann_lib.cc
++++ b/src/imageclasses/jlann_lib.cc
+@@ -110,7 +110,7 @@ std::string VectorOgr::trainANN(app::App
+ FANN::neural_net net;//the neural network
+
+ // if(model_opt.empty()){
+- // std::string errorString="Error: filename to save model is emtpy";
++ // std::string errorString="Error: filename to save model is empty";
+ // throw(errorString);
+ // }
+
+--- a/src/imageclasses/jlclassify_lib.cc
++++ b/src/imageclasses/jlclassify_lib.cc
+@@ -103,7 +103,7 @@ void VectorOgr::train(app::AppFactory& a
+ throw(helpStream.str());//help was invoked, stop processing
+ }
+ if(model_opt.empty()){
+- std::string errorString="Error: filename to save model is emtpy";
++ std::string errorString="Error: filename to save model is empty";
+ throw(errorString);
+ }
+ switch(getClassifier(method_opt[0])){
+--- a/src/imageclasses/jlsml_lib.cc
++++ b/src/imageclasses/jlsml_lib.cc
+@@ -103,7 +103,7 @@ void Jim::trainSML(JimList& referenceRea
+ try{
+ // doProcess=model_opt.retrieveOption(app);
+ // if(model_opt.empty()){
+- // std::string errorString="Error: filename to save model is emtpy";
++ // std::string errorString="Error: filename to save model is empty";
+ // throw(errorString);
+ // }
+ // std::ofstream outputStream(model_opt[0]);
+@@ -167,7 +167,7 @@ void Jim::trainSML2d(JimList& referenceR
+ throw(helpStream.str());//help was invoked, stop processing
+ }
+ if(model_opt.empty()){
+- std::string errorString="Error: filename to save model is emtpy";
++ std::string errorString="Error: filename to save model is empty";
+ throw(errorString);
+ }
+ std::ofstream outputStream(model_opt[0]);
+--- a/src/imageclasses/jlsvm_lib.cc
++++ b/src/imageclasses/jlsvm_lib.cc
+@@ -153,7 +153,7 @@ std::string VectorOgr::trainSVM(app::App
+ kernelMap["sigmoid;"]=svm::sigmoid;
+
+ // if(model_opt.empty()){
+- // std::string errorString="Error: filename to save model is emtpy";
++ // std::string errorString="Error: filename to save model is empty";
+ // throw(errorString);
+ // }
+
+--- a/src/imageclasses/Jim.cc
++++ b/src/imageclasses/Jim.cc
+@@ -2605,7 +2605,7 @@ CPLErr Jim::readDataPlanes(std::vector<i
+ /**
+ * @param x Reported column where minimum value in image was found (start counting from 0)
+ * @param y Reported row where minimum value in image was found (start counting from 0)
+- * @param band Search mininum value in image for this band
++ * @param band Search minimum value in image for this band
+ * @return minimum value in image for the selected band
+ **/
+ double Jim::getMin(int& x, int& y, int band){
+@@ -2641,7 +2641,7 @@ double Jim::getMin(int& x, int& y, int b
+ /**
+ * @param x Reported column where maximum value in image was found (start counting from 0)
+ * @param y Reported row where maximum value in image was found (start counting from 0)
+- * @param band Search mininum value in image for this band
++ * @param band Search minimum value in image for this band
+ * @return maximum value in image for the selected band
+ **/
+ double Jim::getMax(int& x, int& y, int band){
+--- a/src/imageclasses/jlstretch_lib.cc
++++ b/src/imageclasses/jlstretch_lib.cc
+@@ -53,7 +53,7 @@ void Jim::stretch(Jim& imgWriter, app::A
+ Optionjl<double> nodata_opt("nodata", "nodata", "nodata value(s) (first value will be put in output image)");
+ Optionjl<double> src_min_opt("src_min","src_min","clip source below this minimum value");
+ Optionjl<double> src_max_opt("src_max","src_max","clip source above this maximum value");
+- Optionjl<double> fromValue_opt("dst_min", "dst_min", "mininum value in output image", 0);
++ Optionjl<double> fromValue_opt("dst_min", "dst_min", "minimum value in output image", 0);
+ Optionjl<double> toValue_opt("dst_max", "dst_max", "maximum value in output image", 255);
+ Optionjl<double> minp_opt("cc_min", "cc_min", "cumulative count cut from");
+ Optionjl<double> maxp_opt("cc_max", "cc_max", "cumulative count cut to");
+--- a/src/imageclasses/jlfilter1d_lib.cc
++++ b/src/imageclasses/jlfilter1d_lib.cc
+@@ -64,7 +64,7 @@ using namespace filter;
+ * @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
+ * @param interp (type: std::string) (default: akima) type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)
+ * @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
+- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
++ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
+ * @return shared pointer to image object
+ **/
+
+@@ -101,7 +101,7 @@ shared_ptr<Jim> Jim::filter1d(app::AppFa
+ * @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
+ * @param interp (type: std::string) (default: akima) type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)
+ * @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
+- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
++ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
+ **/
+ void Jim::filter1d(Jim& imgWriter, app::AppFactory& app){
+ Optionjl<std::string> method_opt("f", "filter", "filter function (nvalid, median, var, min, max, sum, mean, dilate, erode, close, open, mode (majority voting), only for classes), smoothnodata (smooth nodata values only) values, ismin, ismax, order (rank pixels in order), stdev, mrf, dwt, dwti, dwt_cut, dwt_cut_from, savgolay, percentile, proportion)");
+@@ -123,7 +123,7 @@ void Jim::filter1d(Jim& imgWriter, app::
+ Optionjl<double> wavelengthOut_opt("wout", "wavelengthOut", "list of wavelengths in output spectrum (-wout band1 -wout band2 ...)");
+ Optionjl<std::string> interpolationType_opt("interp", "interp", "type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)","akima");
+ Optionjl<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image");
+- Optionjl<std::string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
++ Optionjl<std::string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
+ Optionjl<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)", 1);
+ Optionjl<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
+
+--- a/src/imageclasses/jlfilter2d_lib.cc
++++ b/src/imageclasses/jlfilter2d_lib.cc
+@@ -67,7 +67,7 @@ using namespace filter;
+ * @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
+ * @param beta (type: std::string) ASCII file with beta for each class transition in Markov Random Field
+ * @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
+- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
++ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
+ * @param circular (type: bool) (default: 0) circular disc kernel for dilation and erosion
+ * @return shared pointer to image object
+ **/
+@@ -99,7 +99,7 @@ shared_ptr<Jim> Jim::filter2d(const app:
+ * @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
+ * @param beta (type: std::string) ASCII file with beta for each class transition in Markov Random Field
+ * @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
+- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
++ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
+ * @param circular (type: bool) (default: 0) circular disc kernel for dilation and erosion
+ **/
+ void Jim::filter2d(Jim& imgWriter, const app::AppFactory& app){
+@@ -119,7 +119,7 @@ void Jim::filter2d(Jim& imgWriter, const
+ Optionjl<bool> norm_opt("norm", "norm", "normalize tap values values when filtering",false);
+ Optionjl<string> padding_opt("pad","pad", "Padding method for filtering (how to handle edge effects). Choose between: symmetric, replicate, circular, zero (pad with 0).", "symmetric");
+ Optionjl<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image");
+- Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
++ Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
+ Optionjl<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)", 1);
+ Optionjl<string> beta_opt("beta", "beta", "ASCII file with beta for each class transition in Markov Random Field");
+ Optionjl<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
+--- a/src/imageclasses/jlfilter_lib.cc
++++ b/src/imageclasses/jlfilter_lib.cc
+@@ -101,7 +101,7 @@ void Jim::filter(Jim& imgWriter, app::Ap
+ Optionjl<double> wavelengthOut_opt("wout", "wavelengthOut", "list of wavelengths in output spectrum (-wout band1 -wout band2 ...)");
+ Optionjl<std::string> interpolationType_opt("interp", "interp", "type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)","akima");
+ Optionjl<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image");
+- Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
++ Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
+ Optionjl<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)", 1);
+ Optionjl<string> beta_opt("beta", "beta", "ASCII file with beta for each class transition in Markov Random Field");
+ // Optionjl<double> eps_opt("eps","eps", "error marging for linear feature",0);
=====================================
debian/rules
=====================================
@@ -1,21 +1,12 @@
#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable).
-# Output every command that modifies files on the build system.
-export DH_VERBOSE = 1
-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
# See FEATURE AREAS in dpkg-buildflags(1).
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-# See ENVIRONMENT in dpkg-buildflags(1).
-# Package maintainers to append CFLAGS.
-#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
-# Package maintainers to append LDFLAGS.
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_MULTIARCH?=$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
%:
dh $@ --buildsystem=cmake --builddirectory=$(CURDIR)/build
@@ -38,6 +29,3 @@ execute_after_dh_auto_install:
find $(CURDIR)/build/root/local/ -name 'libjiplib.so.*' -delete
mv $(CURDIR)/build/root/local/lib/python*/* debian/tmp/usr/lib/python3/.
find $(CURDIR)/debian/tmp -name '*.so*' -exec chrpath -d {} \;
-
-override_dh_python3:
- DEB_HOST_ARCH=$(DEB_HOST_ARCH) dh_python3 --shebang=/usr/bin/python3
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/compare/af74d67c2d2704e174544135a1085dc1b06e368e...c52183ef4f31c3bdf9f9a0e8b3ef3883caa4b82e
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/compare/af74d67c2d2704e174544135a1085dc1b06e368e...c52183ef4f31c3bdf9f9a0e8b3ef3883caa4b82e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250327/4953d4db/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list