[Pkg-samba-maint] r835 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 14:20:46 +0000 (Tue, 03 Jan 2006)
New Revision: 835

Modified:
   branches/samba4/changelog
   branches/samba4/rules
Log:
Start of Samba 3 migration work: Copy upgrade script into /usr/lib/samba/setup.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-03 13:53:42 UTC (rev 834)
+++ branches/samba4/changelog	2006-01-03 14:20:46 UTC (rev 835)
@@ -9,8 +9,10 @@
   * Change SOURCEPATH in debian/rules to reflect that we now have the
     packaging in debian/, not packaging/debian/. This will have to be reverted
     whenever upstream syncs with us.
+  * Attempt to upgrade from Samba 3 if that's what the user tries to do.
+    * Copy upgrade script into /usr/lib/samba/setup.
 
- -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 14:52:52 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 15:19:55 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-01-03 13:53:42 UTC (rev 834)
+++ branches/samba4/rules	2006-01-03 14:20:46 UTC (rev 835)
@@ -69,7 +69,7 @@
 	mkdir -p $(CURDIR)/debian/tmp/etc/samba
 	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
-	cp $(SOURCEPATH)/setup/provision $(CURDIR)/debian/tmp/usr/lib/samba/setup
+	cp $(SOURCEPATH)/setup/{provision,upgrade} $(CURDIR)/debian/tmp/usr/lib/samba/setup
 	$(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-arch: build install