Author: lkajan Date: 2013-05-16 10:51:15 +0000 (Thu, 16 May 2013) New Revision: 13594
Added: trunk/packages/dssp/tags/2.1.0-1/ trunk/packages/dssp/tags/2.1.0-1/debian/changelog trunk/packages/dssp/tags/2.1.0-1/debian/control trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile Removed: trunk/packages/dssp/tags/2.1.0-1/debian/changelog trunk/packages/dssp/tags/2.1.0-1/debian/control trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile Log: [svn-buildpackage] Tagging dssp 2.1.0-1 Deleted: trunk/packages/dssp/tags/2.1.0-1/debian/changelog =================================================================== --- trunk/packages/dssp/trunk/debian/changelog 2013-05-15 17:57:55 UTC (rev 13591) +++ trunk/packages/dssp/tags/2.1.0-1/debian/changelog 2013-05-16 10:51:15 UTC (rev 13594) @@ -1,29 +0,0 @@ -dssp (2.1.0-1) UNRELEASED; urgency=low - - * New upstream release. - - -- Laszlo Kajan <[email protected]> Wed, 08 May 2013 18:20:06 +0200 - -dssp (2.0.4-2) unstable; urgency=low - - [ Laszlo Kajan ] - * Stick to debhelper compatibility level 7 to enable flawless - build on Ubuntu Lucid (documented in debian/README.source) - - [ Maarten L. Hekkelman ] - * Fix for compiling with gcc 4.7, std::min (Closes: #673434) - * Added the use of dpkg-buildflags to include hardening flags since - debhelper is still maintained at version 7. - - -- Maarten L. Hekkelman <[email protected]> Mon, 21 May 2012 10:00:00 +0200 - -dssp (2.0.4-1) unstable; urgency=low - - * Initial release. (Closes: #669259) - * Added description to dssp; added upstream (reference); parallel building - now enabled; fixed spelling error in man page; added debug package; - fixed debian/watch; added get-orig-source target to rules. - * Changed libboost build dependency to version >= 1.42.0.1 to allow - building on stable. - - -- Laszlo Kajan <[email protected]> Wed, 18 Apr 2012 11:09:02 +0200 Copied: trunk/packages/dssp/tags/2.1.0-1/debian/changelog (from rev 13593, trunk/packages/dssp/trunk/debian/changelog) =================================================================== --- trunk/packages/dssp/tags/2.1.0-1/debian/changelog (rev 0) +++ trunk/packages/dssp/tags/2.1.0-1/debian/changelog 2013-05-16 10:51:15 UTC (rev 13594) @@ -0,0 +1,32 @@ +dssp (2.1.0-1) unstable; urgency=low + + * New upstream release. + * Boost got fixed, bug was 'FTBFS: xtime.hpp:23:5: error: expected + identifier before numeric constant' (no changes to dssp were + required to solve bug) (Closes: #708446) + + -- Laszlo Kajan <[email protected]> Wed, 08 May 2013 18:20:06 +0200 + +dssp (2.0.4-2) unstable; urgency=low + + [ Laszlo Kajan ] + * Stick to debhelper compatibility level 7 to enable flawless + build on Ubuntu Lucid (documented in debian/README.source) + + [ Maarten L. Hekkelman ] + * Fix for compiling with gcc 4.7, std::min (Closes: #673434) + * Added the use of dpkg-buildflags to include hardening flags since + debhelper is still maintained at version 7. + + -- Maarten L. Hekkelman <[email protected]> Mon, 21 May 2012 10:00:00 +0200 + +dssp (2.0.4-1) unstable; urgency=low + + * Initial release. (Closes: #669259) + * Added description to dssp; added upstream (reference); parallel building + now enabled; fixed spelling error in man page; added debug package; + fixed debian/watch; added get-orig-source target to rules. + * Changed libboost build dependency to version >= 1.42.0.1 to allow + building on stable. + + -- Laszlo Kajan <[email protected]> Wed, 18 Apr 2012 11:09:02 +0200 Deleted: trunk/packages/dssp/tags/2.1.0-1/debian/control =================================================================== --- trunk/packages/dssp/trunk/debian/control 2013-05-15 17:57:55 UTC (rev 13591) +++ trunk/packages/dssp/tags/2.1.0-1/debian/control 2013-05-16 10:51:15 UTC (rev 13594) @@ -1,43 +0,0 @@ -Source: dssp -Priority: optional -Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Maarten L. Hekkelman <[email protected]>, - Laszlo Kajan <[email protected]>, - Andreas Tille <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), - libboost-filesystem-dev (>= 1.42.0), - libboost-iostreams-dev (>= 1.42.0), - libboost-program-options-dev (>= 1.42.0), - libboost-system-dev (>= 1.42.0), - libboost-thread-dev (>= 1.42.0) -Standards-Version: 3.9.4 -Section: science -Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dssp/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dssp/trunk/ -Homepage: http://www.cmbi.ru.nl/dssp.html - -Package: dssp -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: protein secondary structure assignment based on 3D structure - DSSP is an application you use to assign the secondary structure of a protein - based on its solved three dimensional (3D) structure. - . - This version (2) of DSSP is a rewrite that produces the same output as the - original DSSP, but deals better with exceptions in PDB files and is much - faster. - -Package: dssp-dbg -Architecture: any -Section: debug -Priority: extra -Depends: dssp (= ${binary:Version}), ${misc:Depends} -Description: debugging symbols for dssp - DSSP is an application to assign the secondary structure of a protein - based on its three dimensional (3D) structure. - . - This version (2) of DSSP is a rewrite that produces the same output as the - original DSSP, but deals better with exceptions in PDB files and is much - faster. - . - This package provides the detached debug symbols for dssp. Copied: trunk/packages/dssp/tags/2.1.0-1/debian/control (from rev 13593, trunk/packages/dssp/trunk/debian/control) =================================================================== --- trunk/packages/dssp/tags/2.1.0-1/debian/control (rev 0) +++ trunk/packages/dssp/tags/2.1.0-1/debian/control 2013-05-16 10:51:15 UTC (rev 13594) @@ -0,0 +1,43 @@ +Source: dssp +Priority: optional +Maintainer: Debian Med Packaging Team <[email protected]> +Uploaders: Maarten L. Hekkelman <[email protected]>, + Laszlo Kajan <[email protected]>, + Andreas Tille <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), + libboost-filesystem-dev (>= 1.46.0), + libboost-iostreams-dev (>= 1.42.0), + libboost-program-options-dev (>= 1.42.0), + libboost-system-dev (>= 1.42.0), + libboost-thread-dev (>= 1.42.0) +Standards-Version: 3.9.4 +Section: science +Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dssp/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dssp/trunk/ +Homepage: http://www.cmbi.ru.nl/dssp.html + +Package: dssp +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: protein secondary structure assignment based on 3D structure + DSSP is an application you use to assign the secondary structure of a protein + based on its solved three dimensional (3D) structure. + . + This version (2) of DSSP is a rewrite that produces the same output as the + original DSSP, but deals better with exceptions in PDB files and is much + faster. + +Package: dssp-dbg +Architecture: any +Section: debug +Priority: extra +Depends: dssp (= ${binary:Version}), ${misc:Depends} +Description: debugging symbols for dssp + DSSP is an application to assign the secondary structure of a protein + based on its three dimensional (3D) structure. + . + This version (2) of DSSP is a rewrite that produces the same output as the + original DSSP, but deals better with exceptions in PDB files and is much + faster. + . + This package provides the detached debug symbols for dssp. Deleted: trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile =================================================================== --- trunk/packages/dssp/trunk/debian/patches/makefile 2013-05-15 17:57:55 UTC (rev 13591) +++ trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile 2013-05-16 10:51:15 UTC (rev 13594) @@ -1,76 +0,0 @@ -Description: assorted fixes - [Maarten L. Hekkelman <[email protected]>] - * DEST_DIR patched to DESTDIR - . - [Laszlo Kajan <[email protected]>] - * stripping is patched out so that it can be done by dh into a debug package - * line echo suppression is removed - * spelling errors in man page fixed - . - Upstream is aware of this patch. -Author: Maarten L. Hekkelman <[email protected]> -Author: Laszlo Kajan <[email protected]> ---- a/makefile -+++ b/makefile -@@ -11,18 +11,16 @@ - - all: mkdssp - --include make.config -- - VERSION = 2.1.0 - - DEST_DIR ?= /usr/local - LIB_DIR = $(BOOST_LIB_DIR) - INC_DIR = $(BOOST_INC_DIR) --BIN_DIR = $(DEST_DIR)/bin --MAN_DIR = $(DEST_DIR)/man/man1 -+BIN_DIR = $(DESTDIR)$(DEST_DIR)/bin -+MAN_DIR = $(DESTDIR)$(DEST_DIR)/share/man/man1 - --BOOST_LIBS = thread filesystem program_options iostreams system --LIBS = $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) z bz2 -+BOOST_LIBS = thread program_options iostreams system -+LIBS = $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) - - DEFINES = USE_COMPRESSION LINUX VERSION='"$(VERSION)"' - CXX = g++ -@@ -49,22 +47,19 @@ - OBJECTS = $(OBJ_DIR)/mkdssp.o $(OBJ_DIR)/dssp.o $(OBJ_DIR)/primitives-3d.o $(OBJ_DIR)/structure.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/mas.o - - mkdssp: $(OBJECTS) -- @ echo linking $@ -- @ $(CXX) -static -o $@ $^ $(LDOPTS) -+ $(CXX) -o $@ $^ $(LDOPTS) - --include $(OBJECTS:%.o=%.d) -+-include $(OBJECTS:%.o=%.d) - - $(OBJECTS:.o=.d): - - $(OBJ_DIR): -- @ mkdir -p $(OBJ_DIR) -+ mkdir -p $(OBJ_DIR) - - $(OBJ_DIR)/%.o: %.cpp | $(OBJ_DIR) -- @ echo compiling $@ -- @ $(CXX) -MD -c -o $@ $< $(CFLAGS) -+ $(CXX) -MD -c -o $@ $< $(CFLAGS) - - clean: -- install -d $(BIN_DIR) $(MAN_DIR) - rm -rf $(OBJ_DIR)/* mkdssp - - install: mkdssp -@@ -85,11 +80,3 @@ - @ cp doc/mkdssp.1 $(DIST_NAME)/doc/mkdssp.1 - tar czf $(DIST_NAME).tgz $(DIST_NAME) - cp $(DIST_NAME).tgz dssp_$(VERSION).orig.tar.gz -- --make.config: -- @echo "creating empty make.config file" -- @echo "# Set local options for make here" > make.config -- @echo "#BOOST_LIB_SUFFIX = -mt" >> make.config -- @echo "#BOOST_LIB_DIR = $(HOME)/projects/boost/lib" >> make.config -- @echo "#BOOST_INC_DIR = $(HOME)/projects/boost/include" >> make.config -- Copied: trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile (from rev 13593, trunk/packages/dssp/trunk/debian/patches/makefile) =================================================================== --- trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile (rev 0) +++ trunk/packages/dssp/tags/2.1.0-1/debian/patches/makefile 2013-05-16 10:51:15 UTC (rev 13594) @@ -0,0 +1,76 @@ +Description: assorted fixes + [Maarten L. Hekkelman <[email protected]>] + * DEST_DIR patched to DESTDIR + . + [Laszlo Kajan <[email protected]>] + * stripping is patched out so that it can be done by dh into a debug package + * line echo suppression is removed + * spelling errors in man page fixed + . + Upstream is aware of this patch. +Author: Maarten L. Hekkelman <[email protected]> +Author: Laszlo Kajan <[email protected]> +--- a/makefile ++++ b/makefile +@@ -11,18 +11,16 @@ + + all: mkdssp + +-include make.config +- + VERSION = 2.1.0 + + DEST_DIR ?= /usr/local + LIB_DIR = $(BOOST_LIB_DIR) + INC_DIR = $(BOOST_INC_DIR) +-BIN_DIR = $(DEST_DIR)/bin +-MAN_DIR = $(DEST_DIR)/man/man1 ++BIN_DIR = $(DESTDIR)$(DEST_DIR)/bin ++MAN_DIR = $(DESTDIR)$(DEST_DIR)/share/man/man1 + +-BOOST_LIBS = thread filesystem program_options iostreams system +-LIBS = $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) z bz2 ++BOOST_LIBS = thread program_options iostreams system ++LIBS = $(BOOST_LIBS:%=boost_%$(BOOST_LIB_SUFFIX)) + + DEFINES = USE_COMPRESSION LINUX VERSION='"$(VERSION)"' + CXX = g++ +@@ -49,22 +47,19 @@ + OBJECTS = $(OBJ_DIR)/mkdssp.o $(OBJ_DIR)/dssp.o $(OBJ_DIR)/primitives-3d.o $(OBJ_DIR)/structure.o $(OBJ_DIR)/utils.o $(OBJ_DIR)/mas.o + + mkdssp: $(OBJECTS) +- @ echo linking $@ +- @ $(CXX) -static -o $@ $^ $(LDOPTS) ++ $(CXX) -o $@ $^ $(LDOPTS) + +-include $(OBJECTS:%.o=%.d) ++-include $(OBJECTS:%.o=%.d) + + $(OBJECTS:.o=.d): + + $(OBJ_DIR): +- @ mkdir -p $(OBJ_DIR) ++ mkdir -p $(OBJ_DIR) + + $(OBJ_DIR)/%.o: %.cpp | $(OBJ_DIR) +- @ echo compiling $@ +- @ $(CXX) -MD -c -o $@ $< $(CFLAGS) ++ $(CXX) -MD -c -o $@ $< $(CPPFLAGS) $(CFLAGS) + + clean: +- install -d $(BIN_DIR) $(MAN_DIR) + rm -rf $(OBJ_DIR)/* mkdssp + + install: mkdssp +@@ -85,11 +80,3 @@ + @ cp doc/mkdssp.1 $(DIST_NAME)/doc/mkdssp.1 + tar czf $(DIST_NAME).tgz $(DIST_NAME) + cp $(DIST_NAME).tgz dssp_$(VERSION).orig.tar.gz +- +-make.config: +- @echo "creating empty make.config file" +- @echo "# Set local options for make here" > make.config +- @echo "#BOOST_LIB_SUFFIX = -mt" >> make.config +- @echo "#BOOST_LIB_DIR = $(HOME)/projects/boost/lib" >> make.config +- @echo "#BOOST_INC_DIR = $(HOME)/projects/boost/include" >> make.config +- _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
