[med-svn] r14849 - in trunk/packages/gentle/trunk/debian: . patches

Wed Oct 16 06:12:35 UTC 2013

Author: tille
Date: 2013-10-16 06:12:34 +0000 (Wed, 16 Oct 2013)
New Revision: 14849

Removed:
   trunk/packages/gentle/trunk/debian/extra/
   trunk/packages/gentle/trunk/debian/patches/remove_old_sqlite.patch
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/copyright
   trunk/packages/gentle/trunk/debian/gentle.install
   trunk/packages/gentle/trunk/debian/manpages
   trunk/packages/gentle/trunk/debian/patches/series
   trunk/packages/gentle/trunk/debian/rules
Log:
For some very strange reason trunk did not reflected what was actually uploaded - bring this in sync


Modified: trunk/packages/gentle/trunk/debian/README.source
===================================================================

--- trunk/packages/gentle/trunk/debian/README.source	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/README.source	2013-10-16 06:12:34 UTC (rev 14849)
@@ -11,3 +11,5 @@
 
    remove_tinyxml.patch - small changes to Makefile.am since tinyurl is now gone
    remove_clustalw.patch - small changes to Makefile.am since clustalw is now gone
+
+

Modified: trunk/packages/gentle/trunk/debian/changelog
===================================================================
--- trunk/packages/gentle/trunk/debian/changelog	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/changelog	2013-10-16 06:12:34 UTC (rev 14849)
@@ -1,11 +1,14 @@
 gentle (1.9+cvs20100605+dfsg1-1) unstable; urgency=low
 
-  * debian/rules: Make sure that binary dlls will be deleted when
-    unpacking
-    Closes: #685149
+  * debian/rules:
+     - Make sure that binary dlls will be deleted when unpacking
+       Closes: #685149
+     - Use xz compression for upstream source
+     - Drop *.a files from upstream source in get-orig-source target
   * Versioned depends from DFSG free clustalw -> package can go to main
-  * debian/rules: Use xz compression for upstream source
-  * debian/control: fix broken VCS fields
+  * debian/control:
+     - fix broken VCS fields
+     - Standards-Version: 3.9.4 (no changes needed)
   * debian/upstream: Add citation information
 
  -- Andreas Tille <tille at debian.org>  Fri, 17 Aug 2012 14:36:52 +0200

Modified: trunk/packages/gentle/trunk/debian/control
===================================================================
--- trunk/packages/gentle/trunk/debian/control	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/control	2013-10-16 06:12:34 UTC (rev 14849)
@@ -3,15 +3,8 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
-           Andreas Tille <tille at debian.org>
-Build-Depends: autoconf,
-               automake,
-               autotools-dev,
-               debhelper (>= 7),
-               libmysqlclient-dev,
-               libsqlite3-dev,
-               libtinyxml-dev,
-               libwxgtk2.8-dev
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 7), autotools-dev, libwxgtk2.8-dev, libtinyxml-dev, automake, autoconf, libmysqlclient-dev, libsqlite3-dev, libsqlite0-dev
 Standards-Version: 3.9.4
 Homepage: http://gentle.magnusmanske.de
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gentle/trunk/
@@ -19,10 +12,22 @@
 
 Package: gentle
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: clustalw (>= 2.1+lgpl)
 Description: suite to plan genetic cloning
  GENtle is a software for DNA and amino acid editing, database management,
  plasmid maps, restriction and ligation, alignments, sequencer data
  import, calculators, gel image display, PCR, and much more.
+
+#Package: gentle-dbg
+#Architecture: any
+#Depends: gentle, ${shlibs:Depends}, ${misc:Depends}
+#Priority: extra
+#Recommends: libtinyxml2.6.2-dbg|libtinyxml2.5.3-dbg
+#Description: debug symbols for gentle suite for genetic cloning
+# As every suite working with a series of independently developed
+# programs, also GENtle tends to be perceived as rather complex.
+# This package prepares users and developers to communicate
+# over hunting and eliminating bugs.
+#
+# Why doesn't this work?

Modified: trunk/packages/gentle/trunk/debian/copyright
===================================================================
--- trunk/packages/gentle/trunk/debian/copyright	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/copyright	2013-10-16 06:12:34 UTC (rev 14849)
@@ -13,7 +13,7 @@
 
 Files: wav/*
 Copyright: Voxeo Corporation (http://evolution.voxeo.com)
-License: LGPL
+License: LGPL-3
 
 Files: ncoils.h ncoild.cpp coils/*
 Authors: Rob Russel <robert.russell at bioquant.uni-heidelberg.de>
@@ -36,7 +36,7 @@
 On Debian systems, the complete text of the GNU General Public
 License version 3 can be found in "/usr/share/common-licenses/GPL-3",
 version 2 can be found in "/usr/share/common-licenses/GPL-2".
-The LGPL is found in "/usr/share/common-licenses/LGPL".
+The LGPL is found in "/usr/share/common-licenses/LGPL-3".
 
 The Debian packaging is:
 

Modified: trunk/packages/gentle/trunk/debian/gentle.install
===================================================================
--- trunk/packages/gentle/trunk/debian/gentle.install	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/gentle.install	2013-10-16 06:12:34 UTC (rev 14849)
@@ -1,15 +1,11 @@
-GENtle	/usr/bin/
+wav	/usr/share/gentle/
+help	/usr/share/gentle/
+variables.csv	/usr/share/gentle/
 bitmaps	/usr/share/gentle/
-blank.db	/usr/share/gentle/
 codon_catalog.csv	/usr/share/gentle/
-commonvectors.db	/usr/share/gentle/
-debian/extra/128x128/gentle.png /usr/share/icons/hicolor/128x128/apps/
-debian/extra/32x32/gentle.png /usr/share/icons/hicolor/32x32/apps/
-debian/extra/64x64/gentle.png /usr/share/icons/hicolor/64x64/apps/
-debian/extra/GENtle.desktop /usr/share/applications
-default.tab	/usr/share/gentle/
-help	/usr/share/gentle/
 marker.txt	/usr/share/gentle/
 ncoils.matrix	/usr/share/gentle/
-variables.csv	/usr/share/gentle/
-wav	/usr/share/gentle/
+default.tab	/usr/share/gentle/
+commonvectors.db	/usr/share/gentle/
+blank.db	/usr/share/gentle/
+GENtle	/usr/bin/

Modified: trunk/packages/gentle/trunk/debian/manpages
===================================================================
--- trunk/packages/gentle/trunk/debian/manpages	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/manpages	2013-10-16 06:12:34 UTC (rev 14849)
@@ -1 +1 @@
-debian/extra/GENtle.1
+debian/GENtle.1

Deleted: trunk/packages/gentle/trunk/debian/patches/remove_old_sqlite.patch
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/remove_old_sqlite.patch	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/patches/remove_old_sqlite.patch	2013-10-16 06:12:34 UTC (rev 14849)
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -63,7 +63,7 @@
- bitmaps/scissors.bmp
- 
- 
--GENtle_LDADD = $(WX_LIBS) -L/usr/lib -L/usr/local/lib -lsqlite -lsqlite3 -lmysqlclient -ltinyxml
-+GENtle_LDADD = $(WX_LIBS) -L/usr/lib -L/usr/local/lib -lsqlite3 -lmysqlclient -ltinyxml
- GENtle_LDFLAGS = -s
- GENtle_SOURCES = TXMLfile.cpp\
- TVectorTree.cpp\

Modified: trunk/packages/gentle/trunk/debian/patches/series
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/series	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/patches/series	2013-10-16 06:12:34 UTC (rev 14849)
@@ -1,4 +1,3 @@
 forward_slashes.patch
 remove_tinyxml.patch
 remove_clustalw.patch
-remove_old_sqlite.patch

Modified: trunk/packages/gentle/trunk/debian/rules
===================================================================
--- trunk/packages/gentle/trunk/debian/rules	2013-10-16 06:06:20 UTC (rev 14848)
+++ trunk/packages/gentle/trunk/debian/rules	2013-10-16 06:12:34 UTC (rev 14849)
@@ -90,6 +90,7 @@
 	cvs -z3 -d:pserver:anonymous at gentle-m.cvs.sourceforge.net:/cvsroot/gentle-m co -P GENtle
 	mv GENtle "gentle-$(VERSION)"
 	find . -name "*.dll" -delete
+	find . -name "*.a" -delete
 	GZIP="--best --no-name" tar --exclude Makefile.in --exclude Makefile --exclude CVS --exclude tinyxml \
 		    --exclude .deps --exclude .cvsignore --exclude Makefile.in --exclude Makefile.linux \
 		    --exclude clustalw \


