Author: lkajan-guest
Date: 2012-08-14 17:35:24 +0000 (Tue, 14 Aug 2012)
New Revision: 12048
Added:
trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.doc-base
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs
trunk/packages/rcsb-core-wrapper/trunk/debian/python-librcsb-core-wrapper.install
Removed:
trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.doc-base
trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.lintian-overrides
Modified:
trunk/packages/rcsb-core-wrapper/trunk/debian/control
trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper
trunk/packages/rcsb-core-wrapper/trunk/debian/rules
Log:
builds without lintian errors
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/control
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/control 2012-08-14
16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/control 2012-08-14
17:35:24 UTC (rev 12048)
@@ -68,7 +68,6 @@
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
librcsb-core-wrapper0 (= ${binary:Version})
Provides: ${python:Provides}
-Breaks: ${python:Breaks}
Description: library that exports C++ mmCIF accessors to Python
The RCSB Core Wrapper library was developed to provide an object-oriented
application interface to information in mmCIF format. It includes several
Copied:
trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.doc-base
(from rev 12036,
trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.doc-base)
===================================================================
---
trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.doc-base
(rev 0)
+++
trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.doc-base
2012-08-14 17:35:24 UTC (rev 12048)
@@ -0,0 +1,12 @@
+Document: librcsb-core-wrapper
+Title: librcsb-core-wrapper Documentation
+Author: RCSB Core Wrapper Developers
+Abstract: C++ library providing OO API to information in mmCIF format
+ The RCSB Core Wrapper library was developed to provide an object-oriented
+ application interface to information in mmCIF format. It includes several
+ classes for accessing data dictionaries and mmCIF format data files.
+Section: Science/Biology
+
+Format: html
+Files: /usr/share/doc/librcsb-core-wrapper-doc/html/*.html
+Index: /usr/share/doc/librcsb-core-wrapper-doc/html/index.html
Modified:
trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librcsb-core-wrapper-doc.docs
2012-08-14 17:35:24 UTC (rev 12048)
@@ -1 +1 @@
-doxygen-doc/html/
+docs/html/
Deleted: trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.doc-base
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.doc-base
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.doc-base
2012-08-14 17:35:24 UTC (rev 12048)
@@ -1,12 +0,0 @@
-Document: librcsb-core-wrapper
-Title: librcsb-core-wrapper Documentation
-Author: RCSB Core Wrapper Developers
-Abstract: C++ library providing OO API to information in mmCIF format
- The RCSB Core Wrapper library was developed to provide an object-oriented
- application interface to information in mmCIF format. It includes several
- classes for accessing data dictionaries and mmCIF format data files.
-Section: Science/Biology
-
-Format: html
-Files: /usr/share/doc/librcsb-core-wrapper-doc/html/*.html
-Index: /usr/share/doc/librcsb-core-wrapper-doc/html/index.html
Deleted:
trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.lintian-overrides
===================================================================
---
trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.lintian-overrides
2012-08-14 16:52:52 UTC (rev 12047)
+++
trunk/packages/rcsb-core-wrapper/trunk/debian/librostlab-doc.lintian-overrides
2012-08-14 17:35:24 UTC (rev 12048)
@@ -1,21 +0,0 @@
-# Laszlo Kajan <[email protected]>:
-# This jquery.js is copied into the html documentation by the doxygen
-# version currently in unstable (1.7.6.1). Earlier versions of Doxygen
-# (e.g. i n stable) do not copy a jquery.js there. The jquery.js copied
-# by doxygen is much earlier (1.3.2) than the current version in unstable
-# (1.7.2-1). The jquery.js from doxygen actually is a minified bundle of
-# several things:
-# * jQuery JavaScript Library v1.3.2 http://jquery.com/
-# * Sizzle CSS Selector Engine - v0.9.3 http://sizzlejs.com/
-# * jQuery hashchange event - v1.3 - 7/21/2010
-# http://benalman.com/projects/jquery-hashchange-plugin/
-# * jQuery UI 1.7.2 http://docs.jquery.com/UI
-# * jQuery UI Resizable 1.7.2 http://docs.jquery.com/UI/Resizables
-# * jQuery.ScrollTo - Easy element scrolling using jQuery.
-#
-# Out of these Sizzle is not packaged for Debian, neither is the hashchange
-# event or jQuery.ScrollTo, as far as I can tell.
-#
-# Therefore, it is necessary to keep this jquery.js instead of linking to the
-# file with the same name from libjs-jquery.
-librostlab-doc: embedded-javascript-library
usr/share/doc/librcsb-core-wrapper-doc/html/jquery.js
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile
2012-08-14 17:35:24 UTC (rev 12048)
@@ -11,12 +11,23 @@
compile:
@echo
-@@ -69,7 +67,7 @@
+@@ -69,16 +67,10 @@
./$(COMPILE_SCRIPT)'
compile_lnx_41:
- @sh -c 'cd ./$(UTIL_MODULE); \
+ +@sh -c 'cd ./$(UTIL_MODULE); \
export PIC=-fPIC; \
- export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \
- export WWPDB_PYTHON_LIB_DIR=/apps/python/lib; \
+- export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \
+- export WWPDB_PYTHON_LIB_DIR=/apps/python/lib; \
+- export WWPDB_PYTHON_LIB=python2.5; \
+- export WWPDB_BOOST_INC=/apps/boost/include/boost-1_41; \
+- export WWPDB_BOOST_PYTHON_LIB_DIR=/apps/boost/lib; \
+- export WWPDB_BOOST_PYTHON_LIB=boost_python-gcc41-mt-1_41; \
+- export WWPDB_XERCESC_INC=/apps/xerces-3.0.1/include; \
+- export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \
++ export WWPDB_XERCESC_INC=/usr/include; \
++ export WWPDB_XERCESC_LIB_DIR=/usr/lib; \
+ export WWPDB_XERCESC_LIB=xerces-c; \
+ ./$(COMPILE_SCRIPT)'
+
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs
(rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs 2012-08-14
17:35:24 UTC (rev 12048)
@@ -0,0 +1,53 @@
+--- a/etc/Doxyfile-template
++++ b/etc/Doxyfile-template
+@@ -123,7 +123,7 @@
+ # path before files name in the file list and in the header files. If set
+ # to NO the shortest path that makes the file name unique will be used.
+
+-FULL_PATH_NAMES = NO
++FULL_PATH_NAMES = YES
+
+ # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+ # can be used to strip a user-defined part of the path. Stripping is
+@@ -250,7 +250,7 @@
+ # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+ # will be included in the documentation.
+
+-EXTRACT_PRIVATE = YES
++EXTRACT_PRIVATE = NO
+
+ # If the EXTRACT_STATIC tag is set to YES all static members of a file
+ # will be included in the documentation.
+@@ -798,7 +798,7 @@
+ # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+ # generate Latex output.
+
+-GENERATE_LATEX = YES
++GENERATE_LATEX = NO
+
+ # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be
+--- a/Makefile
++++ b/Makefile
+@@ -90,10 +90,19 @@
+
+ ###
+ doc:
+- @sh -c 'cd ./$(UTIL_MODULE); ./$(DOC_SCRIPT)'
++ rm -rf rcsb && cp -r include rcsb
++ grep -lr '^#include "' rcsb | xargs sed -i -e '/^#include "/{
s/#include "\([^"]\+\)"/#include <rcsb\/\1>/; }'
++ mkdir -p docs/doxyfiles
++ echo PROJECT_NAME = librcsb-core-wrapper > docs/doxyfiles/Doxyfile
++ echo PROJECT_NUMBER = $(shell dpkg-parsechangelog | grep '^Version' |
sed -e 's/Version: \(.*\)-[^-]\+$$/\1/g;') >> docs/doxyfiles/Doxyfile
++ echo OUTPUT_DIRECTORY = docs >> docs/doxyfiles/Doxyfile
++ echo INPUT = rcsb >> docs/doxyfiles/Doxyfile
++ cat etc/Doxyfile-template >> docs/doxyfiles/Doxyfile
++ doxygen docs/doxyfiles/Doxyfile
+
+ clean_doc:
+- @sh -c 'cd ./$(UTIL_MODULE); ./$(CLEAN_DOC_SCRIPT)'
++ rm -rf docs
++ rm -rf rcsb
+
+ export: clean
+ @sh -c 'cd ./$(UTIL_MODULE); ./$(EXPORT_SCRIPT)'
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
2012-08-14 17:35:24 UTC (rev 12048)
@@ -167,7 +167,7 @@
UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util
UTIL_MODULE = util
CHECKOUT_SCRIPT = checkout.sh
-@@ -66,7 +65,24 @@
+@@ -66,19 +65,37 @@
export WWPDB_XERCESC_LIB=xerces-c; \
./$(COMPILE_SCRIPT)'
@@ -192,10 +192,8 @@
+compile_lnx_41: lib/librcsb-core-wrapper.la
+@sh -c 'cd ./$(UTIL_MODULE); \
export PIC=-fPIC; \
- export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \
-@@ -78,13 +94,14 @@
- export WWPDB_XERCESC_INC=/apps/xerces-3.0.1/include; \
- export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \
+ export WWPDB_XERCESC_INC=/usr/include; \
+ export WWPDB_XERCESC_LIB_DIR=/usr/lib; \
export WWPDB_XERCESC_LIB=xerces-c; \
- ./$(COMPILE_SCRIPT)'
+ exit 0;'
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
2012-08-14 17:35:24 UTC (rev 12048)
@@ -5,6 +5,7 @@
unistd
parallel-build
Makefile
+docs
objectfiles
wrapper
setup.py.in
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
2012-08-14 17:35:24 UTC (rev 12048)
@@ -89,7 +89,7 @@
compile:
@echo
-@@ -98,7 +98,7 @@
+@@ -92,7 +92,7 @@
# lkajan: for testing
.PHONY: wrapper
@@ -98,7 +98,7 @@
+@sh -c 'cd ./$(UTIL_MODULE); \
export PIC=-fPIC; \
export WWPDB_PYTHON_INC=/usr/include/python2.7; \
-@@ -110,7 +110,7 @@
+@@ -104,7 +104,7 @@
export WWPDB_XERCESC_INC=/apps/xerces-3.0.1/include; \
export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \
export WWPDB_XERCESC_LIB=xerces-c; \
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper
2012-08-14 16:52:52 UTC (rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper
2012-08-14 17:35:24 UTC (rev 12048)
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -96,6 +96,22 @@
+@@ -90,6 +90,22 @@
export WWPDB_XERCESC_LIB=xerces-c; \
exit 0;'
Added:
trunk/packages/rcsb-core-wrapper/trunk/debian/python-librcsb-core-wrapper.install
===================================================================
---
trunk/packages/rcsb-core-wrapper/trunk/debian/python-librcsb-core-wrapper.install
(rev 0)
+++
trunk/packages/rcsb-core-wrapper/trunk/debian/python-librcsb-core-wrapper.install
2012-08-14 17:35:24 UTC (rev 12048)
@@ -0,0 +1,2 @@
+usr/lib/python*/*-packages/*.so
+usr/lib/python*/*-packages/*.egg-info
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/rules
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/rules 2012-08-14 16:52:52 UTC
(rev 12047)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/rules 2012-08-14 17:35:24 UTC
(rev 12048)
@@ -15,7 +15,7 @@
export DH_VERBOSE=1
%:
- dh $@ --parallel --with python-support
+ dh $@ --parallel --with python2
.PHONY: override_dh_auto_build
override_dh_auto_build: override_dh_auto_build-nopy
$(ALLPY:%=override_dh_auto_build-%)
@@ -23,7 +23,7 @@
.PHONY: override_dh_auto_build-nopy
override_dh_auto_build-nopy:
dh_auto_build --parallel
- # TODO: docs $(MAKE) doc
+ $(MAKE) doc
# lkajan: the below is nice, but it does not parallelize at all, I prefer
override_dh_auto_build-%.
#.PHONY: override_dh_auto_build-py
@@ -34,7 +34,7 @@
cd wrapper/python && python$* setup.py build --force
.PHONY: override_dh_auto_install
-override_dh_auto_install: override_dh_auto_install-nopy
override_dh_auto_install-%
+override_dh_auto_install: override_dh_auto_install-nopy
override_dh_auto_install-py
.PHONY: override_dh_auto_install-nopy
override_dh_auto_install-nopy:
@@ -42,7 +42,7 @@
.PHONY: override_dh_auto_install-py
override_dh_auto_install-py:
- dh_auto_install --with python-support --sourcedirectory=wrapper/python
+ dh_auto_install --sourcedirectory=wrapper/python
.PHONY: override_dh_strip
override_dh_strip:
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
