[med-svn] r12033 - in trunk/packages/rcsb-core-wrapper/trunk/debian: . patches
Laszlo Kajan
lkajan-guest at alioth.debian.org
Fri Aug 10 17:13:59 UTC 2012
Author: lkajan-guest
Date: 2012-08-10 17:13:59 +0000 (Fri, 10 Aug 2012)
New Revision: 12033
Added:
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/unistd
trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper
Modified:
trunk/packages/rcsb-core-wrapper/trunk/debian/control
trunk/packages/rcsb-core-wrapper/trunk/debian/rules
Log:
some patches
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/control
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/control 2012-08-10 15:13:43 UTC (rev 12032)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/control 2012-08-10 17:13:59 UTC (rev 12033)
@@ -3,7 +3,8 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
Laszlo Kajan <lkajan at rostlab.org>
-Build-Depends: debhelper (>= 7.0.50~), doxygen, graphviz, libboost-python-dev, libxerces-c-dev
+Build-Depends: debhelper (>= 7.0.50~), doxygen, graphviz, libboost-python-dev, libxerces-c-dev,
+ python-all-dev, python-all-dbg
Standards-Version: 3.9.3
Section: libs
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/rcsb-core-wrapper/trunk
@@ -57,4 +58,33 @@
application interface to information in mmCIF format. It includes several
classes for accessing data dictionaries and mmCIF format data files.
.
- This package provides the detached debug symbols for the library.
+ This package contains the detached debug symbols for the library.
+
+Package: python-librcsb-core-wrapper
+Architecture: any
+Section: python
+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
+ classes for accessing data dictionaries and mmCIF format data files.
+ .
+ This library provides Python bindings for librcsb-core-wrapper.
+
+Package: python-librcsb-core-wrapper-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, librcsb-core-wrapper0 (= ${binary:Version}), python-dbg
+Provides: ${python:Provides}
+Breaks: ${python:Breaks}
+Description: debugging symbols for python-librcsb-core-wrapper
+ 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.
+ .
+ This package contains the detached debug symbols for
+ python-librcsb-core-wrapper.
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/Makefile 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,7 @@
+ CLEAN_DOC_SCRIPT = clean_doc.sh
+ EXPORT_SCRIPT = export.sh
+
+-all:
+- @echo
+- @echo ------- compile targets are compile_lnx_38, compile_lnx_41, and compile_osx -------
++all: compile_lnx_41
+
+ compile:
+ @echo
+@@ -69,7 +67,7 @@
+ ./$(COMPILE_SCRIPT)'
+
+ compile_lnx_41:
+- @sh -c 'cd ./$(UTIL_MODULE); \
++ + at 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; \
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,24 @@
+--- a/util/compile.sh
++++ b/util/compile.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # This script builds dependent modules
+
+--- a/etc/createdoc.sh
++++ b/etc/createdoc.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # File: createdoc.sh
+ #
+--- a/etc/platform.sh
++++ b/etc/platform.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # File: platform.sh
+ # Date: 6-Aug-97 J. Westbrook
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,11 @@
+--- a/common/src/mapped_ptr_vector.C
++++ b/common/src/mapped_ptr_vector.C
+@@ -20,7 +20,7 @@
+ using std::string;
+ using std::vector;
+ using std::pair;
+-
++using std::make_pair;
+
+ template <typename T, typename StringCompareT>
+ mapped_ptr_vector<T, StringCompareT>::mapped_ptr_vector()
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,209 @@
+--- a/cif-file/Makefile
++++ b/cif-file/Makefile
+@@ -133,11 +133,13 @@
+ $(L_MOD_LIB): $(OBJ_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+
+ # Rule for making object files
+ %.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+
+--- a/cif-file-util/Makefile
++++ b/cif-file-util/Makefile
+@@ -133,11 +133,13 @@
+ $(L_MOD_LIB): $(OBJ_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+
+ # Rule for making object files
+ %.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+
+--- a/cif-parser/Makefile
++++ b/cif-parser/Makefile
+@@ -170,6 +170,8 @@
+ $(L_MOD_LIB): $(addprefix obj/,$(OBJ_FILES))
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+@@ -179,14 +181,14 @@
+ @sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
+ mv $(^:.y=.tab.c) $(^:.y=.c)
+ mv $(^:.y=.tab.h) $(^:.y=.h)
+- $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
++ libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
+
+ obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
+ $(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@F:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
+- $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
++ libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
+
+
+ # Rule for making other object files
+ obj/%.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
+
+--- a/common/Makefile
++++ b/common/Makefile
+@@ -145,11 +145,13 @@
+ $(L_MOD_LIB): $(OBJ_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+
+ # Rule for making object files
+ %.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+
+--- a/dict-obj-file/Makefile
++++ b/dict-obj-file/Makefile
+@@ -195,6 +195,8 @@
+ $(L_MOD_LIB): $(OBJ_OTHER_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_OTHER_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_OTHER_FILES) $(OBJ_OTHER_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_OTHER_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+@@ -206,5 +208,5 @@
+
+ # Phony rule for making object files
+ %.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+
+--- a/pdbml-parser/Makefile
++++ b/pdbml-parser/Makefile
+@@ -211,6 +211,8 @@
+ $(L_MOD_LIB): $(OBJ_OTHER_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_OTHER_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_OTHER_FILES) $(OBJ_OTHER_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_OTHER_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+@@ -225,5 +227,5 @@
+
+ # Phony rule for making object files
+ %.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+
+--- a/regex/Makefile
++++ b/regex/Makefile
+@@ -144,13 +144,15 @@
+ $(L_MOD_LIB): $(OBJ_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+
+ # Rule for making object files
+ %.o: $(SRC_DIR)/%.c
+- $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $< -o $(OBJ_DIR)/$@
+
+
+ # Extra, non-used in PDB build
+@@ -181,7 +183,7 @@
+ $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/main.c -o $@
+
+ $(OBJ_DIR)/split.o: $(H) $(HEADER_FILES) $(SRC_DIR)/split.c
+- $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/split.c -o $@
++ libtool --mode=compile $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/split.c -o $@
+
+ debug.o: $(H) $(HEADER_FILES) $(SRC_DIR)/debug.c $(L_INCL_DIR)/debug.ih
+ $(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/debug.c -o $(OBJ_DIR)/$@
+--- a/tables/Makefile
++++ b/tables/Makefile
+@@ -130,11 +130,13 @@
+ $(L_MOD_LIB): $(OBJ_FILES)
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
++ cp -f -t $(M_LIB_DIR) $(addprefix $(OBJ_DIR)/,$(OBJ_FILES) $(OBJ_FILES:.o=.lo))
++ mkdir -p $(M_LIB_DIR)/.libs && cp -f -t $(M_LIB_DIR)/.libs $(addprefix $(OBJ_DIR)/.libs/,$(OBJ_FILES))
+ $(RANLIB) $@
+ @echo $@ " is up to date."
+
+
+ # Rule for making object files
+ %.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++ libtool --mode=compile $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,5 @@
+ # Top level Makefile
++include etc/Makefile.platform
+
+ UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util
+ UTIL_MODULE = util
+@@ -66,7 +67,9 @@
+ export WWPDB_XERCESC_LIB=xerces-c; \
+ ./$(COMPILE_SCRIPT)'
+
+-compile_lnx_41:
++# lkajan: the reason for this is that I do not want to set prerequisites here just now, so I make it made always
++.PHONY: lib/librcsb-core-wrapper.la
++lib/librcsb-core-wrapper.la:
+ + at sh -c 'cd ./$(UTIL_MODULE); \
+ export PIC=-fPIC; \
+ export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \
+@@ -79,12 +82,28 @@
+ export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \
+ export WWPDB_XERCESC_LIB=xerces-c; \
+ ./$(COMPILE_SCRIPT)'
++ libtool --quiet --mode=link $(CCC) -version-info 0:0:0 -rpath /usr/lib $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o lib/librcsb-core-wrapper.la lib/*.lo
++
++compile_lnx_41: lib/librcsb-core-wrapper.la
++ + at 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_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_LIB=xerces-c; \
++ exit 0;'
+
+ debug:
+ @sh -c 'cd ./$(UTIL_MODULE); ./$(COMPILE_SCRIPT) debug'
+
+ clean_build:
+ @sh -c 'cd ./$(UTIL_MODULE); ./$(CLEAN_SCRIPT)'
++ @rm -rf lib/*
+
+ test: test-all
+
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,58 @@
+--- a/cif-parser/Makefile
++++ b/cif-parser/Makefile
+@@ -167,7 +167,7 @@
+ @rm -f $(M_AGR_LIB)
+
+
+-$(L_MOD_LIB): $(OBJ_FILES)
++$(L_MOD_LIB): $(addprefix obj/,$(OBJ_FILES))
+ # Create module library
+ @cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
+ $(RANLIB) $@
+@@ -175,18 +175,18 @@
+
+
+ # Specific rules for making object files
+-$(OBJ_DIR)/%Parser.o: $(SRC_DIR)/%Parser.y
++obj/%Parser.o: $(SRC_DIR)/%Parser.y
+ @sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
+ mv $(^:.y=.tab.c) $(^:.y=.c)
+ mv $(^:.y=.tab.h) $(^:.y=.h)
+ $(CC) $(CFLAGS_NONANSI) -c $(^:.y=.c) -o $@
+
+-%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
+- $(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
+- $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$@
++obj/%Scanner.o: $(SRC_DIR)/%Scanner.l $(OBJ_DIR)/%Parser.o
++ $(LEX) $($(@F:.o=_LEX_FLAGS)) -t $(SRC_DIR)/$(@F:.o=.l) > $(SRC_DIR)/$(@F:.o=.c)
++ $(CC) $(CFLAGS_NONANSI) -c $(SRC_DIR)/$(@F:.o=.c) -o $(OBJ_DIR)/$(@F)
+
+
+ # Rule for making other object files
+-%.o: $(SRC_DIR)/%.C
+- $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$@
++obj/%.o: $(SRC_DIR)/%.C
++ $(CCC) $(C++FLAGS) -c $< -o $(OBJ_DIR)/$(@F)
+
+--- a/dict-obj-file/Makefile
++++ b/dict-obj-file/Makefile
+@@ -111,7 +111,10 @@
+
+
+ # Installation
+-install: $(TARGETS)
++install: $(TARGETS) $(M_BIN_DIR)/$(TARGET_SCRIPTS)
++
++$(M_BIN_DIR)/$(TARGET_SCRIPTS): $(L_BIN_DIR)/$(TARGET_SCRIPTS)
++ cp -f $(L_BIN_DIR)/$(TARGET_SCRIPTS) $(M_BIN_DIR)/$(TARGET_SCRIPTS)
+
+
+ # Test
+@@ -141,7 +144,6 @@
+ %: $(OBJ_DIR)/%.o $(M_MOD_LIB) $(ALL_DEP_LIBS)
+ $(CCC) $(LDFLAGS) $< $(M_MOD_LIB) $(ALL_DEP_LIBS) $(MALLOCLIB) -lm -o $(L_BIN_DIR)/$@
+ @cp -f $(L_BIN_DIR)/$@ $(M_BIN_DIR)/$@
+- @cp -f $(L_BIN_DIR)/$(TARGET_SCRIPTS) $(M_BIN_DIR)/$(TARGET_SCRIPTS)
+
+
+ # Rule for build cleaning
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,25 @@
+--- a/Makefile
++++ b/Makefile
+@@ -98,6 +98,22 @@
+ export WWPDB_XERCESC_LIB=xerces-c; \
+ exit 0;'
+
++# lkajan: for testing
++.PHONY: wrapper
++wrapper:
++ + at sh -c 'cd ./$(UTIL_MODULE); \
++ export PIC=-fPIC; \
++ export WWPDB_PYTHON_INC=/usr/include/python2.7; \
++ export WWPDB_PYTHON_LIB_DIR=/apps/python/lib; \
++ export WWPDB_PYTHON_LIB=python2.7; \
++ 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-mt-py27; \
++ 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; \
++ ( cd ../wrapper && make OPT=-O install );'
++
+ debug:
+ @sh -c 'cd ./$(UTIL_MODULE); ./$(COMPILE_SCRIPT) debug'
+
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,8 @@
+--- a/local/modules.txt
++++ b/local/modules.txt
+@@ -7,5 +7,4 @@
+ svn https://svn-dev.wwpdb.org/svn-rcsb/core/modules/cif-file-util cif-file-util Latest
+ svn https://svn-dev.wwpdb.org/svn-rcsb/core/modules/dict-obj-file dict-obj-file Latest
+ svn https://svn-dev.wwpdb.org/svn-rcsb/pdbml/modules/pdbml-parser pdbml-parser Latest
+-svn https://svn-dev.wwpdb.org/svn-rcsb/pdbml/modules/pdbml-parser pdbml-parser Latest
+ svn https://svn-dev.wwpdb.org/svn-wwpdb/third-party/cctbx cctbx Latest
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,9 @@
+wrapper
+rm-duplicate-module
+bash
+make_pair
+unistd
+parallel-build
+Makefile
+objectfiles
+pythonwrapper
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/unistd
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/unistd (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/unistd 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,9 @@
+--- a/pdbml-parser/src/misc_util.C
++++ b/pdbml-parser/src/misc_util.C
+@@ -1,5 +1,6 @@
+ #include <string>
+ #include <algorithm>
++#include <unistd.h>
+
+ #include "CifString.h"
+ #include "ISTable.h"
Added: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper (rev 0)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper 2012-08-10 17:13:59 UTC (rev 12033)
@@ -0,0 +1,7 @@
+--- a/local/modules.txt
++++ b/local/modules.txt
+@@ -9,4 +9,3 @@
+ svn https://svn-dev.wwpdb.org/svn-rcsb/pdbml/modules/pdbml-parser pdbml-parser Latest
+ svn https://svn-dev.wwpdb.org/svn-rcsb/pdbml/modules/pdbml-parser pdbml-parser Latest
+ svn https://svn-dev.wwpdb.org/svn-wwpdb/third-party/cctbx cctbx Latest
+-svn https://svn-dev.wwpdb.org/svn-wwpdb/core/wrapper wrapper Latest
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/rules
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/rules 2012-08-10 15:13:43 UTC (rev 12032)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/rules 2012-08-10 17:13:59 UTC (rev 12033)
@@ -1,10 +1,20 @@
#!/usr/bin/make -f
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+# lkajan: we borrow from libtorrent-rasterbar here (thank you)
+PYVERSIONS=$(shell pyversions -vr)
+ALLPY=$(PYVERSIONS) $(PYVERSIONS:%=%-dbg)
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
%:
- dh $@ --parallel
+ dh $@ --parallel --with python2
.PHONY: override_dh_strip
override_dh_strip:
@@ -13,3 +23,13 @@
.PHONY: override_dh_compress
override_dh_compress:
dh_compress -Xlibrcsb-core-wrapper.tag
+
+.PHONY: override_dh_makeshlibs
+override_dh_makeshlibs:
+ dh_makeshlibs -V
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+ rm -rf build build-py*
+ dh_auto_clean
+
More information about the debian-med-commit
mailing list