diff -Naur root-5.28.00a.orig/Makefile root-5.28.00a/Makefile --- root-5.28.00a.orig/Makefile 2011-02-23 13:22:20.000000000 +0000 +++ root-5.28.00a/Makefile 2011-03-13 03:36:50.000000000 +0000 @@ -27,6 +27,8 @@ ifeq ($(findstring $(MAKECMDGOALS), maintainer-clean debian redhat),) include config/Makefile.comp +else +ROOT_SRCDIR := $(CURDIR) endif ifeq ($(MAKECMDGOALS),clean) include config/Makefile.comp diff -Naur root-5.28.00a.orig/build/package/common/root-system-common.install.in root-5.28.00a/build/package/common/root-system-common.install.in --- root-5.28.00a.orig/build/package/common/root-system-common.install.in 2011-02-23 13:22:14.000000000 +0000 +++ root-5.28.00a/build/package/common/root-system-common.install.in 2011-03-13 03:36:50.000000000 +0000 @@ -1,5 +1,6 @@ @sysconfdir@/root/gdb-backtrace.sh -@sysconfdir@/root/gdb-backtrace-script +# does not exist any more +# @sysconfdir@/root/gdb-backtrace-script @sysconfdir@/root/hostcert.conf @sysconfdir@/root/html @sysconfdir@/root/pdg_table.txt diff -Naur root-5.28.00a.orig/build/package/common/root-system-xrootd.install.in root-5.28.00a/build/package/common/root-system-xrootd.install.in --- root-5.28.00a.orig/build/package/common/root-system-xrootd.install.in 2011-02-23 13:22:14.000000000 +0000 +++ root-5.28.00a/build/package/common/root-system-xrootd.install.in 2011-03-13 03:36:50.000000000 +0000 @@ -3,6 +3,8 @@ # @prefix@/bin/xrdpwdadmin.bin # @prefix@/bin/xrdgsiproxy.bin @prefix@/bin/xrootd -@prefix@/bin/olbd +# olbd obsolete? +# @prefix@/bin/olbd +# TODO? cmsd to be added? @prefix@/share/man/man1/xrootd.1* -@prefix@/share/man/man1/olbd.1* +# @prefix@/share/man/man1/olbd.1* diff -Naur root-5.28.00a.orig/build/package/debian/changelog root-5.28.00a/build/package/debian/changelog --- root-5.28.00a.orig/build/package/debian/changelog 2011-02-23 13:22:13.000000000 +0000 +++ root-5.28.00a/build/package/debian/changelog 2011-03-13 03:37:29.000000000 +0000 @@ -1,3 +1,9 @@ +root-system (5.28.00a-1) maverick; urgency=low + + * New upstream version + + -- Maxim Nikulin Tue, 08 Mar 2011 18:12:18 +0600 + root-system (5.21.07-2) unstable; urgency=low * Discovery of s390x implemented - should check if this works also in diff -Naur root-5.28.00a.orig/build/package/debian/control.in root-5.28.00a/build/package/debian/control.in --- root-5.28.00a.orig/build/package/debian/control.in 2011-02-23 13:22:13.000000000 +0000 +++ root-5.28.00a/build/package/debian/control.in 2011-03-13 03:36:50.000000000 +0000 @@ -2,7 +2,7 @@ Section: science Priority: optional Maintainer: Christian Holm Christensen -Build-Depends: debhelper (>= 5.0.37.2), po-debconf, libssl-dev, comerr-dev, libxpm-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, libxft-dev@builddepends@ +Build-Depends: debhelper (>= 5.0.37.2), po-debconf, libssl-dev, comerr-dev, libxpm-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, libxft-dev@builddepends@, libglew1.5-dev Standards-Version: 3.8.0 Package: root-system diff -Naur root-5.28.00a.orig/build/package/debian/rules root-5.28.00a/build/package/debian/rules --- root-5.28.00a.orig/build/package/debian/rules 2011-02-23 13:22:13.000000000 +0000 +++ root-5.28.00a/build/package/debian/rules 2011-03-13 03:39:07.000000000 +0000 @@ -46,8 +46,15 @@ PKGDOCDIR = $(PREFIX)/share/doc/root CINTDIR = $(PREFIX)/lib/root/$(SOVERS) ICONTHEME = $(PREFIX)/share/icons/hicolor/48x48 + +# g4root is obsolete option +# --disable-g4root \ +# +# clarens and peac can be optional +# --enable-peac \ +# --enable-clarens \ +# use system glew library CONFOPTIONS :=--enable-cintex \ - --enable-clarens \ --enable-explicitlink \ --enable-gdml \ --enable-gsl-shared \ @@ -59,7 +66,6 @@ --enable-mathmore \ --enable-minuit2 \ --enable-mysql \ - --enable-peac \ --enable-pgsql \ --enable-odbc \ --enable-reflex \ @@ -77,10 +83,10 @@ --disable-builtin-freetype \ --disable-builtin-pcre \ --disable-builtin-zlib \ + --disable-builtin-glew \ --disable-alien \ --disable-chirp \ --disable-dcache \ - --disable-g4root \ --disable-gfal \ --disable-globus \ --disable-monalisa \ @@ -203,7 +209,9 @@ EXTRAHEAD := $(filter-out $(lastword $(EXTRALIST)), $(EXTRALIST)) EXTRALIST := $(EXTRAHEAD:%=%,) $(lastword $(EXTRALIST)) TEMPLATES := $(wildcard debian/*.in) -SPKGLIST := $(filter-out root-system-doc root-system-common ttf-root-installer, $(PKGLIST:libroot%=libroot%$(SOVERS))) $(filter libroot%, $(PKGLIST:libroot%=libroot%-dev)) libroot-static +SPKGLIST := $(filter-out root-system-doc root-system-common ttf-root-installer, $(PKGLIST:libroot%=libroot%$(SOVERS))) $(filter libroot%, $(PKGLIST:libroot%=libroot%-dev)) +# do not build static packages +# libroot-static IPKGLIST := root-system-doc ttf-root-installer root-system-common root-system DPKGLIST := $(SPKGLIST:%=%,) root-system-doc, root-ttf #root-plugins root-extra-plugins @@ -252,7 +260,18 @@ -e 's,@pythondir@,$(PYTHONDIR),g' \ -e 's,@libvers@,$(SOVERS),g' < $< > $@ -debian/control:debian/control.in debian/rules +# some -dev packages can be missed although the related --enable- option presents +# It leads to empty PKGLIST, truncated debian/control file +# and late hard to track errors +check_pkglist: + @if test "x$(PKGLIST)" = x ; then \ + echo "warning: can't obtain package list. Configure output:" > /dev/stderr ;\ + ./configure $(PLATFORM) --pkglist $(CONFOPTIONS) ;\ + echo "Configure options: $(CONFOPTIONS)" ;\ + echo "error: Install missing -dev packages or remove related --enable- option in (build/package/)debian/rules" > /dev/stderr ;\ + false ;\ + fi +debian/control:debian/control.in debian/rules check_pkglist @echo "Making $@ (special)" @cp $< $@.tmp @for p in $(PKGLIST) ; do \ @@ -315,11 +334,13 @@ # Add here commands to compile the arch part of the package. #$(MAKE) ASTEPETAG= XROOTDETAG= UNURANETAG= $(MAKE) UNURANETAG= - $(MAKE) static UNURANETAG= + # disable static target + # $(MAKE) static UNURANETAG= touch build-arch-stamp build-arch-cint-stamp:build-arch-stamp - $(MAKE) cintdlls + # fixed in trunk + $(MAKE) all-cintdlls touch build-arch-cint-stamp build-indep: build-indep-stamp @@ -592,6 +613,9 @@ ./debian/rules pkglists # --sourcedir=$(DTMP) $(SPKGOPTS) + # no this file any more + # -X$(SYSCONFDIR)/root/gdb-backtrace-script \ + # dh_install -s \ --list-missing \ --sourcedir=$(DTMP) \ @@ -614,7 +638,6 @@ -X$(SYSCONFDIR)/root/proof/ \ -X$(SYSCONFDIR)/root/html \ -X$(SYSCONFDIR)/root/RadioNuclides.txt \ - -X$(SYSCONFDIR)/root/gdb-backtrace-script \ -X$(SYSCONFDIR)/root/gdb-backtrace.sh \ -X$(SYSCONFDIR)/root/hostcert.conf \ -X$(SYSCONFDIR)/root/pdg_table.txt \ @@ -724,7 +747,7 @@ dh_builddeb -s binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch check_pkglist # # EOF diff -Naur root-5.28.00a.orig/build/package/lib/makelists.sh root-5.28.00a/build/package/lib/makelists.sh --- root-5.28.00a.orig/build/package/lib/makelists.sh 2011-02-23 13:22:14.000000000 +0000 +++ root-5.28.00a/build/package/lib/makelists.sh 2011-03-13 03:36:50.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash outdir=$1 ; shift build=$1 ; shift @@ -98,7 +98,8 @@ graf2d/win32gdk)continue;; graf2d/x11*) set_plugin_names $base x11 ;; graf2d/*) set_plugin_names $base $sub ;; - graf3d/ftgl) set_lib_names $base gl ;; + # use system ftgl library + graf3d/ftgl)continue;; # set_lib_names $base gl ;; graf3d/gl) set_lib_names $base $sub ;; graf3d/g3d) set_lib_names $base $sub ;; graf3d/eve) set_lib_names $base $sub ;; @@ -170,7 +171,8 @@ if test ! -f $i ; then continue ; fi b=`basename $i .install.in` case $b in - lib*static*) b=$outdir/${b} ;; + # disable static packages + lib*static*) continue;; # b=$outdir/${b} ;; lib*-dev) b=$outdir/${b} ;; lib*) b=$outdir/${b}${sovers} ;; *) b=$outdir/${b} ;; diff -Naur root-5.28.00a.orig/cint/cint/Module.mk root-5.28.00a/cint/cint/Module.mk --- root-5.28.00a.orig/cint/cint/Module.mk 2011-02-23 13:21:59.000000000 +0000 +++ root-5.28.00a/cint/cint/Module.mk 2011-03-13 03:36:50.000000000 +0000 @@ -287,10 +287,13 @@ touch $@; \ fi) -all-$(MODNAME): $(CINTLIB) $(CINTTMP) $(IOSENUM) +# Shouldn't cint and makecint be linked? +all-$(MODNAME): $(CINTLIB) $(CINTTMP) $(IOSENUM) $(CINT) $(MAKECINT) +# and cleaned as well clean-$(MODNAME): @rm -f $(CINTTMPO) $(CINTO) $(CINTEXEO) $(MAKECINTO) + @rm -f $(CINT) $(MAKECINT) clean:: clean-$(MODNAME)