[med-svn] r6753 - in trunk/packages/ampliconnoise/trunk/debian: . patches
Steffen Möller
moeller at alioth.debian.org
Tue May 3 10:10:55 UTC 2011
Author: moeller
Date: 2011-05-03 10:10:52 +0000 (Tue, 03 May 2011)
New Revision: 6753
Removed:
trunk/packages/ampliconnoise/trunk/debian/ampliconnoise.doc-base.EX
Modified:
trunk/packages/ampliconnoise/trunk/debian/
trunk/packages/ampliconnoise/trunk/debian/changelog
trunk/packages/ampliconnoise/trunk/debian/control
trunk/packages/ampliconnoise/trunk/debian/get-orig-source
trunk/packages/ampliconnoise/trunk/debian/patches/fix-path-for-data.patch
Log:
Uploaded ampliconnoise to Debian server.
Property changes on: trunk/packages/ampliconnoise/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Deleted: trunk/packages/ampliconnoise/trunk/debian/ampliconnoise.doc-base.EX
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/ampliconnoise.doc-base.EX 2011-05-03 06:25:44 UTC (rev 6752)
+++ trunk/packages/ampliconnoise/trunk/debian/ampliconnoise.doc-base.EX 2011-05-03 10:10:52 UTC (rev 6753)
@@ -1,20 +0,0 @@
-Document: ampliconnoise
-Title: Debian ampliconnoise Manual
-Author: <insert document author here>
-Abstract: This manual describes what ampliconnoise is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/ampliconnoise/ampliconnoise.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/ampliconnoise/ampliconnoise.ps.gz
-
-Format: text
-Files: /usr/share/doc/ampliconnoise/ampliconnoise.text.gz
-
-Format: HTML
-Index: /usr/share/doc/ampliconnoise/html/index.html
-Files: /usr/share/doc/ampliconnoise/html/*.html
Modified: trunk/packages/ampliconnoise/trunk/debian/changelog
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/changelog 2011-05-03 06:25:44 UTC (rev 6752)
+++ trunk/packages/ampliconnoise/trunk/debian/changelog 2011-05-03 10:10:52 UTC (rev 6753)
@@ -1,7 +1,14 @@
-ampliconnoise (1.22-1ubuntu4) lucid; urgency=low
+ampliconnoise (1.22-2) unstable; urgency=low
* Initial upload (Closes: #624362).
+ * Helped the (still too complicated) update script.
+ * Added myself to uploaders.
+ -- Steffen Moeller <moeller at debian.org> Tue, 03 May 2011 10:55:36 +0200
+
+ampliconnoise (1.22-1ubuntu4) lucid; urgency=low
+
+
[ Tim Booth ]
* Included required data and set paths to find it.
* Fixed build dependency on libmpich2-dev
Modified: trunk/packages/ampliconnoise/trunk/debian/control
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/control 2011-05-03 06:25:44 UTC (rev 6752)
+++ trunk/packages/ampliconnoise/trunk/debian/control 2011-05-03 10:10:52 UTC (rev 6753)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
-Uploaders: Tim Booth <tbooth at ceh.ac.uk>, Andreas Tille <tille at debian.org>
+Uploaders: Tim Booth <tbooth at ceh.ac.uk>, Andreas Tille <tille at debian.org>, Steffen Moeller <moeller at debian.org>
Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.1~), libgsl0-dev, libmpich2-dev (>= 1.2)
Standards-Version: 3.9.2
Homepage: http://code.google.com/p/ampliconnoise/
Modified: trunk/packages/ampliconnoise/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/get-orig-source 2011-05-03 06:25:44 UTC (rev 6752)
+++ trunk/packages/ampliconnoise/trunk/debian/get-orig-source 2011-05-03 10:10:52 UTC (rev 6753)
@@ -1,21 +1,31 @@
#!/bin/sh
# script to download and repack source package becsue of stray file in top level
+# bail out upon error
+set -e
+
+# extra verbosity
set -x
+
+origDir=../tarballs
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+fi
+
PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-VERSION=`uscan --verbose --force-download | \
+VERSION=`uscan --verbose --force-download --destdir "$origDir" --no-symlink | \
grep "Newest version on remote site is .* local version is .*" | \
head -n 1 | \
sed "s/Newest version on remote site is \([-0-9.]\+\),.*/\1/"`
UPSTREAMNAME=AmpliconNoise
+if [ ! -d "$origDir" ]; then mkdir -p "$origDir" ; fi
+cd "$origDir"
-mkdir -p ../tarballs
-cd ../tarballs
-test `ls|wc -l` = 0 || { echo "../tarballs not empty" ; exit 1 ; }
+find . -name "${UPSTREAMNAME}V${VERSION}" -type d | xargs -r rm -r
+tar -xzf ${UPSTREAMNAME}V${VERSION}.tar.gz
+find ${UPSTREAMNAME}V${VERSION} -name .svn -type d | xargs -r rm -rf
+find . -name "ampliconnoise_*.orig.tar.gz" -type l | xargs -r rm
-tar -xzf ../${UPSTREAMNAME}V${VERSION}.tar.gz
-rm -f .*
-
-GZIP="--best --no-name" tar -czf "$PKG"_"$VERSION".orig.tar.gz *
-rm -rf *
+GZIP="--best --no-name" tar -czf "$PKG"_"$VERSION".orig.tar.gz ${UPSTREAMNAME}V${VERSION}
+find . -name "${UPSTREAMNAME}V${VERSION}" -type d | xargs -r rm -r
Modified: trunk/packages/ampliconnoise/trunk/debian/patches/fix-path-for-data.patch
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/patches/fix-path-for-data.patch 2011-05-03 06:25:44 UTC (rev 6752)
+++ trunk/packages/ampliconnoise/trunk/debian/patches/fix-path-for-data.patch 2011-05-03 10:10:52 UTC (rev 6753)
@@ -9,8 +9,10 @@
A better fix would be to allow setting of the Data directory via an environment variable
or a variable passed to MAKE at build time. This could be contributed back to upstream.
---- a/SeqNoise/SeqNoise.h
-+++ b/SeqNoise/SeqNoise.h
+Index: AmpliconNoiseV1.22/SeqNoise/SeqNoise.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/SeqNoise/SeqNoise.h 2011-05-03 11:46:15.574549909 +0200
++++ AmpliconNoiseV1.22/SeqNoise/SeqNoise.h 2011-05-03 11:46:30.442415391 +0200
@@ -113,7 +113,7 @@
/********DEFAULTS***********/
#define DEF_SIGMA 30.0
@@ -20,8 +22,10 @@
/***************************/
/******Programming Constants************/
---- a/SeqDistM/SeqDistM.h
-+++ b/SeqDistM/SeqDistM.h
+Index: AmpliconNoiseV1.22/SeqDistM/SeqDistM.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/SeqDistM/SeqDistM.h 2011-05-03 11:46:15.582549837 +0200
++++ AmpliconNoiseV1.22/SeqDistM/SeqDistM.h 2011-05-03 11:46:30.442415391 +0200
@@ -71,7 +71,7 @@
/* User defined structures */
@@ -31,8 +35,10 @@
typedef struct s_Align
---- a/SeqDist/SeqDist.h
-+++ b/SeqDist/SeqDist.h
+Index: AmpliconNoiseV1.22/SeqDist/SeqDist.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/SeqDist/SeqDist.h 2011-05-03 11:46:15.558550053 +0200
++++ AmpliconNoiseV1.22/SeqDist/SeqDist.h 2011-05-03 11:46:30.442415391 +0200
@@ -71,7 +71,7 @@
/* User defined structures */
@@ -42,8 +48,10 @@
typedef struct s_Align
---- a/SeqNoiseM/SeqNoiseM.h
-+++ b/SeqNoiseM/SeqNoiseM.h
+Index: AmpliconNoiseV1.22/SeqNoiseM/SeqNoiseM.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/SeqNoiseM/SeqNoiseM.h 2011-05-03 11:46:15.546550163 +0200
++++ AmpliconNoiseV1.22/SeqNoiseM/SeqNoiseM.h 2011-05-03 11:46:30.442415391 +0200
@@ -113,7 +113,7 @@
/********DEFAULTS***********/
#define DEF_SIGMA 30.0
@@ -53,8 +61,10 @@
/***************************/
/******Programming Constants************/
---- a/PyroNoiseM/PyroNoiseM.h
-+++ b/PyroNoiseM/PyroNoiseM.h
+Index: AmpliconNoiseV1.22/PyroNoiseM/PyroNoiseM.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/PyroNoiseM/PyroNoiseM.h 2011-05-03 11:46:15.554550089 +0200
++++ AmpliconNoiseV1.22/PyroNoiseM/PyroNoiseM.h 2011-05-03 11:46:30.442415391 +0200
@@ -36,7 +36,7 @@
#define OVERCALL_THRESH 6.0 /*?*/
@@ -64,8 +74,10 @@
#define OUT_FILE_STUB "-out"
#define INIT_FILE "-lin"
---- a/PyroNoise/PyroNoise.h
-+++ b/PyroNoise/PyroNoise.h
+Index: AmpliconNoiseV1.22/PyroNoise/PyroNoise.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/PyroNoise/PyroNoise.h 2011-05-03 11:46:15.538550235 +0200
++++ AmpliconNoiseV1.22/PyroNoise/PyroNoise.h 2011-05-03 11:46:30.446415355 +0200
@@ -37,7 +37,7 @@
#define OVERCALL_THRESH 6.0 /*?*/
@@ -75,8 +87,10 @@
#define OUT_FILE_STUB "-out"
#define INIT_FILE "-lin"
---- a/Perseus/Perseus.h
-+++ b/Perseus/Perseus.h
+Index: AmpliconNoiseV1.22/Perseus/Perseus.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/Perseus/Perseus.h 2011-05-03 11:46:15.566549981 +0200
++++ AmpliconNoiseV1.22/Perseus/Perseus.h 2011-05-03 11:46:30.446415355 +0200
@@ -86,7 +86,7 @@
#define WEIGHTDELIM '_'
@@ -86,8 +100,10 @@
#ifndef min
#define min(x, y) ((x) < (y) ? (x) : (y))
---- a/PyroDist/PyroDist.h
-+++ b/PyroDist/PyroDist.h
+Index: AmpliconNoiseV1.22/PyroDist/PyroDist.h
+===================================================================
+--- AmpliconNoiseV1.22.orig/PyroDist/PyroDist.h 2011-05-03 11:46:15.530550307 +0200
++++ AmpliconNoiseV1.22/PyroDist/PyroDist.h 2011-05-03 11:46:30.446415355 +0200
@@ -34,7 +34,7 @@
#define LEFT 1
#define UP 2
More information about the debian-med-commit
mailing list