[med-svn] r1362 - trunk/packages/primer3/trunk/debian

charles-guest at alioth.debian.org charles-guest at alioth.debian.org
Tue Feb 12 14:39:44 UTC 2008


Author: charles-guest
Date: 2008-02-12 14:39:43 +0000 (Tue, 12 Feb 2008)
New Revision: 1362

Added:
   trunk/packages/primer3/trunk/debian/primer3.examples
Removed:
   trunk/packages/primer3/trunk/debian/compat
Modified:
   trunk/packages/primer3/trunk/debian/README.Debian
   trunk/packages/primer3/trunk/debian/changelog
   trunk/packages/primer3/trunk/debian/control
   trunk/packages/primer3/trunk/debian/copyright
   trunk/packages/primer3/trunk/debian/ntdpal.1.xml
   trunk/packages/primer3/trunk/debian/oligotm.1.xml
   trunk/packages/primer3/trunk/debian/primer3_core.1.xml
   trunk/packages/primer3/trunk/debian/rules
Log:
Switched to CDBS, made debian/copyright machine-readable, updated the headers of the sources of the makefiles.

Modified: trunk/packages/primer3/trunk/debian/README.Debian
===================================================================
--- trunk/packages/primer3/trunk/debian/README.Debian	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/README.Debian	2008-02-12 14:39:43 UTC (rev 1362)
@@ -4,6 +4,6 @@
 The tests included in the sources of Primer3 are ran during the building
 process. You can check the logs at the following address:
 
-http://buildd.debian.org/build.php?pkg=primer3
+http://buildd.debian.org/build.cgi?pkg=primer3
 
- -- Charles Plessy <charles-debian-nospam at plessy.org>  Thu, 28 Sep 2006 20:18:54 +0900
+ -- Charles Plessy <charles-debian-nospam at plessy.org>  Tue, 12 Feb 2008 23:22:04 +0900

Modified: trunk/packages/primer3/trunk/debian/changelog
===================================================================
--- trunk/packages/primer3/trunk/debian/changelog	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/changelog	2008-02-12 14:39:43 UTC (rev 1362)
@@ -2,6 +2,8 @@
 
   [ Charles Plessy ]
   * Moved the Homepage: field out from the package's description.
+  * debian/control: updated Steffen's email address.
+  * debian/*.1.xml: corrected the headers of the sources of manpages.
 
   [ David Paleino ]
   * debian/ntdpal.1, debian/primer3_core.1 and debian/oligotm.1

Deleted: trunk/packages/primer3/trunk/debian/compat
===================================================================
--- trunk/packages/primer3/trunk/debian/compat	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/compat	2008-02-12 14:39:43 UTC (rev 1362)
@@ -1 +0,0 @@
-5

Modified: trunk/packages/primer3/trunk/debian/control
===================================================================
--- trunk/packages/primer3/trunk/debian/control	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/control	2008-02-12 14:39:43 UTC (rev 1362)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Uploaders: Steffen Moeller <steffen_moeller at gmx.de>,
+Uploaders: Steffen Moeller <moeller at debian.org>,
  Charles Plessy <charles-debian-nospam at plessy.org>,
  David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), cdbs
 Standards-Version: 3.7.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/primer3/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/primer3/trunk/

Modified: trunk/packages/primer3/trunk/debian/copyright
===================================================================
--- trunk/packages/primer3/trunk/debian/copyright	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/copyright	2008-02-12 14:39:43 UTC (rev 1362)
@@ -1,65 +1,69 @@
-Primer3 is available from: http://sourceforge.net/projects/primer3/
+X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+X-Debianized-By: Steffen Möller <moeller at debian.org>
+X-Debianized-Date: Wed, 31 Mar 2004 15:07:10 +0200
+X-Source-Downloaded-From: http://sourceforge.net/projects/primer3/
+X-Upstream-Authors: Steve Rozen and Helen Skaletsky
 
-Copyright (c) 1996,1997,1998,1999,2000,2001,2004,2006,2007
-Whitehead Institute for Biomedical Research, Steve Rozen
-(http://jura.wi.mit.edu/rozen), and Helen Skaletsky
-All rights reserved.
+Files: debian/*
+Copyright: © 2004 Steffen Möller <moeller at debian.org>
+           © 2006-2008 Charles Plessy <charles-debian-nospam at plessy.org>
+           © 2008 David Paleino <d.paleino at gmail.com>
+License: PD
+ The packaging work is hereby released in the public domain unless stated
+ otherwise.
 
-Most of primer3 is released under the NEW BSD license.
-The oligotm library is released under GNU General Public Licence.
 
-
---------------------- NEW BSD licence of primer3 -----------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the names of the copyright holders nor contributors may
-be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
-
-
--------------- Licence of the oligotm library ---------------------------------
-   This package 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 2 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 General Public License for more details.
-
-   You should have received a copy of the GNU 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 General
+Files: src/oligotm*
+Copyright: © 1996,1997,1998,1999,2000,2001,2004,2006,2007
+           Whitehead Institute for Biomedical Research,
+           Steve Rozen (http://jura.wi.mit.edu/rozen),
+	   Helen Skaletsky
+License: GPL-2+
+ The oligotm library 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 2 of the License, or
+ (at your option) any later version.
+ .
+ The oligotm 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU 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 General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
 
-This Debian-packaged version of primer3 was first assembled by Steffen Moeller
-<steffen_moeller at gmx.de> on Wed, 31 Mar 2004 15:07:10 +0200. The packaging was
-finished in 2006 by Charles Plessy <charles-debian-nospam at plessy.org>. The
-packaging work is hereby released in the public domain unless stated otherwise.
+Files: *
+Copyright: © 1996,1997,1998,1999,2000,2001,2004,2006,2007
+           Whitehead Institute for Biomedical Research,
+	   Steve Rozen (http://jura.wi.mit.edu/rozen),
+	   Helen Skaletsky
+License: BSD family
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+    * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+    * Neither the names of the copyright holders nor contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: trunk/packages/primer3/trunk/debian/ntdpal.1.xml
===================================================================
--- trunk/packages/primer3/trunk/debian/ntdpal.1.xml	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/ntdpal.1.xml	2008-02-12 14:39:43 UTC (rev 1362)
@@ -1,6 +1,8 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
+<?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" [
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY dhfirstname "<firstname>Charles</firstname>">
   <!ENTITY dhsurname   "<surname>Plessy</surname>">
   <!ENTITY dhdate      "<date>February 17, 2007</date>">

Modified: trunk/packages/primer3/trunk/debian/oligotm.1.xml
===================================================================
--- trunk/packages/primer3/trunk/debian/oligotm.1.xml	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/oligotm.1.xml	2008-02-12 14:39:43 UTC (rev 1362)
@@ -1,5 +1,8 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
+<?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"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
   <!ENTITY dhfirstname "<firstname>Charles</firstname>">
   <!ENTITY dhsurname   "<surname>Plessy</surname>">

Added: trunk/packages/primer3/trunk/debian/primer3.examples
===================================================================
--- trunk/packages/primer3/trunk/debian/primer3.examples	                        (rev 0)
+++ trunk/packages/primer3/trunk/debian/primer3.examples	2008-02-12 14:39:43 UTC (rev 1362)
@@ -0,0 +1 @@
+example

Modified: trunk/packages/primer3/trunk/debian/primer3_core.1.xml
===================================================================
--- trunk/packages/primer3/trunk/debian/primer3_core.1.xml	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/primer3_core.1.xml	2008-02-12 14:39:43 UTC (rev 1362)
@@ -1,5 +1,8 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
+<?xml version='1.0' encoding='UTF-8'?>
+<?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"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY dhfirstname "<firstname>Steffen</firstname>">
   <!ENTITY dhsurname   "<surname>Moeller</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->

Modified: trunk/packages/primer3/trunk/debian/rules
===================================================================
--- trunk/packages/primer3/trunk/debian/rules	2008-02-12 13:24:41 UTC (rev 1361)
+++ trunk/packages/primer3/trunk/debian/rules	2008-02-12 14:39:43 UTC (rev 1362)
@@ -1,96 +1,22 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-SKIP_TEST_CPUS := arm m68k s390
-PRIMER_EXE = primer3_core
-EXES=$(PRIMER_EXE) ntdpal oligotm long_seq_tm_test
+SKIP_TEST_CPUS := arm m68k s390 powerpc
 
-XP=xsltproc -o debian/ -''-nonet
-DB2MAN=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
-
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE) -C src all
-	touch $@
-
-tests: build tests-clean tests-stamp
-tests-stamp:
+debian/stamp-makefile-check::
 ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(SKIP_TEST_CPUS)))
-	$(MAKE) -C test test
+	@echo "Fast-cpu arch detected, performing checks."
 else
-	@echo "Slow-cpu arch detected, skipping test"
+	@echo "Slow-cpu arch detected, skipping checks.t"
+	DEB_BUILD_OPTIONS += nocheck
 endif
-	touch $@
 
-tests-clean:
-	$(MAKE) -C test clean
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-clean: tests-clean
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) -C src clean
+DEB_MAKE_CLEAN_TARGET   = -C src clean
+DEB_MAKE_BUILD_TARGET   = -C src all
+DEB_MAKE_CHECK_TARGET   = -C test test
 
-	# make clean fails on clean sources, so I clean with this:
-	# cd src ; rm -f *.o $(EXES) *~
-
-	dh_clean
-
-primer3_core.1: debian/primer3_core.1.xml
-	$(XP) $(DB2MAN) $<
-
-ntdpal.1: debian/ntdpal.1.xml
-	$(XP) $(DB2MAN) $<
-
-oligotm.1: debian/oligotm.1.xml
-	$(XP) $(DB2MAN) $<
-
-manpages: primer3_core.1 ntdpal.1 oligotm.1
-
-install: build 
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-binary-arch: build install tests-stamp
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples example
-	dh_installman
-	dh_install
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-
-binary: binary-arch
-.PHONY: build clean binary-arch binary install
+clean::
+	$(MAKE) -C test clean




More information about the debian-med-commit mailing list