move local ignores to .bzrignore and resync .cvsignore files with upstream

author: Colin Watson <cjwatson@debian.org> 2009-12-21 11:32:08 +0000
committer: Colin Watson <cjwatson@debian.org> 2009-12-21 11:32:08 +0000
commit: 4aebba208e59bffdb154f40acdc04c42c644a60e (patch)
tree: 2d2f9844b8a6d27e0833a63ac5d84ed5581f3e89
parent: feee1ced8f3dcd5fe2659753d0a30759b1d2d5cb (diff)
6 files changed, 54 insertions, 22 deletions
diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 000000000..fd133fec7
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,50 @@
+./*.out
+./Makefile
+./autom4te.cache
+./build-deb
+./build-deb-stamp
+./build-udeb
+./build-udeb-stamp
+./buildit.sh
+./buildpkg.sh
+./config.cache
+./config.h
+./config.log
+./config.status
+./openssh.xml
+./opensshd.init
+./scp
+./sftp
+./sftp-server
+./ssh
+./ssh-add
+./ssh-agent
+./ssh-keygen
+./ssh-keyscan
+./ssh-keysign
+./ssh-rand-helper
+./ssh_prng_cmds
+./sshd
+./stamp-h.in
+./survey
+./survey.sh
+contrib/gnome-ssh-askpass1
+contrib/gnome-ssh-askpass2
+openbsd-compat/Makefile
+scard/Makefile
+debian/*.debhelper*
+debian/*substvars
+debian/copyright
+debian/files
+debian/openssh-client
+debian/openssh-client-udeb
+debian/openssh-server
+debian/openssh-server-udeb
+debian/ssh
+debian/ssh-askpass-gnome
+debian/ssh-krb5
+debian/tests/key1
+debian/tests/key1.pub
+debian/tests/key2
+debian/tests/key2.pub
+debian/tmp
diff --git a/.cvsignore b/.cvsignore
index 4244eeb3b..b893c972d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,16 +1,15 @@
+*.0
 *.out
 Makefile
 autom4te.cache
-build-deb
-build-deb-stamp
-build-udeb
-build-udeb-stamp
 buildit.sh
 buildpkg.sh
 config.cache
 config.h
+config.h.in
 config.log
 config.status
+configure
 openssh.xml
 opensshd.init
 scp
diff --git a/contrib/.cvsignore b/contrib/.cvsignore
deleted file mode 100644
index 944ad9041..000000000
--- a/contrib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-ssh-askpass1
-gnome-ssh-askpass2
diff --git a/debian/.cvsignore b/debian/.cvsignore
deleted file mode 100644
index c64e8f51d..000000000
--- a/debian/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.debhelper*
-*substvars
-copyright
-files
-openssh-client
-openssh-client-udeb
-openssh-server
-openssh-server-udeb
-ssh
-ssh-askpass-gnome
-ssh-krb5
-tmp
diff --git a/debian/tests/.cvsignore b/debian/tests/.cvsignore
deleted file mode 100644
index d0383c1d3..000000000
--- a/debian/tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-key1
-key1.pub
-key2
-key2.pub
diff --git a/scard/.cvsignore b/scard/.cvsignore
index f3c7a7c5d..5349d34ae 100644
--- a/scard/.cvsignore
+++ b/scard/.cvsignore
@@ -1 +1,2 @@
 Makefile
+Ssh.bin
author	Colin Watson <cjwatson@debian.org>	2009-12-21 11:32:08 +0000
committer	Colin Watson <cjwatson@debian.org>	2009-12-21 11:32:08 +0000
commit	4aebba208e59bffdb154f40acdc04c42c644a60e (patch)
tree	2d2f9844b8a6d27e0833a63ac5d84ed5581f3e89
parent	feee1ced8f3dcd5fe2659753d0a30759b1d2d5cb (diff)

diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 000000000..fd133fec7 --- /dev/null +++ b/.bzrignore
@@ -0,0 +1,50 @@
		1	./*.out
		2	./Makefile
		3	./autom4te.cache
		4	./build-deb
		5	./build-deb-stamp
		6	./build-udeb
		7	./build-udeb-stamp
		8	./buildit.sh
		9	./buildpkg.sh
		10	./config.cache
		11	./config.h
		12	./config.log
		13	./config.status
		14	./openssh.xml
		15	./opensshd.init
		16	./scp
		17	./sftp
		18	./sftp-server
		19	./ssh
		20	./ssh-add
		21	./ssh-agent
		22	./ssh-keygen
		23	./ssh-keyscan
		24	./ssh-keysign
		25	./ssh-rand-helper
		26	./ssh_prng_cmds
		27	./sshd
		28	./stamp-h.in
		29	./survey
		30	./survey.sh
		31	contrib/gnome-ssh-askpass1
		32	contrib/gnome-ssh-askpass2
		33	openbsd-compat/Makefile
		34	scard/Makefile
		35	debian/.debhelper
		36	debian/*substvars
		37	debian/copyright
		38	debian/files
		39	debian/openssh-client
		40	debian/openssh-client-udeb
		41	debian/openssh-server
		42	debian/openssh-server-udeb
		43	debian/ssh
		44	debian/ssh-askpass-gnome
		45	debian/ssh-krb5
		46	debian/tests/key1
		47	debian/tests/key1.pub
		48	debian/tests/key2
		49	debian/tests/key2.pub
		50	debian/tmp


diff --git a/.cvsignore b/.cvsignore index 4244eeb3b..b893c972d 100644 --- a/.cvsignore +++ b/.cvsignore
@@ -1,16 +1,15 @@
		1	*.0
1	*.out	2	*.out
2	Makefile	3	Makefile
3	autom4te.cache	4	autom4te.cache
4	build-deb
5	build-deb-stamp
6	build-udeb
7	build-udeb-stamp
8	buildit.sh	5	buildit.sh
9	buildpkg.sh	6	buildpkg.sh
10	config.cache	7	config.cache
11	config.h	8	config.h
		9	config.h.in
12	config.log	10	config.log
13	config.status	11	config.status
		12	configure
14	openssh.xml	13	openssh.xml
15	opensshd.init	14	opensshd.init
16	scp	15	scp


diff --git a/contrib/.cvsignore b/contrib/.cvsignore deleted file mode 100644 index 944ad9041..000000000 --- a/contrib/.cvsignore +++ /dev/null
@@ -1,2 +0,0 @@
1	gnome-ssh-askpass1
2	gnome-ssh-askpass2


diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index c64e8f51d..000000000 --- a/debian/.cvsignore +++ /dev/null
@@ -1,12 +0,0 @@
1	.debhelper
2	*substvars
3	copyright
4	files
5	openssh-client
6	openssh-client-udeb
7	openssh-server
8	openssh-server-udeb
9	ssh
10	ssh-askpass-gnome
11	ssh-krb5
12	tmp


diff --git a/debian/tests/.cvsignore b/debian/tests/.cvsignore deleted file mode 100644 index d0383c1d3..000000000 --- a/debian/tests/.cvsignore +++ /dev/null
@@ -1,4 +0,0 @@
1	key1
2	key1.pub
3	key2
4	key2.pub


diff --git a/scard/.cvsignore b/scard/.cvsignore index f3c7a7c5d..5349d34ae 100644 --- a/scard/.cvsignore +++ b/scard/.cvsignore
@@ -1 +1,2 @@
1	Makefile	1	Makefile
		2	Ssh.bin