Author: tille
Date: 2011-02-09 10:31:13 +0000 (Wed, 09 Feb 2011)
New Revision: 5939
Modified:
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/patches/20_Makefiles
trunk/packages/arb/trunk/debian/patches/20_config.makefiles
trunk/packages/arb/trunk/debian/rules
Log:
Really regard DEB_BUILD_ARCH_BITS (patch was wrong); Fix errors in clean
targets of upstream Makefiles; use override_dh_* in debian/rules
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2011-02-09 10:07:04 UTC (rev
5938)
+++ trunk/packages/arb/trunk/debian/changelog 2011-02-09 10:31:13 UTC (rev
5939)
@@ -13,6 +13,9 @@
* Drop xview dependency in debian/control
FIXME: Patches for SH/* need to be written
Closes: 612534
+ * debian/patches/20_Makefiles: clean up some errors in clean target
+ * debian/patches/20_config.makefiles: Really get the DEB_BUILD_ARCH_BITS
+ applied
-- Andreas Tille <[email protected]> Wed, 09 Feb 2011 08:53:32 +0100
Modified: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles 2011-02-09
10:07:04 UTC (rev 5938)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles 2011-02-09
10:31:13 UTC (rev 5939)
@@ -1,5 +1,5 @@
---- arb-5.0.orig/ARBDB2/Makefile
-+++ arb-5.0/ARBDB2/Makefile
+--- arbsrc_6779.orig/ARBDB2/Makefile
++++ arbsrc_6779/ARBDB2/Makefile
@@ -1,7 +1,11 @@
# INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
.SUFFIXES: .o .c .depend
@@ -13,8 +13,8 @@
ACC_OBJECTS = $(GB_O) $(GB_T) $(GB_X)
---- arb-5.0.orig/ARBDBS/Makefile
-+++ arb-5.0/ARBDBS/Makefile
+--- arbsrc_6779.orig/ARBDBS/Makefile
++++ arbsrc_6779/ARBDBS/Makefile
@@ -1,7 +1,11 @@
# INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
.SUFFIXES: .o .c .cxx .depend
@@ -28,8 +28,17 @@
OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
---- arb-5.0.orig/NAMES_COM/Makefile
-+++ arb-5.0/NAMES_COM/Makefile
+--- arbsrc_6779.orig/NAMES_COM/Makefile
++++ arbsrc_6779/NAMES_COM/Makefile
+@@ -18,7 +18,7 @@
+ AISC_COMPILER=../MAKEBIN/aisc
+ AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER)
+
+-include AISC/export2sub
++include $(ARBHOME)/AISC_COM//AISC/export2sub
+
+ server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES)
$(AISC_DEPENDS)
+ @$(MAKE) -r -f AISC/Makefile
@@ -27,7 +27,7 @@
@$(MAKE) -r -f AISC/Makefile pregenerate
@@ -39,8 +48,17 @@
# DO NOT DELETE
---- arb-5.0.orig/PROBE_COM/Makefile
-+++ arb-5.0/PROBE_COM/Makefile
+--- arbsrc_6779.orig/PROBE_COM/Makefile
++++ arbsrc_6779/PROBE_COM/Makefile
+@@ -18,7 +18,7 @@
+ AISC_COMPILER=../MAKEBIN/aisc
+ AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER)
+
+-include AISC/export2sub
++include $(ARBHOME)/AISC_COM//AISC/export2sub
+
+ server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c)
$(PUBLIC_SOURCES) $(AISC_DEPENDS)
+ @$(MAKE) -r -f AISC/Makefile
@@ -27,7 +27,7 @@
@$(MAKE) -r -f AISC/Makefile pregenerate
@@ -50,8 +68,8 @@
# DO NOT DELETE
---- arb-5.0.orig/GENOM_IMPORT/Makefile
-+++ arb-5.0/GENOM_IMPORT/Makefile
+--- arbsrc_6779.orig/GENOM_IMPORT/Makefile
++++ arbsrc_6779/GENOM_IMPORT/Makefile
@@ -30,12 +30,12 @@
$(ACC) $(cflags) -c $< $(CPPINCLUDES)
@@ -71,3 +89,67 @@
#.IGNORE:
# clean
+--- arbsrc_6779.orig/HELP_SOURCE/Makefile
++++ arbsrc_6779/HELP_SOURCE/Makefile
+@@ -160,7 +160,7 @@
+ #
--------------------------------------------------------------------------------
+
+ delzerohtml:
+- -find $(HTML_LOCATION) -name "*.html" -size -1 -exec rm {} \;
++ -if [ -d $(HTML_LOCATION) ] ; then find $(HTML_LOCATION) -name
"*.html" -size -1 -exec rm {} \; ; fi
+
+ date :
+ $(MAKE) date.xsl.tmp
+@@ -232,9 +232,9 @@
+ clean:
+ rm -f $(TOOL_OBJECTS) $(BINARIES)
+ rm -f $(HTML_IDX) `find $(HLP_DEST) -name "*.hlp"`
+- rm -f html.list `find $(HTML_LOCATION) -name "*.html"`
++ rm -rf html.list $(HTML_LOCATION)
+ ifeq ($(CONVERT_FROM_OLD_HELP),1)
+- rm -f $(XML_DEPEND) dummy `find $(XML_LOCATION) -name "*.xml"`
++ rm -rf $(XML_DEPEND) dummy $(XML_LOCATION)
+ endif
+ $(MAKE) -C $(HLP_GENERATED) clean
+
+--- arbsrc_6779.orig/GDEHELP/Makefile
++++ arbsrc_6779/GDEHELP/Makefile
+@@ -37,10 +37,18 @@
+ tar cvf - MENUS ARB_GDEmenus* |gzip >`date
'+arbgdemnus_%d_%m_%y.tar.gz'`
+
+ clean:
+- rm -f $(GENMENUS) $(TARGET) $(HELPFILELIST)
+- @$(MAKE) -f Makefile.helpfiles \
+- "GENHELPDEST=$(GENHELPDEST)" \
+- "GENDOCDEST=$(GENDOCDEST)" \
+- "HELPFILELIST=$(HELPFILELIST)" \
+- clean
++ rm -f $(GENMENUS) $(TARGET)
++ @if [ -e $(HELPFILELIST) ] ; then \
++ $(MAKE) -f Makefile.helpfiles \
++ "GENHELPDEST=$(GENHELPDEST)" \
++ "GENDOCDEST=$(GENDOCDEST)" \
++ "HELPFILELIST=$(HELPFILELIST)" \
++ clean ; \
++ else \
++ $(MAKE) -f Makefile.helpfiles \
++ "GENHELPDEST=$(GENHELPDEST)" \
++ "GENDOCDEST=$(GENDOCDEST)" \
++ clean ; \
++ fi
+
++ rm -f $(HELPFILELIST)
+--- arbsrc_6779.orig/GDEHELP/Makefile.helpfiles
++++ arbsrc_6779/GDEHELP/Makefile.helpfiles
+@@ -2,9 +2,9 @@
+
+ .SUFFIXES: .doc .help .html
+
+-# GENHELPDEST, GENDOCDEST and HELPFILELIST are passed from 'Makefile'
++# GENHELPDEST, GENDOCDEST and HELP_NAMES are passed from 'Makefile'
+
+-HELP_NAMES=$(shell cat $(HELPFILELIST))
++# HELP_NAMES=$(shell cat $(HELPFILELIST))
+ HELP_TARGETS=$(addprefix $(GENHELPDEST)/,$(HELP_NAMES))
+ HELP_PLAIN=./HELP_PLAIN
+ HELP_WRITTEN=./HELP_WRITTEN
Modified: trunk/packages/arb/trunk/debian/patches/20_config.makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_config.makefiles 2011-02-09
10:07:04 UTC (rev 5938)
+++ trunk/packages/arb/trunk/debian/patches/20_config.makefiles 2011-02-09
10:31:13 UTC (rev 5939)
@@ -1,5 +1,5 @@
--- /dev/null
-+++ arbsrc_6182/config.makefile
++++ arbsrc_6779/config.makefile
@@ -0,0 +1,27 @@
+#
--------------------------------------------------------------------------------
+# If this file is named config.makefile.template then copy it to
config.makefile
@@ -14,7 +14,7 @@
+# SEER = 1
+OPENGL=1
+# ARB_64=0# compile on 64 bit machine (has no effect yet)
-+ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ;
then 1; else 0 fi)
++ARB_64 := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH_BITS` -eq 64 ] ;
then echo 1 ; else echo 0 ; fi)
+
+#
--------------------------------------------------------------------------------
+# target machine section
Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules 2011-02-09 10:07:04 UTC (rev
5938)
+++ trunk/packages/arb/trunk/debian/rules 2011-02-09 10:31:13 UTC (rev
5939)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# debian/rules for arp using quilt
+# debian/rules for arb using quilt
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -7,31 +7,29 @@
pkg=arb
pkgcom=$(pkg)-common
pkgdoc=$(pkg)-doc
-### pkgnas=$(pkg)-nas
-### do not build server-package any more
-### pkgserv=$(pkg)-server
common=debian/$(pkgcom)
ARBHOME=$(CURDIR)
-include /usr/share/quilt/quilt.make
+BITARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS)
+ifeq ($(BITARCH),64)
+ ARB_64:=1
+else
+ ARB_64:=0
+endif
-build: build-stamp debian/po/templates.pot
-build-stamp: patch
- dh_testdir
+%:
+ dh $@ --with quilt
+override_dh_auto_build:
mkdir -p LIBLINK MAKEBIN lib/help
export LC_ALL=C ; \
export PATH=$(ARBHOME)/bin:$${PATH} ; \
export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
- $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) all
- export LC_ALL=C ; \
- export PATH=$(ARBHOME)/bin:$${PATH} ; \
+ $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) all ; \
export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
- $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) arbxtras
+ $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) arbxtras
- touch $@
-
# Remove links inside these directories because Makefile does not really clean
# these directories
DIRSTOREMOVELINKS=AWT ARBDBS ARBDB2 EDIT4 LIBLINK MAKEBIN NALIGNER NAMES_COM
ORS_COM PROBE PROBE_COM PROBE_SERVER TOOLS bin lib/inputMasks lib/help
@@ -49,11 +47,7 @@
DIRSTOREMOVE=INCLUDE HELP_SOURCE/Xml lib/help lib/help_html PERL5 lib/perl5
PROBE_SERVER/bin PERL2ARB/blib/man3 PROBE_SET/bin
DirsToKeepOnlyMAKEFILE=bin
-clean: realclean unpatch
-realclean:
- dh_testdir
- dh_testroot
-
+override_dh_auto_clean:
# Make does only work if config.makefile exists which is only the
# case when quilt has installed the patches. So there is neither
# a need nor the expection of success if config.makefile is missing
@@ -76,95 +70,33 @@
rm -fr $(DIRSTOREMOVE)
for dtc in $(DIRSTOCLEAN); do if [ -d $${dtc} ] ; then cd $${dtc}; make
clean ; fi; done
- dh_clean build-stamp
-
-install:
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_prep
- dh_installdirs
-
- dh_install
- dh_link
-
+override_dh_auto_install:
# remove files from arb package which are in arb-nas
if [ -s debian/arb-nas.install ] ; then \
- for arbfile in `sed
's?^bin/\([^[:space:]]\+\)[[:space:]]\+\(.\+\)?debian/arb/\2/\1?'
debian/arb-nas.install | grep debian/arb` ; do \
+ for arbfile in `sed
's?^bin/\([^[:space:]]\+\)[[:space:]]\+\(.\+\)?debian/$(pkg)/\2/\1?'
debian/arb-nas.install | grep debian/$(arb)` ; do \
rm -f $${arbfile} ; \
done ; \
fi
# Move SH/README to docs
- cp -a SH/README debian/arb-common/usr/share/doc/arb/README_SH
+ cp -a SH/README debian/$(pkgcom)/usr/share/doc/arb/README_SH
# Fix permission of debian specific script
- chmod 755 debian/arb-common/usr/lib/arb/SH/arb_create_debian_conffile
+ chmod 755 debian/$(pkgcom)/usr/lib/arb/SH/arb_create_debian_conffile
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdebconf -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installmenu -i
-# dh_installlogrotate -i
-# dh_installpam -i
-# dh_installmime -i
-# dh_installinit -i
- dh_installcron -i
- dh_installman -i
- dh_installinfo -i
- dh_installchangelogs -i
- dh_lintian -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_perl -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+ # Man page is not really needed and throws just a lintian warning
+ # mkdir `pwd`/debian/$(pkg)/usr/share/man/man3
+ # perldoc PERL2ARB/ARB.pm >
`pwd`/debian/$(pkg)/usr/share/man/man3/ARB.3pm
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installdebconf -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installmenu -a
-# dh_installlogrotate -a
-# dh_installpam -a
-# dh_installmime -a
-# dh_installinit -a
- dh_installcron -a
- dh_installman -a
- # Man page is not really needed and throwas just a lintian warning
- # mkdir `pwd`/debian/arb/usr/share/man/man3
- # perldoc PERL2ARB/ARB.pm > `pwd`/debian/arb/usr/share/man/man3/ARB.3pm
- dh_installinfo -a
- dh_installchangelogs -a
- dh_lintian -a
+
+override_dh_strip:
# Fix rpath issue
chrpath --delete debian/libarb/usr/lib/arb/lib/ARB.so
- dh_strip -a
- dh_link -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
-# dh_perl -a
+ dh_strip
+
+override_dh_shlibdeps:
dh_shlibdeps -a -l debian/libarb/usr/lib
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
# To update po files as recommended in po-debconf(7)
debian/po/templates.pot: debian/arb-common.templates
@debconf-updatepo
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
