From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 6 May 2010 14:15:53 +0000 (+0200)
Subject: merge with debian-experimental-ma
X-Git-Tag: 0.8.0~9^2~46^2~14
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d1aa91622b3e0f7653889cab205e4c5c622162f4?ds=inline

merge with debian-experimental-ma
---

d1aa91622b3e0f7653889cab205e4c5c622162f4
diff --cc cmdline/apt-get.cc
index de8c7aeaf,03239dabe..00da0855f
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1932,10 -1936,9 +1936,10 @@@ bool DoInstall(CommandLine &CmdL
  	    {
  	       /* Skip if package is  installed already, or is about to be */
  	       string target = Start.TargetPkg().FullName(true) + " ";
 -	       
 -	       if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install
 -		   || Cache[Start.TargetPkg()].Install())
 +	       pkgCache::PkgIterator const TarPkg = Start.TargetPkg();
 +	       if (TarPkg->SelectedState == pkgCache::State::Install ||
- 	           TarPkg->SelectedState == pkgCache::State::Hold ||
++		   TarPkg->SelectedState == pkgCache::State::Hold ||
 +		   Cache[Start.TargetPkg()].Install())
  	       {
  		  foundInstalledInOrGroup=true;
  		  break;
diff --cc debian/changelog
index 144d307fa,004a890e1..43f76a18e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,4 +1,26 @@@
- apt (0.7.26~exp4) UNRELEASED; urgency=low
++apt (0.7.26~exp5) UNRELEASED; urgency=low
 +
-   [ Michael Vogt ]
-   * [ Abi break ] apt-pkg/acquire-item.{cc,h}:
-     - add "IsIndexFile" to constructor of pkgAcqFile so that it sends
-       the right cache control headers
-   * apt-pkg/depcache.cc:
-     - fix incorrect std::cout usage for debug output
-   * test/libapt/getlanguages_test.cc:
-     - Add test for Esperanto that has nocounty associated with them
-       (LP: #560956)
++  [ David Kalnischkies ]
++  * cmdline/apt-get.cc:
++    - rerun dpkg-source in source if --fix-broken is given (Closes: #576752)
++    - don't suggest held packages as they are installed (Closes: #578135)
++  * cmdline/apt-cache.cc:
++    - use GroupCount for package names in stats and add a package struct line
++  * methods/rred.cc:
++    - use the patchfile modification time instead of the one from the
++      "old" file - thanks to Philipp Weis for noticing! (Closes: #571541)
++  * debian/rules:
++    - remove targets refering to CVS or arch as they are useless
++
++  [ Jari Aalto ]
++  * debian/rules:
++    - spell out some less known options to reduce manpage consulation-rate
++    - Use POSIX command substitution: $(<command sequence>)
++    - Remove EOL whitespace (Closes: #577804)
++
++ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 06 May 2010 16:10:39 +0200
++
+ apt (0.7.26~exp4) experimental; urgency=low
  
    [ David Kalnischkies ]
    * apt-pkg/depcache.cc:
diff --cc debian/rules
index bb2cc34c3,f901ea749..cb4622779
--- a/debian/rules
+++ b/debian/rules
@@@ -139,15 -141,18 +139,16 @@@ libapt-pkg-doc: build-doc debian/shlibs
  	dh_installdirs -p$@
  #
  # libapt-pkg-doc install
 -#	
 -	dh_installdocs -p$@ $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
 -                            $(BLD)/docs/files* $(BLD)/docs/method* \
 -			    doc/libapt-pkg2_to_3.txt doc/style.txt \
 +#
 +	dh_installdocs -p$@ $(BLD)/docs/design* \
 +			    $(BLD)/docs/dpkg-tech* \
 +			    $(BLD)/docs/files* \
 +			    $(BLD)/docs/method* \
 +			    doc/libapt-pkg2_to_3.txt \
- 			    doc/style.txt
++			    doc/style.txt \
+ 			    $(BLD)/doc/doxygen/html
  	dh_installexamples -p$@
 -#	dh_installmenu -p$@
 -#	dh_installinit -p$@
 -#	dh_installcron -p$@
 -#	dh_installman -p$@
  
 -#	dh_undocumented -p$@
  	dh_installchangelogs -p$@
  	dh_strip -p$@
  	dh_compress -p$@