[med-svn] r17553 - trunk/packages/rcsb-core-wrapper/trunk/debian/patches

Andreas Tille tille at moszumanska.debian.org
Tue Jul 29 16:09:30 UTC 2014 

Author: tille
Date: 2014-07-29 16:09:30 +0000 (Tue, 29 Jul 2014)
New Revision: 17553

Removed:
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair
Modified:
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/exit-in-shlib
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_test_target
   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/rm-duplicate-module
   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/spelling
   trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper-module
Log:
Update patches to new upstream version


Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/bash	2014-07-29 16:09:30 UTC (rev 17553)
@@ -24,4 +24,4 @@
 +#!/bin/bash
  #
  #  File:  platform.sh
- #  Date:  6-Aug-97  J. Westbrook
+ #  Original:  6-Aug-97  J. Westbrook

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/devnull-log	2014-07-29 16:09:30 UTC (rev 17553)
@@ -6,7 +6,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-September/017173.html
 --- a/cif-parser/include/CifParserBase.h
 +++ b/cif-parser/include/CifParserBase.h
-@@ -73,7 +73,9 @@
+@@ -73,7 +73,9 @@ class CifParser : public CifScanner
          **  \param[in] fileName - relative or absolute name of the CIF file
          **    that is to be parsed.
          **  \param[in] parseLogFileName - relative or absolute name of the file
@@ -19,7 +19,7 @@
          **    parsing warnings and/or parsing errors.
 --- a/cif-parser/src/CifParserBase.C
 +++ b/cif-parser/src/CifParserBase.C
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ void CifParser::Parse(const string& file
      if (RcsbFile::IsEmpty(log))
      {
          log.close();

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/docs	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/etc/Doxyfile-template
 +++ b/etc/Doxyfile-template
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ INLINE_INHERITED_MEMB  = NO
  # 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.
  
@@ -12,7 +12,7 @@
  
  # 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 @@
+@@ -250,7 +250,7 @@ EXTRACT_ALL            = YES
  # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
  # will be included in the documentation.
  
@@ -21,7 +21,7 @@
  
  # If the EXTRACT_STATIC tag is set to YES all static members of a file 
  # will be included in the documentation.
-@@ -423,26 +423,26 @@
+@@ -423,26 +423,26 @@ FILE_VERSION_FILTER    =
  # The QUIET tag can be used to turn on/off the messages that are generated 
  # by doxygen. Possible values are YES and NO. If left blank NO is used.
  
@@ -52,7 +52,7 @@
  
  # This WARN_NO_PARAMDOC option can be abled to get warnings for 
  # functions that are documented, but have no documentation for their parameters 
-@@ -798,7 +798,7 @@
+@@ -798,7 +798,7 @@ TREEVIEW_WIDTH         = 250
  # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
  # generate Latex output.
  
@@ -63,7 +63,7 @@
  # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 --- a/Makefile
 +++ b/Makefile
-@@ -98,10 +98,19 @@
+@@ -115,10 +115,19 @@ clean_test:
  
  ###
  doc:

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/exit-in-shlib
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/exit-in-shlib	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/exit-in-shlib	2014-07-29 16:09:30 UTC (rev 17553)
@@ -5,7 +5,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/cif-file/src/ParentChild.C
 +++ b/cif-file/src/ParentChild.C
-@@ -287,7 +287,7 @@
+@@ -287,7 +287,7 @@ void ParentChild::CreateAllRelations(
  #ifdef VLAD_FIX
      if (parKeys.empty())
      {

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/hardening	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/cif-file/Makefile
 +++ b/cif-file/Makefile
-@@ -141,5 +141,5 @@
+@@ -141,5 +141,5 @@ $(L_MOD_LIB): $(OBJ_FILES)
  
  # Rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -12,7 +12,7 @@
  
 --- a/cif-file-util/Makefile
 +++ b/cif-file-util/Makefile
-@@ -141,5 +141,5 @@
+@@ -141,5 +141,5 @@ $(L_MOD_LIB): $(OBJ_FILES)
  
  # Rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -21,7 +21,7 @@
  
 --- a/cif-parser/Makefile
 +++ b/cif-parser/Makefile
-@@ -181,17 +181,17 @@
+@@ -181,17 +181,17 @@ obj/%Parser.o $(SRC_DIR)/%Parser.h: $(SR
  	sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
  	mv $(^:.y=.tab.c) $(^:.y=.c)
  	mv $(^:.y=.tab.h) $(^:.y=.h)
@@ -45,7 +45,7 @@
  
 --- a/common/Makefile
 +++ b/common/Makefile
-@@ -153,5 +153,5 @@
+@@ -153,5 +153,5 @@ $(L_MOD_LIB): $(OBJ_FILES)
  
  # Rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -54,7 +54,7 @@
  
 --- a/dict-obj-file/Makefile
 +++ b/dict-obj-file/Makefile
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ clean: clean_build clean_test
  
  # Rule for making executables
  %: $(OBJ_DIR)/%.o $(M_MOD_LIB) $(ALL_DEP_LIBS)
@@ -63,7 +63,7 @@
  	@cp -f $(L_BIN_DIR)/$@ $(M_BIN_DIR)/$@
  
  
-@@ -203,10 +203,10 @@
+@@ -203,10 +203,10 @@ $(L_MOD_LIB): $(OBJ_OTHER_FILES)
  
  # Rule for making object files
  $(OBJ_DIR)/%.o: $(SRC_DIR)/%.C
@@ -78,7 +78,7 @@
  
 --- a/etc/make.platform.gnu4
 +++ b/etc/make.platform.gnu4
-@@ -108,8 +108,8 @@
+@@ -108,8 +108,8 @@ NON_ANSI_C_FLAG=
  C_WARNINGS=$(WARNINGS)
  
  # C compiler flags
@@ -89,7 +89,7 @@
  
  ## C++ compiler
  ## This part defines C++ compiler information
-@@ -128,14 +128,14 @@
+@@ -128,14 +128,14 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECA
  EXT=C
  
  # C++ compiler flags
@@ -107,7 +107,7 @@
    $(DEFINES) $(INCLUDES)
  
  ## Fortran compiler
-@@ -158,8 +158,8 @@
+@@ -158,8 +158,8 @@ F77LIBS=
  STATIC_LINKING=-static
  
  # Linker flags
@@ -120,7 +120,7 @@
  F77_LINKER=f77
 --- a/pdbml-parser/Makefile
 +++ b/pdbml-parser/Makefile
-@@ -222,10 +222,10 @@
+@@ -222,10 +222,10 @@ $(L_MOD_LIB): $(OBJ_OTHER_FILES)
  
  # General rule for making object files
  $(OBJ_DIR)/%.o: $(SRC_DIR)/%.C
@@ -135,7 +135,7 @@
  
 --- a/tables/Makefile
 +++ b/tables/Makefile
-@@ -138,5 +138,5 @@
+@@ -138,5 +138,5 @@ $(L_MOD_LIB): $(OBJ_FILES)
  
  # Rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -144,7 +144,7 @@
  
 --- a/wrapper/Makefile
 +++ b/wrapper/Makefile
-@@ -146,10 +146,10 @@
+@@ -148,10 +148,10 @@ clean_build:
  $(L_MOD_LIB): $(OBJ_FILES) $(ALL_DEP_LIBS)
  #       Create module library
  
@@ -159,7 +159,7 @@
  
 --- a/regex/Makefile
 +++ b/regex/Makefile
-@@ -152,7 +152,7 @@
+@@ -152,7 +152,7 @@ $(L_MOD_LIB): $(OBJ_FILES)
  
  # Rule for making object files
  %.o: $(SRC_DIR)/%.c
@@ -168,7 +168,7 @@
  
  
  # Extra, non-used in PDB build
-@@ -180,18 +180,18 @@
+@@ -180,18 +180,18 @@ TARGET   = $(L_BIN_DIR)/re
  
  
  $(OBJ_DIR)/main.o: $(H) $(HEADER_FILES) $(SRC_DIR)/main.c $(L_INCL_DIR)/main.ih

Deleted: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_pair	2014-07-29 16:09:30 UTC (rev 17553)
@@ -1,14 +0,0 @@
-Author: Laszlo Kajan <lkajan at rostlab.org>
-Description: fix for missing 'using' statement
-Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
---- 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()

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_test_target
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_test_target	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/make_test_target	2014-07-29 16:09:30 UTC (rev 17553)
@@ -4,7 +4,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2013-September/022553.html
 --- a/Makefile
 +++ b/Makefile
-@@ -103,7 +103,7 @@
+@@ -121,7 +121,7 @@ clean_build:
  
  test: test-all
  

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/cif-file/Makefile
 +++ b/cif-file/Makefile
-@@ -133,11 +133,13 @@
+@@ -133,11 +133,13 @@ clean_build:
  $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
@@ -20,7 +20,7 @@
  
 --- a/cif-file-util/Makefile
 +++ b/cif-file-util/Makefile
-@@ -133,11 +133,13 @@
+@@ -133,11 +133,13 @@ clean_build:
  $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
@@ -37,7 +37,7 @@
  
 --- a/cif-parser/Makefile
 +++ b/cif-parser/Makefile
-@@ -170,6 +170,8 @@
+@@ -170,6 +170,8 @@ clean_build:
  $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
@@ -46,7 +46,7 @@
  	$(RANLIB) $@
  	@echo $@ " is up to date."
  
-@@ -179,14 +181,14 @@
+@@ -179,14 +181,14 @@ $(OBJ_DIR)/%Parser.o: $(SRC_DIR)/%Parser
  	@sh -c 'cd $(SRC_DIR); $(YACC) $(${^F:.y=_YACC_FLAGS}) ../$<'
  	mv $(^:.y=.tab.c) $(^:.y=.c)
  	mv $(^:.y=.tab.h) $(^:.y=.h)
@@ -66,7 +66,7 @@
  
 --- a/common/Makefile
 +++ b/common/Makefile
-@@ -145,11 +145,13 @@
+@@ -145,11 +145,13 @@ clean_build:
  $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
@@ -83,7 +83,7 @@
  
 --- a/dict-obj-file/Makefile
 +++ b/dict-obj-file/Makefile
-@@ -193,6 +193,8 @@
+@@ -193,6 +193,8 @@ $(M_MOD_LIB): $(L_MOD_LIB)
  $(L_MOD_LIB): $(OBJ_OTHER_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_OTHER_FILES)
@@ -92,7 +92,7 @@
  	$(RANLIB) $@
  	@echo $@ " is up to date."
  
-@@ -204,5 +206,5 @@
+@@ -204,5 +206,5 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.C
  
  # Phony rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -101,7 +101,7 @@
  
 --- a/pdbml-parser/Makefile
 +++ b/pdbml-parser/Makefile
-@@ -211,6 +211,8 @@
+@@ -211,6 +211,8 @@ $(M_MOD_LIB): $(L_MOD_LIB)
  $(L_MOD_LIB): $(OBJ_OTHER_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_OTHER_FILES)
@@ -110,7 +110,7 @@
  	$(RANLIB) $@
  	@echo $@ " is up to date."
  
-@@ -225,5 +227,5 @@
+@@ -225,5 +227,5 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.C
  
  # Phony rule for making object files
  %.o: $(SRC_DIR)/%.C
@@ -119,7 +119,7 @@
  
 --- a/regex/Makefile
 +++ b/regex/Makefile
-@@ -144,13 +144,15 @@
+@@ -144,13 +144,15 @@ clean_test:
  $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
@@ -136,7 +136,7 @@
  
  
  # Extra, non-used in PDB build
-@@ -181,7 +183,7 @@
+@@ -181,7 +183,7 @@ $(OBJ_DIR)/main.o: $(H) $(HEADER_FILES)
  	$(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/main.c -o $@
  
  $(OBJ_DIR)/split.o: $(H) $(HEADER_FILES) $(SRC_DIR)/split.c 
@@ -147,7 +147,7 @@
  	$(CC) $(CFLAGS_NONANSI) -DPOSIX_MISTAKE -c $(SRC_DIR)/debug.c -o $(OBJ_DIR)/$@
 --- a/tables/Makefile
 +++ b/tables/Makefile
-@@ -130,11 +130,13 @@
+@@ -130,11 +130,13 @@ clean_build:
  $(L_MOD_LIB): $(OBJ_FILES)
  #       Create module library
  	@cd $(OBJ_DIR); $(AR) $(AR_PUTFLAGS) ../$@ $(OBJ_FILES)
@@ -164,35 +164,29 @@
  
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,4 @@
- # Top level Makefile
--
- UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util
- UTIL_MODULE = util
- CHECKOUT_SCRIPT = checkout.sh
-@@ -12,9 +11,7 @@
+@@ -12,9 +12,7 @@ DOC_SCRIPT = doc.sh
  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 -------
+-	@echo ------- compile targets are compile_lnx_38, compile_lnx_41, compile_wwpdb_py27 and compile_osx -------
 +all: lib/librcsb-core-wrapper.la
  
  compile:  
  	@echo
-@@ -82,11 +79,23 @@
-         export WWPDB_XERCESC_LIB=xerces-c; \
-         ./$(COMPILE_SCRIPT)'
+@@ -99,11 +97,23 @@ compile_wwpdb_py27:
  
+ 
+ 
 +# 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:
 +	+sh -c '\
-+        export PIC=-fPIC; \
-+        export WWPDB_XERCESC_INC=/usr/include; \
-+        export WWPDB_XERCESC_LIB_DIR=/usr/lib; \
-+        export WWPDB_XERCESC_LIB=xerces-c; \
++	 export PIC=-fPIC; \
++	 export WWPDB_XERCESC_INC=/usr/include; \
++	 export WWPDB_XERCESC_LIB_DIR=/usr/lib; \
++	 export WWPDB_XERCESC_LIB=xerces-c; \
 +	( cd ./$(UTIL_MODULE); ./$(COMPILE_SCRIPT) ); \
 +	libtool --mode=link $(CXX) -version-info 0:1:0 -rpath /usr/lib $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -l$${WWPDB_XERCESC_LIB} -o lib/librcsb-core-wrapper.la lib/*.lo'
 +

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/parallel-build	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/cif-parser/Makefile
 +++ b/cif-parser/Makefile
-@@ -167,7 +167,7 @@
+@@ -167,7 +167,7 @@ clean_build:
  	@rm -f $(M_AGR_LIB)
  
  
@@ -12,7 +12,7 @@
  #       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))
-@@ -177,18 +177,21 @@
+@@ -177,18 +177,21 @@ $(L_MOD_LIB): $(OBJ_FILES)
  
  
  # Specific rules for making object files
@@ -44,7 +44,7 @@
  
 --- a/dict-obj-file/Makefile
 +++ b/dict-obj-file/Makefile
-@@ -111,7 +111,10 @@
+@@ -111,7 +111,10 @@ all: install
  
  
  # Installation
@@ -56,7 +56,7 @@
  
  
  # Test
-@@ -141,7 +144,6 @@
+@@ -141,7 +144,6 @@ clean: clean_build clean_test
  %: $(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)/$@

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/rm-duplicate-module	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/local/modules.txt
 +++ b/local/modules.txt
-@@ -7,5 +7,4 @@
+@@ -7,5 +7,4 @@ svn https://svn-dev.wwpdb.org/svn-rcsb/c
  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

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/series	2014-07-29 16:09:30 UTC (rev 17553)
@@ -1,7 +1,6 @@
 wrapper-module
 rm-duplicate-module
 bash
-make_pair
 unistd
 devnull-log
 docs

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/setup.py.in	2014-07-29 16:09:30 UTC (rev 17553)
@@ -55,7 +55,7 @@
 +)
 --- a/wrapper/Makefile
 +++ b/wrapper/Makefile
-@@ -101,11 +101,16 @@
+@@ -103,11 +103,16 @@ ALL_OBJ_FILES = *.o
  .PHONY: ../etc/Makefile.platform all install export clean clean_build
  
  
@@ -73,7 +73,7 @@
  
  export:
  	mkdir -p $(EXPORT_DIR)
-@@ -135,6 +140,7 @@
+@@ -137,6 +142,7 @@ clean_build:
  	@rm -f $(M_MOD_LIB)
  	@rm -f $(M_AGR_LIB)
  	@rm -f *.pyc
@@ -83,7 +83,7 @@
  $(L_MOD_LIB): $(OBJ_FILES) $(ALL_DEP_LIBS)
 --- a/Makefile
 +++ b/Makefile
-@@ -11,7 +11,11 @@
+@@ -12,7 +12,11 @@ DOC_SCRIPT = doc.sh
  CLEAN_DOC_SCRIPT = clean_doc.sh
  EXPORT_SCRIPT = export.sh
  

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/spelling
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/spelling	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/spelling	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/wrapper/src/DataInfoPyWrap.C
 +++ b/wrapper/src/DataInfoPyWrap.C
-@@ -31,23 +31,23 @@
+@@ -31,23 +31,23 @@ struct DataInfo_wrapper : DataInfo, bp::
      }
  
      virtual ::std::vector< std::string > const & GetCatAttribute( ::std::string const & catName, ::std::string const & refCatName, ::std::string const & refAttribName ){

Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper-module
===================================================================
--- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper-module	2014-07-29 16:05:55 UTC (rev 17552)
+++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/wrapper-module	2014-07-29 16:09:30 UTC (rev 17553)
@@ -3,7 +3,7 @@
 Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html
 --- a/local/modules.txt
 +++ b/local/modules.txt
-@@ -9,4 +9,3 @@
+@@ -9,4 +9,3 @@ svn https://svn-dev.wwpdb.org/svn-rcsb/c
  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

More information about the debian-med-commit mailing list