Author: plessy
Date: 2009-07-17 13:24:49 +0000 (Fri, 17 Jul 2009)
New Revision: 3655
Added:
trunk/packages/maq/trunk/debian/install
Modified:
trunk/packages/maq/trunk/debian/changelog
trunk/packages/maq/trunk/debian/control
trunk/packages/maq/trunk/debian/copyright
trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch
trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch
Log:
Distribute more scripts in /usr/share/maq.
* Distribute scripts that are not installed by upstream?\226?\128?\153s
makefile in /usr/share/maq (debian/install).
* Incremented Standards-Version in debian/policy to reflect
conformance with Policy 3.8.2 (no changes needed).
* debian/patch: made headers conformant with current draft of DEP3.
Modified: trunk/packages/maq/trunk/debian/changelog
===================================================================
--- trunk/packages/maq/trunk/debian/changelog 2009-07-17 12:23:11 UTC (rev 3654)
+++ trunk/packages/maq/trunk/debian/changelog 2009-07-17 13:24:49 UTC (rev 3655)
@@ -1,3 +1,13 @@
+maq (0.7.1-3) unstable; urgency=low
+
+ * Distribute scripts that are not installed by upstream’s
+ makefile in /usr/share/maq (debian/install).
+ * Incremented Standards-Version in debian/policy to reflect
+ conformance with Policy 3.8.2 (no changes needed).
+ * debian/patch: made headers conformant with current draft of DEP3.
+
+ -- Charles Plessy <plessy at debian.org> Fri, 17 Jul 2009 22:00:02 +0900
+
maq (0.7.1-2) unstable; urgency=low
* Enable LARGEFILE64_SOURCE to prevent a problem with zlib on
Modified: trunk/packages/maq/trunk/debian/control
===================================================================
--- trunk/packages/maq/trunk/debian/control 2009-07-17 12:23:11 UTC (rev 3654)
+++ trunk/packages/maq/trunk/debian/control 2009-07-17 13:24:49 UTC (rev 3655)
@@ -6,7 +6,7 @@
Uploaders: Andreas Tille <tille at debian.org>,
Charles Plessy <plessy at debian.org>
Build-Depends: cdbs, debhelper (>= 7), autotools-dev, zlib1g-dev, quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Homepage: http://maq.sourceforge.net/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/maq/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/maq/trunk/
Modified: trunk/packages/maq/trunk/debian/copyright
===================================================================
--- trunk/packages/maq/trunk/debian/copyright 2009-07-17 12:23:11 UTC (rev 3654)
+++ trunk/packages/maq/trunk/debian/copyright 2009-07-17 13:24:49 UTC (rev 3655)
@@ -1,47 +1,50 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Heng Li <lh3 at sanger.ac.uk>
-Packaged-By: Charles Plessy <plessy at debian.org>,
- Andreas Tille <tille at debian.org>
-Packaged-Date: Mon, 07 Jul 2008 23:37:51 +0900.
-Upstream-Source: http://downloads.sourceforge.net/maq/maq-0.6.8.tar.bz2
+Machine-readable license summary, see ‘http://dep.debian.net/deps/dep5/’.
-Files: *
+Name : Maq: Mapping and Assembly with Qualities
+Contact : Heng Li <lh3 at sanger.ac.uk>
+Source : http://downloads.sourceforge.net/maq/maq-0.7.1.tar.bz2
+
License: GPL3+
-Copyright: © 2003-2008 Heng Li <lh3 at sanger.ac.uk>
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-X-Comment: On Debian systems, the complete text of the GNU Public
- License can be found in `/usr/share/common-licenses/GPL'.
+Copyright: 2003-2008, Heng Li <lh3 at sanger.ac.uk>
-Files: stdaln.*, stdhash.hh:
-Copyright: © 2003-2008 Heng Li <lh3 at sanger.ac.uk>
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General Public License version
+3 can be found in ‘/usr/share/common-licenses/GPL-3’.
+
+Files: stdaln.* stdhash.hh
+Copyright: 2003-2008, Heng Li <lh3 at sanger.ac.uk>
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
- .
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- .
+
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+On Debian systems, the complete text of the GNU Lesser General Public License
+version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
+
Files: debian/*
-Copyright: © 2008 Charles Plessy <plessy at debian.org>,
- Andreas Tille <tille at debian.org>
+Copyright: 2008–2009, Charles Plessy <plessy at debian.org>,
+ Andreas Tille <tille at debian.org>
License: Same as Maq itelf
(see above)
Added: trunk/packages/maq/trunk/debian/install
===================================================================
--- trunk/packages/maq/trunk/debian/install (rev 0)
+++ trunk/packages/maq/trunk/debian/install 2009-07-17 13:24:49 UTC (rev 3655)
@@ -0,0 +1,6 @@
+scripts/asub usr/share/maq
+scripts/fq_all2std.pl usr/share/maq
+scripts/maq_post.pl usr/share/maq
+scripts/maq_sanger.pl usr/share/maq
+scripts/paf_utils.pl usr/share/maq
+scripts/solid2fastq.pl usr/share/maq
Modified: trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch 2009-07-17 12:23:11 UTC (rev 3654)
+++ trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch 2009-07-17 13:24:49 UTC (rev 3655)
@@ -1,9 +1,9 @@
Author: Charles Plessy
Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=2298601&group_id=191815&atid=938895
Reviewed: http://lists.debian.org/debian-mentors/2008/11/msg00189.html
-Description: -m64 is not necessary except for building "multiarch" versions,
+Description: Build without -m64.
+ -m64 is not necessary except for building "multiarch" versions,
which is probably not the original goal anyway.
-License: Same as Maq
--- a/configure.ac
+++ b/configure.ac
@@ -23,10 +23,7 @@ case "${host_cpu}-${host_os}" in
Modified: trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch 2009-07-17 12:23:11 UTC (rev 3654)
+++ trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch 2009-07-17 13:24:49 UTC (rev 3655)
@@ -1,9 +1,8 @@
Author: autoreconf
-Forwarded: no
+Forwarded: not-needed
Description: autoreconf 2.62 ran after applying 10_prevent_-64_option.patch
By applying this patch, we do not need to do some autoreconf magic at
build time.
-License: probably not copyrightable.
diff --git a/configure b/configure
index 240b0ff..568a609 100755
--- a/configure