[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#752897: rm -rf debian/tmp/usr/share/doc/lucene++-3.0.6/




> Il Lunedì 1 Settembre 2014 15:42, Tobias Frost <tobi@frost.de> ha scritto:
> >>  Hi Tobias
>> 
>>> 
>>>  Hi Gianfranco,
>>> 
>>>  Yes, collab-maint would be indeed the best option and can be done after
>>>  the initial upload. So just remove VCS-* for now and re-add once 
> you've
>>>  decided how to go on.
>>> 
>> 
>>  Removed
>> 
>>>  Back to the package. Sorry, took me longer than expected to take deeper
>>>  look, but the review should be complete now. So I think this will be 
> the
>>>  last iteration...
>>> 
>>>  During the review of d/copyright I found those mismatches which might
>>>  need clarification:
>>> 
>>>  -> ./src/contrib/analyzers/common/analysis/ar/ArabicAnalyzer.cpp
>>>     ./src/contrib/analyzers/common/analysis/fa/PersianAnalyzer.cpp
>>>  seems to be generated from BSD Data. Not sure how they have been
>>>  generated and what is the effective license is indeed tricky. Can you
>>>  check with upstream how the data is processed and if that is enough to
>>>  constitute a new copyright? (However, It would be best if the files
>>>  could be autogenerated at build time and the stoplist file distributed
>>>  with the tarball.)
>>>  For now, I'd recommend to add an comment to d/copyright stating 
> that the
>>>  file has been created using BSD-Licensed data from http://...
>> 
>>  https://github.com/luceneplusplus/LucenePlusPlus/issues/70
> 
>> 
>>> 
>>>  -> ./src/contrib/snowball/libstemmer_c/* is missing in d/copyright 
> and
>>>  it is (as far as can see) an embedded code copy. (Debian source package
>>>  snowball). As convenience copies are strongly discouraged, please try 
> to
>>>  patch lucene so it will link against the package version.
>>>  (If you find out, this is not feasible, please let me know along with
>>>  your reasoning)
>>> 
>> 
>>  https://github.com/luceneplusplus/LucenePlusPlus/issues/71
>> 
>>>  So, this seems now to be the last two points to be fixed. Then I'll
>>>  upload it :)
>>> 
>> 
>> 
>>  thanks again, I opened the two above upstream issues, because the problem
>>  is not debian-specific and I'm not in the position of force a system 
> library
>>  when a custom delta might be needed (and moreover I don't see it used, 
> as
>>  I wrote on the issue).
>> 
>>  So I'll update as soon as I get upstream feedbacks!
> 

Hi again Tobias

> Great. Regarding the issue 70 (let me quote it by the issue number), as said
> it would be ok for me just to comment the fact in d/copyright (and in a later
> upload act according upstream's decission).

Wonderful, updated

> 
> Regarding 71, if you are sure that it won't be used, just use a
> debian-specific patch to remove it.
> Regarding the submitted issue upstream, please note that according to the
> package libstemmer "Snowball upstream doesn't build shared libraries, 
> so they
> are Debian-specific."
> 

yes, for the moment I disabled them, I think nobody will complain since the package is a newly packaged one in debian.
With the next upload we can enable the debian version safely (if upstream agrees) :)

> We can wait for upstreams' reaction, but we can also go on; just decide and
> 
> let me know.

Would be nice to go on, in this way ftpmaster can look at the package, since the freeze is approaching ;)

As soon as the package is accepted I'll take care of ask for a new release, fixing all this kind of doubts here :)

many thanks again

diff -Nru lucene++-3.0.6/debian/changelog lucene++-3.0.6/debian/changelog
--- lucene++-3.0.6/debian/changelog    2014-08-26 12:49:11.000000000 +0200
+++ lucene++-3.0.6/debian/changelog    2014-09-01 12:28:56.000000000 +0200
@@ -1,10 +1,3 @@
-lucene++ (3.0.6-2) unstable; urgency=medium
-
-  * Update copyright file.
-  * move doxygen to Build-Depends-Indep.
-
- -- Gianfranco Costamagna <costamagnagianfranco@yahoo.it>  Tue, 26 Aug 2014 11:36:24 +0200
-
 lucene++ (3.0.6-1) unstable; urgency=low
 
   * Initial release (Closes: #750148).
diff -Nru lucene++-3.0.6/debian/control lucene++-3.0.6/debian/control
--- lucene++-3.0.6/debian/control    2014-08-26 11:36:18.000000000 +0200
+++ lucene++-3.0.6/debian/control    2014-09-01 12:31:42.000000000 +0200
@@ -17,8 +17,6 @@
 Standards-Version: 3.9.5
 Section: libs
 Homepage: https://github.com/luceneplusplus/LucenePlusPlus
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-unity/lucene++/debian
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-unity/lucene++/debian/files
 
 Package: liblucene++-dev
 Section: libdevel
diff -Nru lucene++-3.0.6/debian/copyright lucene++-3.0.6/debian/copyright
--- lucene++-3.0.6/debian/copyright    2014-08-26 13:01:05.000000000 +0200
+++ lucene++-3.0.6/debian/copyright    2014-09-02 11:33:24.000000000 +0200
@@ -10,6 +10,16 @@
 Copyright: 1999, 2000, 2002 Aladdin Enterprises
 License: zlib
 
+Files: src/contrib/analyzers/common/analysis/{ar/ArabicAnalyzer.cpp,fa/PersianAnalyzer.cpp}
+Copyright: 2009-2014 Alan Wright
+License: Apache-2.0 or LGPL-3+
+Comment: Generated from http://members.unine.ch/jacques.savoy/clef/index.html
+         The stopword list is BSD-Licensed.
+
+Files: src/contrib/snowball/libstemmer_c/*
+Copyright: 2001-2011, Dr Martin Porter and Richard Boulton
+License: BSD
+
 Files: src/core/util/nedmalloc/*
 Copyright: 2005-2006 Niall Douglas
 License: BSL-1.0
diff -Nru lucene++-3.0.6/debian/liblucene++-doc.install lucene++-3.0.6/debian/liblucene++-doc.install
--- lucene++-3.0.6/debian/liblucene++-doc.install    2014-07-02 17:38:53.000000000 +0200
+++ lucene++-3.0.6/debian/liblucene++-doc.install    1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/lucene++-3.0.6/* usr/share/doc/liblucene++-doc/html
diff -Nru lucene++-3.0.6/debian/patches/disable-snowball.patch lucene++-3.0.6/debian/patches/disable-snowball.patch
--- lucene++-3.0.6/debian/patches/disable-snowball.patch    1970-01-01 01:00:00.000000000 +0100
+++ lucene++-3.0.6/debian/patches/disable-snowball.patch    2014-09-02 11:56:54.000000000 +0200
@@ -0,0 +1,36 @@
+Description: Disabling snowball for the moment.
+ As described in upstream issue #71 snowball is not used, moreover debian has its
+ specific library. For now is better to disable it, waiting for upstream suggestions.
+
+---
+Origin: debian
+Forwarded: https://github.com/luceneplusplus/LucenePlusPlus/issues/71
+Reviewed-By: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Last-Update: <2014-09-02>
+
+--- lucene++-3.0.6.orig/src/contrib/CMakeLists.txt
++++ lucene++-3.0.6/src/contrib/CMakeLists.txt
+@@ -4,10 +4,10 @@ file(GLOB_RECURSE contrib_sources
+   analyzers/*.cpp
+   highlighter/*.cpp
+   memory/*.cpp
+-  snowball/*.cpp
+-  snowball/libstemmer_c/libstemmer/libstemmer_utf8.c
+-  snowball/libstemmer_c/src_c/*.c
+-  snowball/libstemmer_c/runtime/*.c
++#  snowball/*.cpp
++#  snowball/libstemmer_c/libstemmer/libstemmer_utf8.c
++#  snowball/libstemmer_c/src_c/*.c
++#  snowball/libstemmer_c/runtime/*.c
+ )
+ 
+ file(GLOB_RECURSE contrib_headers
+@@ -20,7 +20,7 @@ include_directories(
+   ${lucene++_SOURCE_DIR}/include
+   ${lucene++-lib_SOURCE_DIR}/include
+   ${lucene++-contrib_SOURCE_DIR}/include
+-  ${lucene++-contrib_SOURCE_DIR}/snowball/libstemmer_c/include
++#  ${lucene++-contrib_SOURCE_DIR}/snowball/libstemmer_c/include
+   ${Boost_INCLUDE_DIRS}
+ )
+ 
diff -Nru lucene++-3.0.6/debian/patches/series lucene++-3.0.6/debian/patches/series
--- lucene++-3.0.6/debian/patches/series    2014-08-26 12:05:33.000000000 +0200
+++ lucene++-3.0.6/debian/patches/series    2014-09-02 11:53:57.000000000 +0200
@@ -2,3 +2,4 @@
 fix_test_ftbfs.diff
 fix_installing_headers.diff
 disabling-tests.patch
+disable-snowball.patch
diff -Nru lucene++-3.0.6/debian/rules lucene++-3.0.6/debian/rules
--- lucene++-3.0.6/debian/rules    2014-07-04 13:16:51.000000000 +0200
+++ lucene++-3.0.6/debian/rules    2014-09-01 12:30:53.000000000 +0200
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -8,7 +7,12 @@
     dh $@ --with linktree -- --parallel --fail-missing
 
 override_dh_auto_configure:
-    dh_auto_configure -- -DENABLE_DOCS:BOOL=ON -DENABLE_STANDARD_ALLOCATOR:BOOL=ON
+    dh_auto_configure -- -DENABLE_STANDARD_ALLOCATOR:BOOL=ON
 
-override_dh_auto_build:
+override_dh_auto_build-indep:
+    dh_auto_configure -- -DENABLE_STANDARD_ALLOCATOR:BOOL=ON -DENABLE_DOCS:BOOL=ON
     dh_auto_build -- doc
+
+override_dh_install-indep:
+    dh_install -pliblucene++-doc usr/share/doc/lucene++-3.0.6/* usr/share/doc/liblucene++-doc/html
+    rm -rf debian/tmp/usr/share/doc/lucene++-3.0.6/


Gianfranco
> 
> -- 
> tobi
> 
> -- 
> To unsubscribe, send mail to 752897-unsubscribe@bugs.debian.org.
> 

Attachment: patch
Description: Binary data


Reply to: