projects / debian / amanda / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Imported Upstream version 3.1.0
[debian/amanda] / packaging / deb / rules
diff --git a/packaging/deb/rules b/packaging/deb/rules
index dbad5031f9fda4379b6d150d0a88d2906a5b9cf6..279863b8d89b830f1aa95bdcbf7955402b089e8f 100755 (executable)
--- a/packaging/deb/rules
+++ b/packaging/deb/rules
@@ -8,7 +8,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-AMVER=2.6.1p2
+AMVER=2.6.2alpha
 
 # These are variables that the user can override.  They get used in various
 # places during configure, build, and install.
@@ -33,7 +33,7 @@ AMANDAGROUP=disk
 WITHOUT_SERVER="False"
 WITHOUT_CLIENT="False"
 
-r=$(shell pwd)/debian/amanda-common
+r=$(shell pwd)/debian/tmp
 server=$(shell pwd)/debian/amanda-backup-server
 client=$(shell pwd)/debian/amanda-backup-client
 
@@ -44,12 +44,14 @@ log=$(shell pwd)/debian/dpkg.log
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+WD=$(shell pwd)
+
 build: build-stamp 
 build-stamp: /sbin/dump /usr/bin/smbclient 
        dh_testdir
        ./configure \
                MAKEFLAGS="-j1 " \
-               CFLAGS="-DIGNORE_TAR_ERRORS " \
+               CFLAGS="-pipe " \
                MAILER=/usr/bin/mail \
                --quiet \
                --host=$(DEB_HOST_GNU_TYPE) \
@@ -75,8 +77,8 @@ build-stamp: /sbin/dump /usr/bin/smbclient
                --with-smbclient=$(BINDIR)/smbclient \
                --with-debugging=$(LOGDIR) \
                --with-tcpportrange=11000,11040 \
+                --with-low-tcpportrange=700,710 \
                --with-udpportrange=700,740 \
-                --with-low-udpportrange=700,710 \
                --with-ssh-security \
                --with-assertions \
                --enable-s3-device \
@@ -85,18 +87,18 @@ build-stamp: /sbin/dump /usr/bin/smbclient
        # There's probably a better way to do this.  Preinst and postrm are the
        # same for client and server, but we leave room for differences by just
        # appending here.
-       cat $(shell pwd)/debian/preinst >> $(shell pwd)/debian/amanda-backup-client.preinst
-       cat $(shell pwd)/debian/preinst >> $(shell pwd)/debian/amanda-backup-server.preinst
-       cat $(shell pwd)/debian/postrm >> $(shell pwd)/debian/amanda-backup-client.postrm
-       cat $(shell pwd)/debian/postrm >> $(shell pwd)/debian/amanda-backup-server.postrm
-       make 
+       cat $(WD)/debian/preinst >> $(WD)/debian/amanda-backup-client.preinst
+       cat $(WD)/debian/preinst >> $(WD)/debian/amanda-backup-server.preinst
+       cat $(WD)/debian/postrm >> $(WD)/debian/amanda-backup-client.postrm
+       cat $(WD)/debian/postrm >> $(WD)/debian/amanda-backup-server.postrm
+       make -s LIBTOOLFLAGS=--silent
        touch build-stamp
 
 clean:
        dh_testdir >> $(log) 2>&1
        dh_testroot >> $(log) 2>&1
-       -make clean
-       -make distclean
+       -make -s LIBTOOLFLAGS=--silent clean
+       -make -s LIBTOOLFLAGS=--silent distclean
        -rm -f build-stamp missing config/config.h common-src/genversion
        -find . -type d -name .deps -exec rm -rf {} \;
        -test -r /usr/share/misc/config.sub && \
@@ -115,24 +117,18 @@ binary-arch: build
        dh_clean -k >> $(log) 2>&1
        echo "---->dh_installdirs: " >> $(log)
        dh_installdirs -v >> $(log) 2>&1
-       make install DESTDIR=$(r)
+       make -s LIBTOOLFLAGS=--silent install DESTDIR=$(r)
        echo "---->dh_installdocs: " >> $(log)
        dh_installdocs -v >> $(log) 2>&1
        install -d $(r)/$(DOCDIR)/amanda-common/examples
        cp -a example/* $(r)/$(DOCDIR)/amanda-common/examples
        cp ChangeLog $(r)/$(DOCDIR)/amanda-common/changelog
-       echo "---->dh_installmenu: " >> $(log)
-       dh_installmenu -v >> $(log) 2>&1
-       echo "---->dh_installcron: " >> $(log)
-       dh_installcron >> $(log) 2>&1
        echo "---->dh_installchangelogs: " >> $(log)
        dh_installchangelogs -v >> $(log) 2>&1
-       echo "---->dh_installdebconf: " >> $(log)
-       dh_installdebconf -v >> $(log) 2>&1
        # Here's how we get the perl modules installed into sitelib
        echo $(PERLSITELIB)/* >> debian/amanda-backup-server.install
        echo "---->dh_install -v --fail-missing: " >> $(log)
-       dh_install -v --sourcedir=debian/amanda-common >> $(log) 2>&1
+       dh_install -v --sourcedir=$(r) >> $(log) 2>&1
        echo "---->dh_strip: " >> $(log)
        dh_strip >> $(log) 2>&1
        echo "---->dh_compress: " >> $(log)
@@ -145,7 +141,8 @@ binary-arch: build
        chown -R $(AMANDAUSER):$(AMANDAGROUP) $(client)/$(LOGDIR) $(server)/$(LOGDIR)
        #chmod -R u=rwX,g=rwX,o-rwx $(server)/$(LOGDIR)
        chown -R $(AMANDAUSER):$(AMANDAGROUP)  $(client)/$(SYSCONFDIR)/amanda $(server)/$(SYSCONFDIR)/amanda
-       #chmod -R u=rwX,g=rwX,o-rwx $(server)/$(SYSCONFDIR)/amanda
+       chmod -R u=rwX,g=rwX,o-rwx $(client)/$(SYSCONFDIR)/amanda
+       chmod -R u=rwX,g=rwX,o-rwx $(server)/$(SYSCONFDIR)/amanda
        chown -R $(AMANDAUSER):$(AMANDAGROUP) $(client)/$(AMANDAHOMEDIR)/gnutar-lists $(server)/$(AMANDAHOMEDIR)/gnutar-lists
        chmod -R u=rwX,g=rwX,o-rwx  $(client)/$(AMANDAHOMEDIR)/gnutar-lists $(server)/$(AMANDAHOMEDIR)/gnutar-lists
        # .. setuid
@@ -185,20 +182,12 @@ binary-arch: build
        echo "Amanda version $(AMVER)" >  $(client)/$(AMANDAHOMEDIR)/amanda-release 
        install -o root -g root -m 0644 debian/amanda-backup-client.lintian \
                $(client)/usr/share/lintian/overrides/amanda-backup-client
-       #install -o root -g root -m 0644 debian/amanda-common.lintian \
-       #       $(r)/usr/share/lintian/overrides/amanda-common
        install -o root -g root -m 0644 debian/amanda-backup-server.lintian \
                $(server)/usr/share/lintian/overrides/amanda-backup-server
        dh_makeshlibs  >> $(log) 2>&1
-       dh_installdeb >> $(log) 2>&1
        dh_perl >> $(log) 2>&1
-       dh_shlibdeps -l"debian/$(r)/usr/lib:debian/$(client)/usr/lib:debian/$(server)/usr/lib" >> $(log) 2>&1
-       # strip out the non-versioned amanda-common references, we need
-       # the versioned ones in the control file and dupes are ugly...
-       sed -e 's/amanda-common, //' < debian/amanda-backup-server.substvars > debian/blah
-       mv debian/blah debian/amanda-backup-server.substvars
-       sed -e 's/amanda-common, //' < debian/amanda-backup-client.substvars > debian/blah
-       mv debian/blah debian/amanda-backup-client.substvars
+       dh_shlibdeps -l"$(r)/usr/lib:$(client)/usr/lib:$(server)/usr/lib" >> $(log) 2>&1
+       dh_installdeb >> $(log) 2>&1
        dh_gencontrol >> $(log) 2>&1
        dh_md5sums  >> $(log) 2>&1
        dh_builddeb  >> $(log) 2>&1
Debian packaging of amanda