r6760: Update debian packages

diff --git a/packaging/debian/README.building b/packaging/debian/README.building
index b58c9d6fd8fd96008831bde2207425fce7531a10..488d2ceb838b8e6b0753e751612ccf161d348a6f 100644 (file)
--- a/packaging/debian/README.building
+++ b/packaging/debian/README.building
@@ -8,7 +8,7 @@ where source/ and packaging/ can be found).
 
 Now, go to packaging/, and run:
 
 
 Now, go to packaging/, and run:
 

-dpkg-buildpackage -rfakeroot
+svn-buildpackage -rfakeroot

 
 See the Debian docs for more information about the debian build 
 process.
 
 See the Debian docs for more information about the debian build 
 process.

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index f02a929ad8f6e6f42a5a1878f366481cb9e85e56..c7022ae4a6d56984ee9b5de892c6eafaf82c7e0b 100644 (file)
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+samba4 (3.9.0-SVN-build-6710-1) unstable; urgency=low
+
+  * Newer upstream version
+
+ -- Jelmer Vernooij <jelmer@samba.org>  Thu, 12 May 2005 14:04:05 +0200
+

 samba4 (3.9.0-SVN-build-655-1) unstable; urgency=low
 
   * Initial release.
 samba4 (3.9.0-SVN-build-655-1) unstable; urgency=low
 
   * Initial release.

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 69749888c2e7c17b451070e0297972473cb5c2bc..113347e4e5b36cabc328e8654bb6e858d1d5dd8c 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -4,8 +4,7 @@
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
 

-SOURCEPATH=../source
-DOCSPATH=../docs
+SOURCEPATH=../../source

 
 package=samba4
 
 
 package=samba4
 


@@ -25,21 +24,17 @@ configure:
                --with-syslog \
                --with-readline \
                --with-ldap 
                --with-syslog \
                --with-readline \
                --with-ldap 

-       cd $(DOCSPATH) && autoreconf
-       cd $(DOCSPATH) && ./configure

        touch configure
 
 build: configure
        $(checkdir)
        cd $(SOURCEPATH) && $(MAKE) proto all
        touch configure
 
 build: configure
        $(checkdir)
        cd $(SOURCEPATH) && $(MAKE) proto all

-       cd $(DOCSPATH) && $(MAKE) htmlman manpages

        touch build
 
 clean:
        $(checkdir)
        rm -f build
        -cd $(SOURCEPATH) && $(MAKE) clean
        touch build
 
 clean:
        $(checkdir)
        rm -f build
        -cd $(SOURCEPATH) && $(MAKE) clean

-       -cd $(DOCSPATH) && $(MAKE) clean

        rm -f `find . -name "*~"`
        rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
        rm -f debian/*substvars
        rm -f `find . -name "*~"`
        rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
        rm -f debian/*substvars


@@ -58,8 +53,6 @@ binary-arch: checkroot build
        cd $(SOURCEPATH) && $(MAKE) install DESTDIR=`pwd`/../packaging/debian/tmp
        mkdir -p debian/tmp/usr/share/man/man1 
        mkdir -p debian/tmp/usr/share/man/man7 
        cd $(SOURCEPATH) && $(MAKE) install DESTDIR=`pwd`/../packaging/debian/tmp
        mkdir -p debian/tmp/usr/share/man/man1 
        mkdir -p debian/tmp/usr/share/man/man7 

-       cp $(DOCSPATH)/output/manpages/*.1 debian/tmp/usr/share/man/man1
-       cp $(DOCSPATH)/output/manpages/*.7 debian/tmp/usr/share/man/man7

        cp $(SOURCEPATH)/build/pidl/pidl.pl debian/tmp/usr/bin/pidl
        debstd 
        dpkg-gencontrol -isp -psamba4
        cp $(SOURCEPATH)/build/pidl/pidl.pl debian/tmp/usr/bin/pidl
        debstd 
        dpkg-gencontrol -isp -psamba4