Merge lp://qastaging/~ubuntu-branches/ubuntu/precise/wget/precise-201110201656 into lp://qastaging/ubuntu/precise/wget
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/precise/wget/precise-201110201656 |
| Merge into: | lp://qastaging/ubuntu/precise/wget |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/precise/wget/precise-201110201656 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/wget reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/wget/precise-201110201656. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 25. By Steve Langasek
-
releasing version 1.13-1ubuntu1
- 24. By Steve Langasek
-
Add a second build pass for the udeb, so we can build without libidn.
- 23. By Steve Langasek
-
Pass --with-ssl=openssl; we don't want to use gnutls, there's no udeb for
it. - 22. By Steve Langasek
-
* Merge from Debian unstable, remaining changes:
- Add wget-udeb to ship wget.gnu as alternative to busybox wget
implementation.
- Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
* Dropped changes, superseded in Debian:
- Keep build dependencies in main:
+ debian/control: remove info2man build-dep
+ debian/patches/ series: disable wget-infopod_ generated_ manpage
- Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
can depend on it.
* new upstream release 1.13 from 2011-08-09
- updated wget-doc-remove- usr-local- in-wget. texi,
wget-fr.po-spelling- correction,
- removed wget-de.po-remove- double- quote-signs (latest de.po),
CVE-2010-2252 (included upstream), wget-zh_CN.po-translati on-correction,
fix-paramter- spelling- error-in- wget.texi, refresh-pofiles
- disabled disable-SSLv2 for the first upload
see https://savannah. gnu.org/ bugs/?33840
- includes latest po files. closes: Bug#607198
- bugs fixed with this release by upstream:
-- IDN support: wget www.köln.de works:) closes: Bug#542145
-- wildcard documentation of -X
closes: Bug#215128
-- wget -O - $URL says `-' saved but there is no file -
closes: Bug#353326
-- 'wget -c -N' ignores timestamps
closes: Bug#402001
-- missing a check for Subject Alternative Name (TLS cert.)
closes: Bug#409938
-- wget segfaults when server returns empty HTTP response code
closes: Bug#563872
-- wget: -A/-R vs. -O
closes: Bug#565942
-- Unterminated C string in http_atotm()
closes: Bug#581817
-- don't use PATH_MAX (FTBFS on hurd)
closes: Bug#595538
-- info page points to not documented --cookies option
closes: Bug#597468
-- SIGPIPE signal: wget over ssh orphans itself on ctrl+c
closes: Bug#598731
-- wget --backup-converted does not work
closes: Bug#624675
-- --adjust-extension renames .htm files
closes: Bug#626438
-- wget: Invalid russian translation
closes: Bug#502218
-- wget: shows only first 3 IP addresses of hostname
closes: Bug#612450
* debian/control correct spelling in description. closes: Bug#635241
* debian/control replace libssl-dev by libgnutls-dev in build dependency
* minor update on patch CVE-2010-2252 to mention former option
name --use-server-file-name. closes: #602008
* debian/control minor name change Noèl -> Noël ;)
* acknowledge NMUs. Thanks for your work Thorsten and Filippo
closes: #622032 #614373
* updated Standards-Version: to 3.9.2 without changes
* fixed lintian warning:
- debian-rules-missing- recommended- target
* debian/control add Multi-Arch: foreign
closes: #614203
* removing wget-infopod_generated_ manpage to get the old/upstream
provided manpage and no the infopage as manpage. See 1.11.4-4
where it were changed. This will return some errors (incomplete
sentences, some missing parts) which are caused by texi2pod.
closes: #633702 #627468 #589993 #545091
* debian/control added libidn11-dev Build-Dep to get IDN support
closes: #536692 #542145
* debian/control changed FTP and HTTP to uppercase in the description
closes: #596358
* exit status is documented in the manpage. closes #179710
* --follow-ftp example in manpage made more accurate. closes #512578
