[Pkg-samba-maint] r3899 - trunk/samba/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sun Sep 25 22:58:57 UTC 2011
Author: vorlon
Date: 2011-09-25 22:58:57 +0000 (Sun, 25 Sep 2011)
New Revision: 3899
Added:
trunk/samba/debian/libpam-smbpass.install
trunk/samba/debian/libsmbclient-dev.install
trunk/samba/debian/libsmbclient.install
trunk/samba/debian/libwbclient-dev.install
trunk/samba/debian/libwbclient0.install
trunk/samba/debian/samba-common-bin.install
trunk/samba/debian/samba-common.install
trunk/samba/debian/samba-tools.install
trunk/samba/debian/samba.install
trunk/samba/debian/smbclient.install
trunk/samba/debian/swat.install
trunk/samba/debian/winbind.install
Removed:
trunk/samba/debian/libpam-smbpass.files
trunk/samba/debian/libsmbclient-dev.files
trunk/samba/debian/libsmbclient.files
trunk/samba/debian/libwbclient-dev.files
trunk/samba/debian/libwbclient0.files
trunk/samba/debian/samba-common-bin.files
trunk/samba/debian/samba-common.files
trunk/samba/debian/samba-tools.files
trunk/samba/debian/samba.files
trunk/samba/debian/smbclient.files
trunk/samba/debian/swat.files
trunk/samba/debian/winbind.files
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/compat
trunk/samba/debian/rules
Log:
Switch from dh_movefiles to dh_install and adjust for debhelper compat
level 7, in preparation for moving to dh(1).
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/changelog 2011-09-25 22:58:57 UTC (rev 3899)
@@ -3,6 +3,8 @@
* Don't export DEB_HOST_ARCH_OS in debian/rules, this is only used locally.
* Use dh_links instead of manually creating directories and symlinks from
debian/rules.
+ * Switch from dh_movefiles to dh_install and adjust for debhelper compat
+ level 7, in preparation for moving to dh(1).
-- Steve Langasek <vorlon at debian.org> Sat, 24 Sep 2011 13:36:50 -0700
Modified: trunk/samba/debian/compat
===================================================================
--- trunk/samba/debian/compat 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/compat 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1 +1 @@
-6
+7
Deleted: trunk/samba/debian/libpam-smbpass.files
===================================================================
--- trunk/samba/debian/libpam-smbpass.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/libpam-smbpass.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,2 +0,0 @@
-lib/security/pam_smbpass.so
-usr/share/pam-configs/smbpasswd-migrate
Copied: trunk/samba/debian/libpam-smbpass.install (from rev 3893, trunk/samba/debian/libpam-smbpass.files)
===================================================================
--- trunk/samba/debian/libpam-smbpass.install (rev 0)
+++ trunk/samba/debian/libpam-smbpass.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,2 @@
+lib/security/pam_smbpass.so
+usr/share/pam-configs/smbpasswd-migrate
Deleted: trunk/samba/debian/libsmbclient-dev.files
===================================================================
--- trunk/samba/debian/libsmbclient-dev.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/libsmbclient-dev.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,3 +0,0 @@
-usr/lib/libsmbclient.a
-usr/lib/libsmbclient.so
-usr/include/libsmbclient.h
Copied: trunk/samba/debian/libsmbclient-dev.install (from rev 3893, trunk/samba/debian/libsmbclient-dev.files)
===================================================================
--- trunk/samba/debian/libsmbclient-dev.install (rev 0)
+++ trunk/samba/debian/libsmbclient-dev.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,3 @@
+usr/lib/libsmbclient.a
+usr/lib/libsmbclient.so
+usr/include/libsmbclient.h
Deleted: trunk/samba/debian/libsmbclient.files
===================================================================
--- trunk/samba/debian/libsmbclient.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/libsmbclient.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,2 +0,0 @@
-usr/lib/libsmbclient.so.0
-usr/share/man/man7/libsmbclient.7
Copied: trunk/samba/debian/libsmbclient.install (from rev 3893, trunk/samba/debian/libsmbclient.files)
===================================================================
--- trunk/samba/debian/libsmbclient.install (rev 0)
+++ trunk/samba/debian/libsmbclient.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,2 @@
+usr/lib/libsmbclient.so.0
+usr/share/man/man7/libsmbclient.7
Deleted: trunk/samba/debian/libwbclient-dev.files
===================================================================
--- trunk/samba/debian/libwbclient-dev.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/libwbclient-dev.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,3 +0,0 @@
-usr/lib/libwbclient.so
-usr/include/wbclient.h
-usr/include/wbc_async.h
Copied: trunk/samba/debian/libwbclient-dev.install (from rev 3893, trunk/samba/debian/libwbclient-dev.files)
===================================================================
--- trunk/samba/debian/libwbclient-dev.install (rev 0)
+++ trunk/samba/debian/libwbclient-dev.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,3 @@
+usr/lib/libwbclient.so
+usr/include/wbclient.h
+usr/include/wbc_async.h
Deleted: trunk/samba/debian/libwbclient0.files
===================================================================
--- trunk/samba/debian/libwbclient0.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/libwbclient0.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1 +0,0 @@
-usr/lib/libwbclient.so.0
Copied: trunk/samba/debian/libwbclient0.install (from rev 3893, trunk/samba/debian/libwbclient0.files)
===================================================================
--- trunk/samba/debian/libwbclient0.install (rev 0)
+++ trunk/samba/debian/libwbclient0.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1 @@
+usr/lib/libwbclient.so.0
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/rules 2011-09-25 22:58:57 UTC (rev 3899)
@@ -177,7 +177,7 @@
mkdir -p $(DESTDIR)/etc/network/if-up.d
install -o root -g root debian/samba.if-up $(DESTDIR)/etc/network/if-up.d/samba
- dh_movefiles
+ dh_install
dh_installpam --name=samba
# Build architecture-independent files here.
@@ -191,7 +191,7 @@
# Ignore COPYING. Otherwise, an extra copy of the GPL licence
# in smbldap-tools example is included in samba-doc
dh_installexamples -Xsmbldap-tools-* -XCOPYING
- dh_installchangelogs
+ dh_installchangelogs -Xhistory
dh_link
dh_compress
dh_fixperms
@@ -216,8 +216,8 @@
DH_OPTIONS= dh_installinit -pwinbind
dh_installcron
dh_lintian
- dh_installchangelogs -Nlibpam-smbpass
- DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
+ dh_installchangelogs -Nlibpam-smbpass -Xhistory
+ DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG -Xhistory
DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common-bin
dh_link
Deleted: trunk/samba/debian/samba-common-bin.files
===================================================================
--- trunk/samba/debian/samba-common-bin.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/samba-common-bin.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,12 +0,0 @@
-usr/bin/net.samba3
-usr/bin/nmblookup.samba3
-usr/bin/smbpasswd
-usr/bin/testparm.samba3
-usr/share/man/man1/nmblookup.samba3.1
-usr/share/man/man1/testparm.samba3.1
-usr/share/man/man5/lmhosts.5
-usr/share/man/man5/smb.conf.5
-usr/share/man/man5/smbpasswd.5
-usr/share/man/man7/samba.7
-usr/share/man/man8/net.samba3.8
-usr/share/man/man8/smbpasswd.8
Copied: trunk/samba/debian/samba-common-bin.install (from rev 3893, trunk/samba/debian/samba-common-bin.files)
===================================================================
--- trunk/samba/debian/samba-common-bin.install (rev 0)
+++ trunk/samba/debian/samba-common-bin.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,12 @@
+usr/bin/net.samba3
+usr/bin/nmblookup.samba3
+usr/bin/smbpasswd
+usr/bin/testparm.samba3
+usr/share/man/man1/nmblookup.samba3.1
+usr/share/man/man1/testparm.samba3.1
+usr/share/man/man5/lmhosts.5
+usr/share/man/man5/smb.conf.5
+usr/share/man/man5/smbpasswd.5
+usr/share/man/man7/samba.7
+usr/share/man/man8/net.samba3.8
+usr/share/man/man8/smbpasswd.8
Deleted: trunk/samba/debian/samba-common.files
===================================================================
--- trunk/samba/debian/samba-common.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/samba-common.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,7 +0,0 @@
-etc/samba/
-etc/dhcp3/
-usr/share/samba/lowcase.dat
-usr/share/samba/panic-action
-usr/share/samba/smb.conf*
-usr/share/samba/upcase.dat
-usr/share/samba/valid.dat
Copied: trunk/samba/debian/samba-common.install (from rev 3896, trunk/samba/debian/samba-common.files)
===================================================================
--- trunk/samba/debian/samba-common.install (rev 0)
+++ trunk/samba/debian/samba-common.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,7 @@
+etc/samba/
+etc/dhcp3/
+usr/share/samba/lowcase.dat
+usr/share/samba/panic-action
+usr/share/samba/smb.conf*
+usr/share/samba/upcase.dat
+usr/share/samba/valid.dat
Deleted: trunk/samba/debian/samba-tools.files
===================================================================
--- trunk/samba/debian/samba-tools.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/samba-tools.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,11 +0,0 @@
-usr/bin/smbtorture
-usr/bin/msgtest
-usr/bin/masktest
-usr/bin/locktest
-usr/bin/locktest2
-usr/bin/nsstest
-usr/bin/vfstest
-usr/bin/pdbtest
-usr/bin/replacetort
-usr/bin/smbconftort
-
Copied: trunk/samba/debian/samba-tools.install (from rev 3893, trunk/samba/debian/samba-tools.files)
===================================================================
--- trunk/samba/debian/samba-tools.install (rev 0)
+++ trunk/samba/debian/samba-tools.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,10 @@
+usr/bin/smbtorture
+usr/bin/msgtest
+usr/bin/masktest
+usr/bin/locktest
+usr/bin/locktest2
+usr/bin/nsstest
+usr/bin/vfstest
+usr/bin/pdbtest
+usr/bin/replacetort
+usr/bin/smbconftort
Deleted: trunk/samba/debian/samba.files
===================================================================
--- trunk/samba/debian/samba.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/samba.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,18 +0,0 @@
-usr/bin/eventlogadm
-usr/bin/smbstatus.samba3
-usr/bin/smbcontrol
-usr/bin/profiles
-usr/bin/pdbedit
-usr/sbin/smbd
-usr/sbin/nmbd
-usr/sbin/mksmbpasswd
-usr/lib/samba/vfs
-usr/share/man/man1/smbcontrol.1
-usr/share/man/man1/profiles.1
-usr/share/man/man1/smbstatus.samba3.1
-usr/share/man/man8/nmbd.8
-usr/share/man/man8/pdbedit.8
-usr/share/man/man8/smbd.8
-usr/share/man/man8/mksmbpasswd.8
-usr/share/man/man8/eventlogadm.8
-etc/network/if-up.d/samba
Copied: trunk/samba/debian/samba.install (from rev 3893, trunk/samba/debian/samba.files)
===================================================================
--- trunk/samba/debian/samba.install (rev 0)
+++ trunk/samba/debian/samba.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,18 @@
+usr/bin/eventlogadm
+usr/bin/smbstatus.samba3
+usr/bin/smbcontrol
+usr/bin/profiles
+usr/bin/pdbedit
+usr/sbin/smbd
+usr/sbin/nmbd
+usr/sbin/mksmbpasswd
+usr/lib/samba/vfs
+usr/share/man/man1/smbcontrol.1
+usr/share/man/man1/profiles.1
+usr/share/man/man1/smbstatus.samba3.1
+usr/share/man/man8/nmbd.8
+usr/share/man/man8/pdbedit.8
+usr/share/man/man8/smbd.8
+usr/share/man/man8/mksmbpasswd.8
+usr/share/man/man8/eventlogadm.8
+etc/network/if-up.d/samba
Deleted: trunk/samba/debian/smbclient.files
===================================================================
--- trunk/samba/debian/smbclient.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/smbclient.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,19 +0,0 @@
-usr/bin/findsmb
-usr/bin/smbclient
-usr/bin/smbget
-usr/bin/smbtar
-usr/bin/rpcclient
-usr/bin/smbspool
-usr/bin/smbtree
-usr/bin/smbcacls
-usr/bin/smbcquotas
-usr/share/man/man1/findsmb.1
-usr/share/man/man1/smbclient.1
-usr/share/man/man1/smbget.1
-usr/share/man/man1/smbtar.1
-usr/share/man/man1/rpcclient.1
-usr/share/man/man5/smbgetrc.5
-usr/share/man/man8/smbspool.8
-usr/share/man/man1/smbcacls.1
-usr/share/man/man1/smbcquotas.1
-usr/share/man/man1/smbtree.1
Copied: trunk/samba/debian/smbclient.install (from rev 3895, trunk/samba/debian/smbclient.files)
===================================================================
--- trunk/samba/debian/smbclient.install (rev 0)
+++ trunk/samba/debian/smbclient.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,19 @@
+usr/bin/findsmb
+usr/bin/smbclient
+usr/bin/smbget
+usr/bin/smbtar
+usr/bin/rpcclient
+usr/bin/smbspool
+usr/bin/smbtree
+usr/bin/smbcacls
+usr/bin/smbcquotas
+usr/share/man/man1/findsmb.1
+usr/share/man/man1/smbclient.1
+usr/share/man/man1/smbget.1
+usr/share/man/man1/smbtar.1
+usr/share/man/man1/rpcclient.1
+usr/share/man/man5/smbgetrc.5
+usr/share/man/man8/smbspool.8
+usr/share/man/man1/smbcacls.1
+usr/share/man/man1/smbcquotas.1
+usr/share/man/man1/smbtree.1
Deleted: trunk/samba/debian/swat.files
===================================================================
--- trunk/samba/debian/swat.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/swat.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,7 +0,0 @@
-usr/sbin/swat
-usr/share/samba/*.msg
-usr/share/samba/swat/help/welcome.html
-usr/share/samba/swat/images
-usr/share/samba/swat/include
-usr/share/samba/swat/lang
-usr/share/man/man8/swat.8
Copied: trunk/samba/debian/swat.install (from rev 3893, trunk/samba/debian/swat.files)
===================================================================
--- trunk/samba/debian/swat.install (rev 0)
+++ trunk/samba/debian/swat.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,7 @@
+usr/sbin/swat
+usr/share/samba/*.msg
+usr/share/samba/swat/help/welcome.html
+usr/share/samba/swat/images
+usr/share/samba/swat/include
+usr/share/samba/swat/lang
+usr/share/man/man8/swat.8
Deleted: trunk/samba/debian/winbind.files
===================================================================
--- trunk/samba/debian/winbind.files 2011-09-25 22:37:37 UTC (rev 3898)
+++ trunk/samba/debian/winbind.files 2011-09-25 22:58:57 UTC (rev 3899)
@@ -1,25 +0,0 @@
-usr/sbin/winbindd
-usr/bin/wbinfo
-usr/bin/ntlm_auth
-usr/lib/samba/idmap/rid.so
-usr/lib/samba/idmap/ad.so
-usr/lib/samba/idmap/adex.so
-usr/lib/samba/idmap/hash.so
-usr/lib/samba/idmap/ldap.so
-usr/lib/samba/idmap/tdb2.so
-usr/share/man/man1/wbinfo.1
-usr/share/man/man1/ntlm_auth.1
-usr/share/man/man8/pam_winbind.8
-usr/share/man/man8/winbindd.8
-usr/share/man/man8/idmap_ad.8
-usr/share/man/man8/idmap_ldap.8
-usr/share/man/man8/idmap_nss.8
-usr/share/man/man8/idmap_rid.8
-usr/share/man/man8/idmap_tdb.8
-usr/share/man/man8/idmap_tdb2.8
-usr/share/man/man8/idmap_adex.8
-usr/share/man/man8/idmap_hash.8
-lib/security/pam_winbind.so
-usr/share/pam-configs/winbind
-lib/libnss_winbind.so.2
-lib/libnss_wins.so.2
Copied: trunk/samba/debian/winbind.install (from rev 3893, trunk/samba/debian/winbind.files)
===================================================================
--- trunk/samba/debian/winbind.install (rev 0)
+++ trunk/samba/debian/winbind.install 2011-09-25 22:58:57 UTC (rev 3899)
@@ -0,0 +1,25 @@
+usr/sbin/winbindd
+usr/bin/wbinfo
+usr/bin/ntlm_auth
+usr/lib/samba/idmap/rid.so
+usr/lib/samba/idmap/ad.so
+usr/lib/samba/idmap/adex.so
+usr/lib/samba/idmap/hash.so
+usr/lib/samba/idmap/ldap.so
+usr/lib/samba/idmap/tdb2.so
+usr/share/man/man1/wbinfo.1
+usr/share/man/man1/ntlm_auth.1
+usr/share/man/man8/pam_winbind.8
+usr/share/man/man8/winbindd.8
+usr/share/man/man8/idmap_ad.8
+usr/share/man/man8/idmap_ldap.8
+usr/share/man/man8/idmap_nss.8
+usr/share/man/man8/idmap_rid.8
+usr/share/man/man8/idmap_tdb.8
+usr/share/man/man8/idmap_tdb2.8
+usr/share/man/man8/idmap_adex.8
+usr/share/man/man8/idmap_hash.8
+lib/security/pam_winbind.so
+usr/share/pam-configs/winbind
+lib/libnss_winbind.so.2
+lib/libnss_wins.so.2
More information about the Pkg-samba-maint
mailing list