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

Bug#752897:



HI all




> Il Mercoledì 27 Agosto 2014 13:03, Tobias Frost <tobi@frost.de> ha scritto:
> >>  On Tue, Aug 26, 2014 at 12:30 PM, Tobias Frost <tobi@debian.org> 
> wrote:
>>>  Hi,
>>> 
>>>  Well, appearantly malat uploaded in the meantime...
>>> 
>>>  Malat, this is great, but could you also drop a note to the BTS if you
>>>  are doing that to avoid double work, especially if there is activiy and
>>>  the owner of the RFS-bug has been set to indicate that someone is
>>>  working on it.. Thanks ;).
>>> 
>>>  Regarding the package, unfortunately, the way Build-Depends-Indep is
>>>  used will likely not work: You need also to work on d/rules.
>>>  I'm not sure how the buildds handle Build-Depends-Indep, but if 
> they
>>>  don't install them the package will FTBFS.
>>>  (Try dpkg-buildpackage -B with doxygen not installed.)
>>> 
>>>  Most likely d/rules need to detect if it is supposed to build the docs;
>>>  You can use dh_listpackages or, an easy way, detect doxygen and act
>>>  accordingls: For example something like that: (note, I did not test 
> that
>>>  below)
>>> 
>>>  override_dh_auto_configure:
>>>          if [ -x /usr/bin/doxygen ] ; then dh_auto_configure --
>>>  -DENABLE_DOCS:BOOL=ON -DENABLE_STANDARD_ALLOCATOR:BOOL=ON ;\
>>>            else dh_auto_configure -- -DENABLE_DOCS:BOOL=OFF
>>>  -DENABLE_STANDARD_ALLOCATOR:BOOL=ON; fi
>>> 
>>>  override_dh_auto_build:
>>>          if [ -x /usr/bin/doxygen ] ; then dh_auto_build -- doc ; else
>>>  dh_auto_build ; fi
>> 
>>  This is unnecessary; just use an override_dh_auto_build-indep target
>>  in debian/rules. Assuming you have doxygen listed in
>>  Build-Depends-Indep, you do not have to manually check for doxygen.
>> 
>>  Regards,
>>  Vincent
>> 
> 
> Thanks Vincent for the info; Learned another thing :)
> 
> However, in this case the package needs also different cmake options at
> dh_auto_configure-time, so only override_dh_auto_build-indep will not work as
> you need to disable DENABLE_DOCS during cmake configuration.
> I just wondering if there is also a dh_auto_configure-indep target... (I cant
> test because I'm not near my PC right now)
> 

I didn't see dh_auto_configure-indep target, so I tweaked the rules in this way

debdiff lucene++_3.0.6-2.dsc lucene++_3.0.6-1.dsc
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-08-27 13:51:33.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/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/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-08-27 13:51:51.000000000 +0200
@@ -8,7 +8,11 @@
     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




If it is ok I'll upload -1 on mentors again (ftpmasters told be that I can start again from -1 since the NEW queue is cleared now)

cheers,

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


Reply to: