Author: moeller Date: 2010-06-02 20:27:29 +0000 (Wed, 02 Jun 2010) New Revision: 4855
Added: trunk/packages/gentle/trunk/debian/patches/ trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch trunk/packages/gentle/trunk/debian/patches/series trunk/packages/gentle/trunk/debian/source/ trunk/packages/gentle/trunk/debian/source/format Modified: trunk/packages/gentle/trunk/debian/README.source trunk/packages/gentle/trunk/debian/changelog trunk/packages/gentle/trunk/debian/control trunk/packages/gentle/trunk/debian/rules Log: Series of changes to avoid source code reduncancy with tinyurl Modified: trunk/packages/gentle/trunk/debian/README.source =================================================================== --- trunk/packages/gentle/trunk/debian/README.source 2010-06-01 12:40:32 UTC (rev 4854) +++ trunk/packages/gentle/trunk/debian/README.source 2010-06-02 20:27:29 UTC (rev 4855) @@ -1,10 +1,15 @@ GENtle for Debian ----------------- -The sources were taken from the CVS repository -with the CVS directories removed. +The sources were taken from the CVS repository, removed are + - the CVS directories + - the tinyxml directory A later upload will also have the clustalw folder removed for full dfsg compliance. +Patches: + remove_tinyxml.patch - small changes to Makefile.am since tinyurl is now gone + + Modified: trunk/packages/gentle/trunk/debian/changelog =================================================================== --- trunk/packages/gentle/trunk/debian/changelog 2010-06-01 12:40:32 UTC (rev 4854) +++ trunk/packages/gentle/trunk/debian/changelog 2010-06-02 20:27:29 UTC (rev 4855) @@ -1,11 +1,16 @@ -gentle (1.9+cvs20100531-2) UNRELEASED; urgency=low +gentle (1.9+20100602+dfsg-1) experimental; urgency=low + * Reupload in reaction to ftp-masters comments (Closes: #582959) + * removed tinyurl + - which introduced dependency to quilt + - and provoked +dfsg suffix to version (not fully correct, yet) + * declared 1.0 source format * explicitly listing man page as such - -- Steffen Moeller <[email protected]> Wed, 26 May 2010 01:22:02 +0200 + -- Steffen Moeller <[email protected]> Wed, 02 Jun 2010 12:07:21 +0200 gentle (1.9+cvs20100531-1) experimental; urgency=low - * Initial release (Closes: #582959) + * Initial release. -- Steffen Moeller <[email protected]> Tue, 25 May 2010 00:08:31 +0200 Modified: trunk/packages/gentle/trunk/debian/control =================================================================== --- trunk/packages/gentle/trunk/debian/control 2010-06-01 12:40:32 UTC (rev 4854) +++ trunk/packages/gentle/trunk/debian/control 2010-06-02 20:27:29 UTC (rev 4855) @@ -2,7 +2,7 @@ Section: non-free/science Priority: optional Maintainer: Steffen Moeller <[email protected]> -Build-Depends: debhelper (>= 7), autotools-dev, libwxgtk2.8-dev +Build-Depends: debhelper (>= 7), autotools-dev, libwxgtk2.8-dev, quilt Standards-Version: 3.8.4 Homepage: http://gentle.magnusmanske.de Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gentle/trunk/?rev=0&sc=0 Added: trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch =================================================================== --- trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch (rev 0) +++ trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch 2010-06-02 20:27:29 UTC (rev 4855) @@ -0,0 +1,75 @@ +Index: gentle-1.9+20100602+dfsg/Makefile.am +=================================================================== +--- gentle-1.9+20100602+dfsg.orig/Makefile.am 2010-06-02 11:08:25.000000000 +0200 ++++ gentle-1.9+20100602+dfsg/Makefile.am 2010-06-02 11:10:15.000000000 +0200 +@@ -63,7 +63,7 @@ + bitmaps/scissors.bmp + + +-GENtle_LDADD = $(WX_LIBS) -L/usr/lib -L/usr/local/lib -lsqlite -lsqlite3 -lmysqlclient ++GENtle_LDADD = $(WX_LIBS) -L/usr/lib -L/usr/local/lib -lsqlite -lsqlite3 -lmysqlclient -ltinyxml + GENtle_LDFLAGS = -s + GENtle_SOURCES = TXMLfile.cpp\ + TVectorTree.cpp\ +@@ -137,10 +137,6 @@ + TPhyloTree.cpp\ + PCR_Troubleshoot.cpp\ + TProteolysis.cpp\ +-tinyxml/tinyxmlparser.cpp\ +-tinyxml/tinyxmlerror.cpp\ +-tinyxml/tinyxml.cpp\ +-tinyxml/tinystr.cpp\ + clustalw/alnscore.cpp\ + clustalw/amenu.cpp\ + clustalw/calcgap.cpp\ +@@ -235,8 +231,6 @@ + TPhyloTree.h\ + TEliteLaChromLogDialog.h\ + ncoils.h\ +-tinyxml/tinyxml.h\ +-tinyxml/tinystr.h\ + clustalw/clustalw.h\ + clustalw/dayhoff.h \ + clustalw/general.h \ +Index: gentle-1.9+20100602+dfsg/main.h +=================================================================== +--- gentle-1.9+20100602+dfsg.orig/main.h 2010-06-02 22:02:39.000000000 +0200 ++++ gentle-1.9+20100602+dfsg/main.h 2010-06-02 22:03:57.000000000 +0200 +@@ -129,7 +129,11 @@ + + // Don't you *EVER* turn this on again!!!! + //#define TIXML_USE_STL ++#ifndef __DEBIAN__ + #include "tinyxml/tinyxml.h" ++#else ++#include "tinyxml.h" ++#endif + + #include <wx/wx.h> + #include <wx/toolbar.h> +Index: gentle-1.9+20100602+dfsg/TXMLfile.cpp +=================================================================== +--- gentle-1.9+20100602+dfsg.orig/TXMLfile.cpp 2010-06-02 22:07:18.000000000 +0200 ++++ gentle-1.9+20100602+dfsg/TXMLfile.cpp 2010-06-02 22:22:56.000000000 +0200 +@@ -50,7 +50,7 @@ + analyze ( doc ) ; + } + +-void TXMLfile::analyze ( const TiXmlDocument &doc ) ++void TXMLfile::analyze ( TiXmlDocument &doc ) + { + if ( doc.FirstChild ( "GBSeq" ) ) + { +Index: gentle-1.9+20100602+dfsg/TXMLfile.h +=================================================================== +--- gentle-1.9+20100602+dfsg.orig/TXMLfile.h 2010-06-02 22:13:31.000000000 +0200 ++++ gentle-1.9+20100602+dfsg/TXMLfile.h 2010-06-02 22:22:32.000000000 +0200 +@@ -25,7 +25,7 @@ + TVector *getVector ( int a ) ; ///< Returns pointer to one of the vectors + + private : +- void analyze ( const TiXmlDocument &doc ) ; ///< Parse single/multiple sequences ++ void analyze ( TiXmlDocument &doc ) ; ///< Parse single/multiple sequences + void readGBSeq ( TiXmlNode *base ) ; ///< The actual parser + wxString t ( TiXmlText *txt ) ; ///< Safe text conversion + wxString t ( const char *txt ) ; ///< Safe text conversion Added: trunk/packages/gentle/trunk/debian/patches/series =================================================================== --- trunk/packages/gentle/trunk/debian/patches/series (rev 0) +++ trunk/packages/gentle/trunk/debian/patches/series 2010-06-02 20:27:29 UTC (rev 4855) @@ -0,0 +1,2 @@ +TXMLfile_adjustments.patch +remove_tinyxml.patch Modified: trunk/packages/gentle/trunk/debian/rules =================================================================== --- trunk/packages/gentle/trunk/debian/rules 2010-06-01 12:40:32 UTC (rev 4854) +++ trunk/packages/gentle/trunk/debian/rules 2010-06-02 20:27:29 UTC (rev 4855) @@ -9,12 +9,17 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + CXXFLAGS="-D__DEBIAN__ -O2 -g" -configure: configure-stamp +configure: patch configure-stamp configure-stamp: dh_testdir echo "configuring with own configure!" + aclocal + automake + autoconf CXXFLAGS=$(CXXFLAGS) ./configure --prefix=/usr touch $@ @@ -60,7 +65,7 @@ binary: binary-arch binary-indep -clean: +clean:: unpatch dh_testdir dh_testroot find . -name "*.o" | xargs -r rm @@ -69,8 +74,16 @@ -VERSION=1.9+`date +"%Y%m%d"` +VERSION=1.9+$(shell date +"%Y%m%d"|tr -d ' \t\n')+dfsg get-orig-source: + if [ -d GENtle ]; then \ + echo "Previous checkout exists as folder 'GENtle', please remove." ; \ + exit -1 ; \ + fi + if [ -d "gentle-$(VERSION)" ]; then \ + echo "Previous checkout exists as folder 'gentle-$(VERSION)', please remove." ; \ + exit -1 ; \ + fi cvs -z3 -d:pserver:[email protected]:/cvsroot/gentle-m co -P GENtle - mv gentle gentle-$(VERSION) - tar --exclude CVS --exclude .cvsignore -cvf gentle_$(VERSION).orig.tar.gz gentle-$(VERSION) + mv GENtle "gentle-$(VERSION)" + GZIP=-9 tar --exclude CVS --exclude tinyxml --exclude .deps --exclude .cvsignore -czvf "gentle_$(VERSION).orig.tar.gz" "gentle-$(VERSION)" Added: trunk/packages/gentle/trunk/debian/source/format =================================================================== --- trunk/packages/gentle/trunk/debian/source/format (rev 0) +++ trunk/packages/gentle/trunk/debian/source/format 2010-06-02 20:27:29 UTC (rev 4855) @@ -0,0 +1 @@ +1.0 _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
