diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
| commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
| tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /contrib/caldera/openssh.spec | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'contrib/caldera/openssh.spec')
| -rw-r--r-- | contrib/caldera/openssh.spec | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 9fd07953a..196bd7904 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #old cvs stuff. please update before use. may be deprecated. | 17 | #old cvs stuff. please update before use. may be deprecated. |
| 18 | %define use_stable 1 | 18 | %define use_stable 1 |
| 19 | %define version 6.1p1 | 19 | %define version 6.2p1 |
| 20 | %if %{use_stable} | 20 | %if %{use_stable} |
| 21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
| 22 | %define release 1 | 22 | %define release 1 |
| @@ -363,4 +363,4 @@ fi | |||
| 363 | * Mon Jan 01 1998 ... | 363 | * Mon Jan 01 1998 ... |
| 364 | Template Version: 1.31 | 364 | Template Version: 1.31 |
| 365 | 365 | ||
| 366 | $Id: openssh.spec,v 1.78 2012/08/22 11:57:15 djm Exp $ | 366 | $Id: openssh.spec,v 1.79 2013/02/26 23:48:20 djm Exp $ |