summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore51
-rw-r--r--.gitignore49
-rw-r--r--debian/changelog6
-rw-r--r--debian/control4
4 files changed, 57 insertions, 53 deletions
diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 0f130a704..000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,51 +0,0 @@
1./.pc
2./*.out
3./Makefile
4./autom4te.cache
5./build-deb
6./build-deb-stamp
7./build-udeb
8./build-udeb-stamp
9./buildit.sh
10./buildpkg.sh
11./config.cache
12./config.h
13./config.log
14./config.status
15./openssh.xml
16./opensshd.init
17./scp
18./sftp
19./sftp-server
20./ssh
21./ssh-add
22./ssh-agent
23./ssh-keygen
24./ssh-keyscan
25./ssh-keysign
26./ssh-rand-helper
27./ssh_prng_cmds
28./sshd
29./stamp-h.in
30./survey
31./survey.sh
32contrib/gnome-ssh-askpass1
33contrib/gnome-ssh-askpass2
34openbsd-compat/Makefile
35scard/Makefile
36debian/*.debhelper*
37debian/*substvars
38debian/copyright
39debian/files
40debian/openssh-client
41debian/openssh-client-udeb
42debian/openssh-server
43debian/openssh-server-udeb
44debian/ssh
45debian/ssh-askpass-gnome
46debian/ssh-krb5
47debian/tests/key1
48debian/tests/key1.pub
49debian/tests/key2
50debian/tests/key2.pub
51debian/tmp
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..2c0b0d839
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,49 @@
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
31contrib/gnome-ssh-askpass1
32contrib/gnome-ssh-askpass2
33openbsd-compat/Makefile
34debian/*.debhelper*
35debian/*substvars
36debian/copyright
37debian/files
38debian/openssh-client
39debian/openssh-client-udeb
40debian/openssh-server
41debian/openssh-server-udeb
42debian/ssh
43debian/ssh-askpass-gnome
44debian/ssh-krb5
45debian/tests/key1
46debian/tests/key1.pub
47debian/tests/key2
48debian/tests/key2.pub
49debian/tmp
diff --git a/debian/changelog b/debian/changelog
index 949d4a42f..61ff5147a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openssh (1:6.4p1-3) UNRELEASED; urgency=medium
2
3 * Switch to git; adjust Vcs-* fields.
4
5 -- Colin Watson <cjwatson@debian.org> Sun, 09 Feb 2014 15:52:14 +0000
6
1openssh (1:6.4p1-2) unstable; urgency=high 7openssh (1:6.4p1-2) unstable; urgency=high
2 8
3 * Increase ServerKeyBits value in package-generated sshd_config to 1024 9 * Increase ServerKeyBits value in package-generated sshd_config to 1024
diff --git a/debian/control b/debian/control
index 82fdde9e6..308b7f4ef 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev
6Standards-Version: 3.8.4 6Standards-Version: 3.8.4
7Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org> 7Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
8Homepage: http://www.openssh.org/ 8Homepage: http://www.openssh.org/
9Vcs-Bzr: http://anonscm.debian.org/bzr/pkg-ssh/openssh/trunk 9Vcs-Git: git://anonscm.debian.org/pkg-ssh/openssh.git
10Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-ssh/openssh/trunk 10Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git
11 11
12Package: openssh-client 12Package: openssh-client
13Architecture: any 13Architecture: any