[med-svn] r1468 - in trunk/packages/arb/trunk/debian: . patches

tille at alioth.debian.org tille at alioth.debian.org
Mon Feb 25 21:31:23 UTC 2008


Author: tille
Date: 2008-02-25 21:31:22 +0000 (Mon, 25 Feb 2008)
New Revision: 1468

Added:
   trunk/packages/arb/trunk/debian/patches/20_Makefiles
   trunk/packages/arb/trunk/debian/patches/20_config.makefiles
   trunk/packages/arb/trunk/debian/patches/20_perlscripts
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
   trunk/packages/arb/trunk/debian/patches/30_phyml
   trunk/packages/arb/trunk/debian/patches/series
Removed:
   trunk/packages/arb/trunk/debian/patches/00list
   trunk/packages/arb/trunk/debian/patches/20_Makefiles.dpatch
   trunk/packages/arb/trunk/debian/patches/20_config.makefiles.dpatch
Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/get-orig-source
   trunk/packages/arb/trunk/debian/rules
Log:
Moved from dpathc to quilt because of some problems with new release and dpatch


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/changelog	2008-02-25 21:31:22 UTC (rev 1468)
@@ -1,5 +1,6 @@
-arb (0.0.20071207-2) UNRELEASED; urgency=low
+arb (0.0.20071207.1-1) unstable; urgency=low
 
+  [ David Paleino ]
   * debian/control:
     - Standards-Version 3.7.3
     - long lines wrapped
@@ -14,8 +15,22 @@
   * debian/po/it.po added
   * debian/rules updated
 
- -- David Paleino <d.paleino at gmail.com>  Wed, 06 Feb 2008 11:59:42 +0100
+  [ Andreas Tille ]
+  * New upstream source
+    debian/get-orig-source: Obtain official release.
+    Remark: The originally downloaded source from 2007_12_07 was
+    different from the currently available one.  This is expressed
+    in the additional ".1" in the version number.
+  * Removed warning from long description because this is now an
+    official release
+  * debian/rules:
+    - removed get-orig-source.old target
+    - added missing '-' in clean target
+  * Switched to quilt (dpatch was not able to apply patches
+    from previous version)
 
+ -- Andreas Tille <tille at debian.org>  Mon, 25 Feb 2008 09:34:30 +0100
+
 arb (0.0.20071207-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/control	2008-02-25 21:31:22 UTC (rev 1468)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>,
  David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 5.0), dpatch (>= 2.0), libmotif-dev, xviewg-dev,
+Build-Depends: debhelper (>= 5.0), quilt, libmotif-dev, xviewg-dev,
  rxp, lynx, sablotron, libtiff4-dev, libxaw7-dev, kaffe | free-java-sdk,
  freeglut3-dev | libglu-dev, libglew-dev, libpng12-dev, x11proto-print-dev,
  libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc
@@ -22,15 +22,6 @@
 Recommends: xfig
 Suggests: arb-database, gnuplot, gv
 Description: Integrated package for data handling and analysis
- Important: This version is the latest build from the ARB development team.
- Regard this version as 'NOT RELEASED'.
- .
- Please do not encourage normal ARB users to use this software.  It is intended
- for previews and to support the ARB development.
- .
- This version is completely untested and/or experimental - so it may easily 
- VAPORIZE all your data, your machine or even yourself. Use at your own risk!
- .
  The ARB software is a graphically oriented package comprising various tools
  for sequence database handling and data analysis. A central database of
  processed (aligned) sequences and any type of additional data linked to the
@@ -50,15 +41,6 @@
 Depends: ${shlibs:Depends}
 Recommends: arb
 Description: Integrated package for data handling and analysis
- Important: This version is the latest build from the ARB development team.
- Regard this version as 'NOT RELEASED'.
- .
- Please do not encourage normal ARB users to use this software.  It is intended
- for previews and to support the ARB development.
- .
- This version is completely untested and/or experimental - so it may easily 
- VAPORIZE all your data, your machine or even yourself. Use at your own risk!
- .
  The ARB software is a graphically oriented package comprising various tools
  for sequence database handling and data analysis. A central database of
  processed (aligned) sequences and any type of additional data linked to the
@@ -80,15 +62,6 @@
 Recommends: arb
 Suggests: xview-clients
 Description: Integrated package for data handling and analysis
- Important: This version is the latest build from the ARB development team.
- Regard this version as 'NOT RELEASED'.
- .
- Please do not encourage normal ARB users to use this software.  It is intended
- for previews and to support the ARB development.
- .
- This version is completely untested and/or experimental - so it may easily 
- VAPORIZE all your data, your machine or even yourself. Use at your own risk!
- .
  The ARB software is a graphically oriented package comprising various tools
  for sequence database handling and data analysis. A central database of
  processed (aligned) sequences and any type of additional data linked to the
@@ -102,15 +75,6 @@
 Depends: gs | postscript-preview, gv | postscript-viewer
 Suggests: arb
 Description: Integrated package for data handling and analysis
- Important: This version is the latest build from the ARB development team.
- Regard this version as 'NOT RELEASED'.
- .
- Please do not encourage normal ARB users to use this software.  It is intended
- for previews and to support the ARB development.
- .
- This version is completely untested and/or experimental - so it may easily 
- VAPORIZE all your data, your machine or even yourself. Use at your own risk!
- .
  The ARB software is a graphically oriented package comprising various tools
  for sequence database handling and data analysis. A central database of
  processed (aligned) sequences and any type of additional data linked to the

Modified: trunk/packages/arb/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/arb/trunk/debian/get-orig-source	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/get-orig-source	2008-02-25 21:31:22 UTC (rev 1468)
@@ -1,9 +1,10 @@
 #!/bin/sh -e
 set -e
-set -x
+#set -x
 NAME=arb
-UTARBALL=${NAME}src.tgz
-downloadurl=http://www2.mikro.biologie.tu-muenchen.de/download/ARB/latest_build/
+UVERSION=2007_12_07
+UTARBALL=${NAME}src_${UVERSION}.tgz
+downloadurl=http://download.arb-home.de/src/
 
 RemoveFilesFromSource="GDEHELP/HELP_DOC_GEN/* GDEHELP/HELP_GEN/* GDEHELP/ARB_GDEmenus GDEHELP/helpfiles.lst HELP_SOURCE/_index.html NTREE/nt_date.h lib/ARB.pm"
 
@@ -17,7 +18,13 @@
     wget --quiet ${downloadurl}/${UTARBALL}
 fi
 
-VERSION=`ls -lt "$UTARBALL" | grep '^[^d]rw.r' | sed -e '2,$d' -e 's/^.[-rwxr]\{9\} \+[0-9] \w\+ \w\+[[:space:]]\+[0-9]\+ \([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/0.0.\1\2\3/'`
+if [ "$UVERSION" != "" ] ; then
+    VERSION=0.0.`echo $UVERSION | sed -e 's/_//g'`.1
+else
+    # Several releases do not contain a version in the tarball name, so
+    # use versioning according to newest file inside tarball
+    VERSION=`ls -lt "$UTARBALL" | grep '^[^d]rw.r' | sed -e '2,$d' -e 's/^.[-rwxr]\{9\} \+[0-9] \w\+ \w\+[[:space:]]\+[0-9]\+ \([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/0.0.\1\2\3/'`
+fi
 mkdir -p arbdir
 cd arbdir
 tar -xzf ../"$UTARBALL"

Deleted: trunk/packages/arb/trunk/debian/patches/00list
===================================================================
--- trunk/packages/arb/trunk/debian/patches/00list	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/patches/00list	2008-02-25 21:31:22 UTC (rev 1468)
@@ -1,3 +0,0 @@
-20_config.makefiles.dpatch
-20_Makefiles.dpatch
-30_Makefile_main.dpatch

Added: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles	2008-02-25 21:31:22 UTC (rev 1468)
@@ -0,0 +1,63 @@
+--- arb-0.0.20071207.1.orig/ARBDB2/Makefile
++++ arb-0.0.20071207.1/ARBDB2/Makefile
+@@ -1,7 +1,11 @@
+ # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
+ .SUFFIXES: .o .c .depend
+ 
+-include AD_MOBJECTS.h
++HeaderFile = AD_MOBJECTS.h
++CheckHEADER := $(shell if [ -e $(HeaderFile) ] ; then echo 1 ; else echo 0 ; fi)
++ifeq ($(CheckHEADER),1)
++    include $(HeaderFile)
++endif
+ 
+ ACC_OBJECTS = $(GB_O) $(GB_T) $(GB_X)
+ 
+--- arb-0.0.20071207.1.orig/ARBDBS/Makefile
++++ arb-0.0.20071207.1/ARBDBS/Makefile
+@@ -1,7 +1,11 @@
+ # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
+ .SUFFIXES: .o .c .cxx .depend
+ 
+-include AD_MOBJECTS.h
++HeaderFile = AD_MOBJECTS.h
++CheckHEADER := $(shell if [ -e $(HeaderFile) ] ; then echo 1 ; else echo 0 ; fi)
++ifeq ($(CheckHEADER),1)
++    include $(HeaderFile)
++endif
+ 
+ 
+ OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
+--- arb-0.0.20071207.1.orig/NAMES_COM/Makefile
++++ arb-0.0.20071207.1/NAMES_COM/Makefile
+@@ -27,7 +27,7 @@
+ #	$(MAKE) -r -f AISC/Makefile depends
+ 
+ clean:
+-	$(MAKE) $(makeflags) -f AISC/Makefile clean
++	$(MAKE) $(makeflags) -f ../AISC/Makefile clean
+ 
+ # DO NOT DELETE
+ 
+--- arb-0.0.20071207.1.orig/ORS_COM/Makefile
++++ arb-0.0.20071207.1/ORS_COM/Makefile
+@@ -28,7 +28,7 @@
+ #	@echo "no automatic dependencies for ORS_COM - skipped"
+ 
+ clean:
+-	$(MAKE) $(makeflags) -f AISC/Makefile clean
++	$(MAKE) $(makeflags) -f ../AISC/Makefile clean
+ 
+ # DO NOT DELETE
+ 
+--- arb-0.0.20071207.1.orig/PROBE_COM/Makefile
++++ arb-0.0.20071207.1/PROBE_COM/Makefile
+@@ -30,7 +30,7 @@
+ # @echo "no automatic dependencies for PROBE_COM - skipped"
+ 
+ clean:
+-	$(MAKE) $(makeflags) -f AISC/Makefile clean
++	$(MAKE) $(makeflags) -f ../AISC/Makefile clean
+ 
+ # DO NOT DELETE
+ 

Deleted: trunk/packages/arb/trunk/debian/patches/20_Makefiles.dpatch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles.dpatch	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles.dpatch	2008-02-25 21:31:22 UTC (rev 1468)
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_Makefiles.dpatch by  <tille at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixing several Makefiles
-
- at DPATCH@
-
-diff -urbN arb-0.0.20071029.orig/ARBDB2/Makefile arb-0.0.20071029/ARBDB2/Makefile
---- arb-0.0.20071029.orig/ARBDB2/Makefile	2007-10-29 14:53:19.000000000 +0100
-+++ arb-0.0.20071029/ARBDB2/Makefile	2007-11-05 11:54:29.000000000 +0100
-@@ -1,7 +1,12 @@
- # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
- .SUFFIXES: .o .c .depend
- 
--include AD_MOBJECTS.h
-+HeaderFile = AD_MOBJECTS.h
-+CheckHEADER := $(shell if [ -e $(HeaderFile) ] ; then echo 1 ; else echo 0 ; fi)
-+ifeq ($(CheckHEADER),1)
-+    include $(HeaderFile)
-+endif
-+
- 
- ACC_OBJECTS = $(GB_O) $(GB_T) $(GB_X)
- 
-diff -urbN arb-0.0.20071029.orig/ARBDBS/Makefile arb-0.0.20071029/ARBDBS/Makefile
---- arb-0.0.20071029.orig/ARBDBS/Makefile	2007-10-29 14:53:19.000000000 +0100
-+++ arb-0.0.20071029/ARBDBS/Makefile	2007-11-05 11:55:13.000000000 +0100
-@@ -1,7 +1,11 @@
- # INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
- .SUFFIXES: .o .c .cxx .depend
- 
--include AD_MOBJECTS.h
-+HeaderFile = AD_MOBJECTS.h
-+CheckHEADER := $(shell if [ -e $(HeaderFile) ] ; then echo 1 ; else echo 0 ; fi)
-+ifeq ($(CheckHEADER),1)
-+    include $(HeaderFile)
-+endif
- 
- 
- OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
-diff -urbN arb-0.0.20071029.orig/NAMES_COM/Makefile arb-0.0.20071029/NAMES_COM/Makefile
---- arb-0.0.20071029.orig/NAMES_COM/Makefile	2007-06-29 21:04:04.000000000 +0200
-+++ arb-0.0.20071029/NAMES_COM/Makefile	2007-09-12 15:59:27.000000000 +0200
-@@ -27,7 +27,7 @@
- #	$(MAKE) -r -f AISC/Makefile depends
- 
- clean:
--	$(MAKE) $(makeflags) -f AISC/Makefile clean
-+	$(MAKE) $(makeflags) -f ../AISC/Makefile clean
- 
- # DO NOT DELETE
- 
-diff -urbN arb-0.0.20071029.orig/ORS_COM/Makefile arb-0.0.20071029/ORS_COM/Makefile
---- arb-0.0.20071029.orig/ORS_COM/Makefile	2007-06-29 21:04:05.000000000 +0200
-+++ arb-0.0.20071029/ORS_COM/Makefile	2007-09-12 16:00:49.000000000 +0200
-@@ -28,7 +28,7 @@
- #	@echo "no automatic dependencies for ORS_COM - skipped"
- 
- clean:
--	$(MAKE) $(makeflags) -f AISC/Makefile clean
-+	$(MAKE) $(makeflags) -f ../AISC/Makefile clean
- 
- # DO NOT DELETE
- 
-diff -urbN arb-0.0.20071029.orig/PROBE_COM/Makefile arb-0.0.20071029/PROBE_COM/Makefile
---- arb-0.0.20071029.orig/PROBE_COM/Makefile	2007-06-29 21:04:05.000000000 +0200
-+++ arb-0.0.20071029/PROBE_COM/Makefile	2007-09-12 16:01:29.000000000 +0200
-@@ -30,7 +30,7 @@
- # @echo "no automatic dependencies for PROBE_COM - skipped"
- 
- clean:
--	$(MAKE) $(makeflags) -f AISC/Makefile clean
-+	$(MAKE) $(makeflags) -f ../AISC/Makefile clean
- 
- # DO NOT DELETE
- 

Added: trunk/packages/arb/trunk/debian/patches/20_config.makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_config.makefiles	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/20_config.makefiles	2008-02-25 21:31:22 UTC (rev 1468)
@@ -0,0 +1,29 @@
+--- /dev/null
++++ arb-0.0.20071207.1/config.makefile
+@@ -0,0 +1,26 @@
++# --------------------------------------------------------------------------------
++# If this file is named config.makefile.template then copy it to config.makefile
++# DO NOT EDIT config.makefile.template
++# --------------------------------------------------------------------------------
++
++# Enter your name (upper case, no spaces) here, to enable '#ifdef DEVEL_YOURNAME #endif' sections
++DEVELOPER=ANY
++
++DEBUG=0# build with debug information
++DEBUG_GRAPHICS = 0# force instant graphic update
++# SEER = 1
++OPENGL=1
++ARB_64=0# compile on 64 bit machine (has no effect yet)
++
++# --------------------------------------------------------------------------------
++# target machine section
++# [Note: Uncomment one section, depending on your machine type and compiler options]
++
++# ********* LINUX / gcc g++ / static ********
++MACH  = LINUX# Linux g++  and gcc
++LINUX = 1
++ECGS  = 1# use GCC? (always 1 for LINUX)
++
++# ******** Debian GNU/Linux and (K)Ubuntu system ********
++DEBIAN = 1
++

Deleted: trunk/packages/arb/trunk/debian/patches/20_config.makefiles.dpatch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_config.makefiles.dpatch	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/patches/20_config.makefiles.dpatch	2008-02-25 21:31:22 UTC (rev 1468)
@@ -1,69 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_config.makefiles.dpatch by  <tille at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Create config.makefiles for building on a Debian machine
-
- at DPATCH@
-
-diff -urbN arb-0.0.20071029.orig/config.makefile arb-0.0.20071029/config.makefile
---- arb-0.0.20071029.orig/config.makefile	1970-01-01 01:00:00.000000000 +0100
-+++ arb-0.0.20071029/config.makefile	2007-09-08 18:16:18.000000000 +0200
-@@ -0,0 +1,57 @@
-+# --------------------------------------------------------------------------------
-+# If this file is named config.makefile.template then copy it to config.makefile
-+# DO NOT EDIT config.makefile.template
-+# --------------------------------------------------------------------------------
-+
-+# Enter your name (upper case, no spaces) here, to enable '#ifdef DEVEL_YOURNAME #endif' sections
-+DEVELOPER=ANY
-+
-+DEBUG=0# build with debug information
-+DEBUG_GRAPHICS = 0# force instant graphic update
-+# SEER = 1
-+OPENGL=1
-+ARB_64=0# compile on 64 bit machine (has no effect yet)
-+
-+# --------------------------------------------------------------------------------
-+# target machine section
-+# [Note: Uncomment one section, depending on your machine type and compiler options]
-+
-+# ********* LINUX / gcc g++ / static ********
-+MACH  = LINUX# Linux g++  and gcc
-+LINUX = 1
-+ECGS  = 1# use GCC? (always 1 for LINUX)
-+
-+# ******** Debian GNU/Linux and (K)Ubuntu system ********
-+DEBIAN = 1
-+
-+# uncomment next line for REDHAT systems
-+# REDHAT = 1
-+
-+# ********* Mac OSX ********
-+
-+# MACH   = DARWIN#
-+# DARWIN = 1
-+
-+# ********* SUN4 / acc CC / dynamic ********
-+
-+# MACH = SUN4#
-+# SUN4 = 1#                              # Exportable Version
-+
-+# MACH = SUN5#
-+# SUN5 = 1
-+# ECGS  = 1# use GCC? 
-+# SUN_WS_50 = 1 # compile with Workshop 5.0
-+
-+# ********* HP ****************
-+# HPCC = 1
-+# HPGCC = 1
-+# MACH = HP#
-+
-+# *******  SGI  ***********
-+# SGI = 1
-+# MACH = SGI#
-+
-+# *******  DIGITAL OSF  ***********
-+# DIGITAL = 1
-+# MACH = DIGITAL#
-+

Added: trunk/packages/arb/trunk/debian/patches/20_perlscripts
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_perlscripts	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/20_perlscripts	2008-02-25 21:31:22 UTC (rev 1468)
@@ -0,0 +1,7 @@
+--- arb-0.0.20071207.1.orig/PERL_SCRIPTS/IFTHELP/genbank_gen_long_features.pl
++++ arb-0.0.20071207.1/PERL_SCRIPTS/IFTHELP/genbank_gen_long_features.pl
+@@ -1,4 +1,3 @@
+-
+ #!/usr/bin/perl
+ # ================================================================ #
+ #                                                                  #

Added: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2008-02-25 21:31:22 UTC (rev 1468)
@@ -0,0 +1,19 @@
+--- arb-0.0.20071207.1.orig/Makefile
++++ arb-0.0.20071207.1/Makefile
+@@ -76,7 +76,7 @@
+ #		cflags = -O2 $(dflag1) $(dflags) $(DEVEL_DEF)
+ #		cflags = -O4 $(dflag1) $(dflags) $(DEVEL_DEF)
+ 
+-		lflags = $(dflag1)
++		lflags = $(dflag1) $(lflags)
+ 		fflags = $(dflag1) -C
+ 		extended_warnings         = -Wwrite-strings -Wunused -Wno-aggregate-return -Wshadow
+ 		extended_cpp_warnings     = -Wnon-virtual-dtor -Wreorder -Wpointer-arith 
+@@ -133,6 +133,7 @@
+ 
+ ifdef DEBIAN
+    XHOME = /usr/X11R6
++   lflags = -Wl,-rpath,/usr/lib/arb/lib
+ else
+    XHOME = /usr/X11
+ endif

Added: trunk/packages/arb/trunk/debian/patches/30_phyml
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_phyml	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/30_phyml	2008-02-25 21:31:22 UTC (rev 1468)
@@ -0,0 +1,22 @@
+--- arb-0.0.20071207.1.orig/GDE/PHYML/Makefile
++++ arb-0.0.20071207.1/GDE/PHYML/Makefile
+@@ -13,7 +13,8 @@
+ # original compilation
+ 
+ CC = gcc #cc
+-CFLAGS = -O4 -fomit-frame-pointer -Wall -static
++CFLAGS = -O4 -fomit-frame-pointer -Wall
++# -static
+ # CFLAGS = -Wall
+ # CFLAGS = -g -Wall
+ # CFLAGS = -pg -Wall -fprofile-arcs -static
+@@ -25,7 +26,8 @@
+ # compilation together with ARB
+ 
+ CC     = $(ACC)
+-CFLAGS = $(cflags) -fomit-frame-pointer -static  
++CFLAGS = $(cflags) -fomit-frame-pointer
++# -static  
+ EXEC   = $(ARBHOME)/bin/phyml
+ 
+ # ARBs standard target

Added: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/series	2008-02-25 21:31:22 UTC (rev 1468)
@@ -0,0 +1,5 @@
+20_perlscripts
+30_phyml
+20_config.makefiles
+30_Makefile_main
+20_Makefiles

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2008-02-25 07:32:28 UTC (rev 1467)
+++ trunk/packages/arb/trunk/debian/rules	2008-02-25 21:31:22 UTC (rev 1468)
@@ -1,16 +1,9 @@
 #!/usr/bin/make -f
-# debian/rules for arp using dpatch
+# debian/rules for arp using quilt
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
-
-# only necessary for the get-orig-source target
-# version=2005_05_26
-version=20071029
-# downloadurl=http://www2.mikro.biologie.tu-muenchen.de/download/ARB/pre_release/
-# downloadurl=http://www2.mikro.biologie.tu-muenchen.de/download/ARB/pre_release/$(version)/
-downloadurl=http://www2.mikro.biologie.tu-muenchen.de/download/ARB/latest_build/
-
+    
 pkg=arb
 pkgcom=$(pkg)-common
 pkgdoc=$(pkg)-doc
@@ -19,7 +12,7 @@
 ### pkgserv=$(pkg)-server
 common=debian/$(pkgcom)
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build: build-stamp debian/po/templates.pot
 build-stamp: patch
@@ -60,9 +53,9 @@
 	dh_testroot
 
 	# Make does only work if config.makefile exists which is only the
-	# case when dpatch has installed the patches.  So there is neither
+	# case when quilt has installed the patches.  So there is neither
 	# a need nor the expection of success if config.makefile is missing
-	[ ! f config.makefile ] || $(MAKE) clean
+	[ ! -f config.makefile ] || $(MAKE) clean
 	
 	# fix broken clean process
 	find . -type f -name "*.a"  -exec rm -f \{\} \;
@@ -105,6 +98,7 @@
 
 	# Fix permissions
 	chmod 755 debian/arb-common/usr/lib/arb/SH/*
+	chmod 755 debian/arb-common/usr/lib/arb/PERL_SCRIPTS/IFTHELP/*
 	chmod 644 debian/arb-common/usr/lib/arb/lib/pixmaps/*.xpm
 	# Remove thumbnail dir
 	rm -rf debian/arb-common/usr/lib/arb/lib/pixmaps/.xvpics
@@ -177,51 +171,5 @@
 get-orig-source:
 	sh debian/get-orig-source
 
-get-orig-source_old:
-	if [ _"$(version)" = _"" ] ; then \
-	   VER=0.0.`date +%Y%m%d` ; \
-	   srctgz=$(downloadurl)/$(pkg)src.tgz ; \
-	else \
-	   VER=0.0.`echo $(version) | sed 's/_//g'` ; \
-	   srctgz=$(downloadurl)/$(pkg)src.tgz ; \
-	fi ; \
-	basetgz=`basename $${srctgz}` ; \
-	if [ ! -e $${basetgz} ] ; then \
-	   wget -N $${srctgz} ; \
-	else \
-	   if [ "$${basetgz}" -nt "get" ] ; then \
-	      echo "Archive $${basetgz} seems to be new. No wget necessary." ; \
-	   else \
-	      wget -N $${srctgz} ; \
-	   fi ; \
-	fi ; \
-	TGZ=`ls $(pkg)src*.tgz | sort | tail -n1` ; \
-	TAR=$(pkg)_$${VER}.orig.tar.gz ; \
-	DIR=$(pkg)-$${VER} ; \
-	if [ -d $${DIR} ] ; then \
-	   rm -f $${DIR} ; \
-	fi ; \
-	if [ -f $${DIR} ] ; then \
-	   echo "Please remove $${DIR}." ; \
-	   exit ; \
-	fi ; \
-	mkdir $${DIR} ; \
-	cd $${DIR} ; \
-	tar -xzf ../$${TGZ} ; \
-	rm -rf `find . -type d -name CVS` ; \
-	rm -rf `find . -type f -name ".#*"` ; \
-	rm -rf $(RemoveFilesFromSource) ; \
-	find . -name .cvsignore -exec rm -f \{\} \; ; \
-	rm -f HELP_SOURCE/oldhelp/help.tar ; \
-	find lib          ! -newer lib/config.HP-UX -exec touch -r lib/config.HP-UX \{\} \; ; \
-	find SH           ! -newer SH/arb_ale       -exec touch -r SH/arb_ale \{\} \; ; \
-	find PERL_SCRIPTS ! -newer SH/arb_ale -exec touch -r SH/arb_ale \{\} \; ; \
-	find HELP_SOURCE  ! -newer SH/arb_ale -exec touch -r SH/arb_ale \{\} \; ; \
-	rm -f SH/arb_oneach ; \
-	chmod 644 lib/submit/* ; \
-	cd .. ; \
-	GZIP=-9 tar -czf $${TAR} $${DIR} ; \
-	rm -rf $${DIR}
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install




More information about the debian-med-commit mailing list