[med-svn] r1446 - trunk/packages/dialign/trunk/debian

charles-guest at alioth.debian.org charles-guest at alioth.debian.org
Tue Feb 19 04:44:45 UTC 2008


Author: charles-guest
Date: 2008-02-19 04:44:44 +0000 (Tue, 19 Feb 2008)
New Revision: 1446

Added:
   trunk/packages/dialign/trunk/debian/manpages
Removed:
   trunk/packages/dialign/trunk/debian/compat
Modified:
   trunk/packages/dialign/trunk/debian/
   trunk/packages/dialign/trunk/debian/changelog
   trunk/packages/dialign/trunk/debian/control
   trunk/packages/dialign/trunk/debian/copyright
   trunk/packages/dialign/trunk/debian/dialign2-2.1
   trunk/packages/dialign/trunk/debian/dialign2-2.1.xml
   trunk/packages/dialign/trunk/debian/install
   trunk/packages/dialign/trunk/debian/rules
Log:
Preparing minor package update


Property changes on: trunk/packages/dialign/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/dialign/trunk/debian/changelog
===================================================================
--- trunk/packages/dialign/trunk/debian/changelog	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/changelog	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1,30 +1,34 @@
-dialign (2.2.1-2) UNRELEASED; urgency=low
+dialign (2.2.1-2) unstable; urgency=low
 
   [ Charles Plessy ]
-  * Mended the watch file in the source package.
-  * Add Subversion repository URL to debian/control.
-  * Including /usr/share/dpatch/dpatch.make in debian/rules.
-  * Moved the Homepage: field out from the package's description.
-  * Debian menu transition: updated debian/dialign.doc-base.
-  * Corrected typo and grammar in the manpage.
+  * debian/control:
+    - Added URIs to subersion repository.
+    - Moved the Homepage: field out from the package's description.
+    - Added cdbs to the build-dependencies.
+  * debian/rules:
+    - Rewrote for CDBS.
+  * Debian menu transition:
+    - Updated debian/dialign.doc-base.
+  * debian/dialign2-2.1.xml
+    - Corrected typo and grammar in the manpage.
+    - Fixed the auto-generated AUTHORS field.
+  * debian/copyright:
+    - Converted to machine-readable format.
+    - Added Nelson and David there.
 
   [ Nelson A. de Oliveira ]
   * Added watch file. (Closes: #449953)
 
   [ David Paleino ]
-  * debian/manpages removed - passing arguments to dh_installman
   * debian/dialign2-2.1 added - the manpage is now statically built.
     This saves buildd time and B-D space.
   * debian/control:
     - added myself to Uploaders
     - updated B-D (see above)
     - moved XS-Vcs-* fields to Vcs-*
-  * debian/rules:
-    - the manpage is now statically built (see above)
-    - minor changes
   * Updated to Standards-Version 3.7.3 (no changes needed)
 
- -- David Paleino <d.paleino at gmail.com>  Wed, 06 Feb 2008 13:11:51 +0100
+ -- Charles Plessy <charles-debian-nospam at plessy.org>  Tue, 19 Feb 2008 13:35:31 +0900
 
 dialign (2.2.1-1) unstable; urgency=low
 

Deleted: trunk/packages/dialign/trunk/debian/compat
===================================================================
--- trunk/packages/dialign/trunk/debian/compat	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/compat	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1 +0,0 @@
-5

Modified: trunk/packages/dialign/trunk/debian/control
===================================================================
--- trunk/packages/dialign/trunk/debian/control	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/control	2008-02-19 04:44:44 UTC (rev 1446)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <charles-debian-nospam at plessy.org>,
  David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), cdbs, dpatch
 Standards-Version: 3.7.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dialign/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dialign/trunk/

Modified: trunk/packages/dialign/trunk/debian/copyright
===================================================================
--- trunk/packages/dialign/trunk/debian/copyright	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/copyright	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1,27 +1,35 @@
-This package was debianized by Charles Plessy
-<charles-debian-nospam at plessy.org> on Sun, 9 Apr 2006. The packaging
-work is in the public domain unless stated otherwise. The manpage is
-licenced under the LGPL.
+X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+X-Debianized-By: Charles Plessy <charles-debian-nospam at plessy.org>
+X-Debianized-Date: Sun, 9 Apr 2006.
+X-Source-Downloaded-From: http://dialign.gobics.de/download/dialign_package.tgz
+X-Upstream-Author: Burkhard Morgenstern and Said Abdeddaim
 
-Dialign was downloaded from http://dialign.gobics.de/download/dialign_package.tgz
+Files: debian/dialign2-2.1*
+Copyright: © 2006-2008 Charles Plessy <charles-debian-nospam at plessy.org>
+License: Same as DIALIGN itself.
 
-Written by Burkhard Morgenstern and Said Abdeddaim, 1999.
-Copyright (C) 1999 Burkhard Morgenstern
-License:
+Files: debian/*
+Copyright: © 2006-2008 Charles Plessy <charles-debian-nospam at plessy.org>
+	   © 2008 Nelson A. de Oliveira <naoliv at debian.org>
+	   © 2008 David Paleino <d.paleino at gmail.com>
+License: PD
+ The packaging work is in the public domain unless stated otherwise.
 
-    This package 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 package 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 package; 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 can be found in `/usr/share/common-licenses/LGPL'.
+Files: *
+Copyright: © 1999 Burkhard Morgenstern
+License: LGPL-2.1+
+ This package 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 package 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+X-Comment: On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.

Modified: trunk/packages/dialign/trunk/debian/dialign2-2.1
===================================================================
--- trunk/packages/dialign/trunk/debian/dialign2-2.1	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/dialign2-2.1	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1,11 +1,11 @@
 .\"     Title: DIALIGN
-.\"    Author: 
+.\"    Author: Burkhard Morgenstern <bmorgen at gwdg.de>
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
 .\"      Date: avril  9, 2006
-.\"    Manual: 
-.\"    Source: 
+.\"    Manual: User Manual
+.\"    Source: dialign2-2 2.2.1
 .\"
-.TH "DIALIGN" "1" "avril 9, 2006" "" ""
+.TH "DIALIGN" "1" "avril 9, 2006" "dialign2-2 2.2.1" "User Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -299,10 +299,24 @@
 B\. Morgenstern (1999)\. DIALIGN 2: improvement of the segment\-to\-segment approach to multiple sequence alignment\. Bioinformatics 15, 211 \- 218\. Public research assisted by DIALIGN should cite this article\.
 .SH "AUTHORS"
 .PP
-DIALIGN was written by Burkhard Morgenstern
-<bmorgen at gwdg\.de>
-and Said Abdeddaim at University of Bielefeld (FSPM and International Graduate School in Bioinformatics and Genome Research), GSF (ISG, IBB, MIPS/IBI), North Carolina State University, Universite de Rouen, MPI fuer Biochemie (Martinsried), University of Goettingen, Institute of Microbiology and Genetics\.
+\fBBurkhard Morgenstern\fR <\&bmorgen at gwdg\.de\&>
+.sp -1n
+.IP "" 4
+Author of DIALIGN
 .PP
+\fBSaid Abdeddaim\fR
+.sp -1n
+.IP "" 4
+Author of DIALIGN
+.PP
+\fBCharles Plessy\fR <\&charles\-debian\-nospam at plessy\.org\&>
+.sp -1n
+.IP "" 4
+Wrote this manpage
+.SH "COPYRIGHT"
+.PP
+DIALIGN was written by Burkhard Morgenstern and Said Abdeddaim at University of Bielefeld (FSPM and International Graduate School in Bioinformatics and Genome Research), GSF (ISG, IBB, MIPS/IBI), North Carolina State University, Universite de Rouen, MPI fuer Biochemie (Martinsried), University of Goettingen, Institute of Microbiology and Genetics\.
+.PP
 This manual page was adapted from the DIALIGN manual by Charles Plessy
 <charles\-debian\-nospam at plessy\.org>
 for the Debian system (but may be used by others)\. Permission is granted to copy, distribute and/or modify this document under the terms of the
@@ -310,6 +324,8 @@
 Lesser General Public License, Version 2\.1 any later version published by the Free Software Foundation\.
 .PP
 On Debian systems, the complete text of the GNU Lesser General Public License can be found in /usr/share/common\-licenses/LGPL\.
-.SH "COPYRIGHT"
-Copyright \(co 2006 Charles Plessy
+.sp
+Copyright \(co 1999 Burkhard Morgenstern (for DIALIGN)
 .br
+Copyright \(co 2006, 2007, 2008 Charles Plessy (for this manpage)
+.br

Modified: trunk/packages/dialign/trunk/debian/dialign2-2.1.xml
===================================================================
--- trunk/packages/dialign/trunk/debian/dialign2-2.1.xml	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/dialign2-2.1.xml	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<?xml-stylesheet type="text/xsl"
+        href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
   <!-- Fill in your name for FIRSTNAME and SURNAME. -->
@@ -10,23 +12,61 @@
   <!ENTITY dhusername  "Charles Plessy">
   <!ENTITY dhucpackage "<refentrytitle>DIALIGN</refentrytitle>">
   <!ENTITY dhpackage   "dialign2-2">
+  <!ENTITY dhrelease   "2.2.1">
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
   <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+  <!ENTITY dhtitle     "User Manual"> 
 ]>
 
 <refentry>
   <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-<!--    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>  -->
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <releaseinfo role="version">&dhrelease;</releaseinfo>
+    <authorgroup>
+      <author>
+        <firstname>Burkhard</firstname>
+	<surname>Morgenstern</surname>
+	<contrib>Author of DIALIGN</contrib>
+	<address>
+	  <email>bmorgen at gwdg.de</email>
+	</address>
+      </author>
+      <author>
+        <firstname>Said</firstname>
+	<surname>Abdeddaim</surname>
+        <contrib>Author of DIALIGN</contrib>
+      </author>
+      <author>
+        &dhfirstname;
+        &dhsurname;
+	<contrib>Wrote this manpage</contrib>
+	<address>&dhemail;</address>
+      </author>
+    </authorgroup>
+    <legalnotice>
+    <para>
+      DIALIGN was written by Burkhard Morgenstern and Said Abdeddaim at University of Bielefeld (FSPM and International Graduate School in Bioinformatics and Genome Research), GSF (ISG, IBB, MIPS/IBI), North Carolina State University, Universite de Rouen, MPI fuer Biochemie (Martinsried), University of Goettingen, Institute of Microbiology and Genetics.
+    </para>
+
+    <para>
+      This manual page was adapted from the DIALIGN manual by &dhusername; &dhemail; for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the &gnu; Lesser General Public License, Version 2.1 any later version published by the Free Software Foundation.
+    </para>
+    
+    <para>
+      On Debian systems, the complete text of the GNU Lesser General Public License can be found in /usr/share/common-licenses/LGPL.
+    </para>
+    </legalnotice>
     <copyright>
+      <year>1999</year>
+      <holder>Burkhard Morgenstern (for DIALIGN)</holder>
+    </copyright>
+    <copyright>
       <year>2006</year>
-      <holder>&dhusername;</holder>
+      <year>2007</year>
+      <year>2008</year>
+      <holder>&dhusername; (for this manpage)</holder>
     </copyright>
     &dhdate;
   </refentryinfo>
@@ -418,34 +458,5 @@
 
      Public research assisted by DIALIGN should cite this article.</para>
   </refsect1>
-
-
-  <refsect1>
-    <title>AUTHORS</title>
-
-    <para>
-      DIALIGN was written by Burkhard Morgenstern
-      <email>bmorgen at gwdg.de</email> and Said Abdeddaim at University
-      of Bielefeld (FSPM and International Graduate School in
-      Bioinformatics and Genome Research), GSF (ISG, IBB, MIPS/IBI),
-      North Carolina State University, Universite de Rouen, MPI fuer
-      Biochemie (Martinsried), University of Goettingen, Institute of
-      Microbiology and Genetics.
-    </para>
-
-    <para>This manual page was adapted from the DIALIGN manual by &dhusername; &dhemail; for
-      the Debian system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; Lesser General Public License, Version 2.1 any 
-      later version published by the Free Software Foundation.
-    </para>
-
-	<para>
-	  On Debian systems, the complete text of the GNU Lesser General Public
-	  License can be found in /usr/share/common-licenses/LGPL.
-	</para>
-
-  </refsect1>
-
 </refentry>
 

Modified: trunk/packages/dialign/trunk/debian/install
===================================================================
--- trunk/packages/dialign/trunk/debian/install	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/install	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1 +1,2 @@
+src/dialign2-2	usr/bin/
 dialign2_dir/*	usr/share/dialign

Added: trunk/packages/dialign/trunk/debian/manpages
===================================================================
--- trunk/packages/dialign/trunk/debian/manpages	                        (rev 0)
+++ trunk/packages/dialign/trunk/debian/manpages	2008-02-19 04:44:44 UTC (rev 1446)
@@ -0,0 +1 @@
+debian/dialign2-2.1

Modified: trunk/packages/dialign/trunk/debian/rules
===================================================================
--- trunk/packages/dialign/trunk/debian/rules	2008-02-18 21:03:59 UTC (rev 1445)
+++ trunk/packages/dialign/trunk/debian/rules	2008-02-19 04:44:44 UTC (rev 1446)
@@ -1,72 +1,12 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Build rules for the Debian package dialign.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Modifications by Charles Plessy during the year 2006
-# are hereby released as "public domain".
 
-CFLAGS = -Wall -g
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+DEB_MAKE_BUILD_TARGET	= -C src
+DEB_OPT_FLAG		+= -c -I$ -DCONS
 
-include /usr/share/dpatch/dpatch.make
-
-XP=xsltproc  \
-	-''-nonet \
-	-''-param man.charmap.use.subset "0" \
-	-''-param make.year.ranges "1" \
-	-''-param make.single.year.ranges "1" \
-	-o debian/ /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
-                        
-dialign2-2.1: debian/dialign2-2.1.xml
-	$(XP) $<
-
-build: patch build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) -C src
-	touch $@
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+clean::
 	find src/ -name '*.o' -delete
 	dh_clean src/dialign2-2
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	install -o 755 src/dialign2-2 debian/dialign/usr/bin/
-
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman debian/dialign2-2.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install




More information about the debian-med-commit mailing list