1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
|
Description: Upstream changes introduced in version 3.1.0-2
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
ldap-account-manager (3.1.0-2) testing-proposed-updates; urgency=high
.
* updated to Debian policy 3.9.1
* Backported fix to be compatible with php-fpdf again from 3.2.0-1
* Backported some fixes in postinst/rules from 3.2.0-1
* Fix "Package unremovable"
Removed "set -e" for debconf calls (Closes: #601706)
.
The person named in the Author field signed this changelog entry.
Author: Roland Gruber <post@rolandgruber.de>
Bug-Debian: http://bugs.debian.org/601706
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- ldap-account-manager-3.1.0.orig/lib/ufpdf.php
+++ ldap-account-manager-3.1.0/lib/ufpdf.php
@@ -130,7 +130,7 @@ function Cell($w,$h=0,$txt='',$border=0,
$this->ws=0;
$this->_out('0 Tw');
}
- $this->AddPage($this->CurOrientation);
+ $this->AddPage($this->CurOrientation, $this->CurPageFormat);
$this->x=$x;
if($ws>0)
{
@@ -532,13 +532,13 @@ function _putpages()
}
if($this->DefOrientation=='P')
{
- $wPt=$this->fwPt;
- $hPt=$this->fhPt;
+ $wPt=$this->DefPageFormat[0]*$this->k;
+ $hPt=$this->DefPageFormat[1]*$this->k;
}
else
{
- $wPt=$this->fhPt;
- $hPt=$this->fwPt;
+ $wPt=$this->DefPageFormat[1]*$this->k;
+ $hPt=$this->DefPageFormat[0]*$this->k;
}
$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
for($n=1;$n<=$nb;$n++)
@@ -547,8 +547,8 @@ function _putpages()
$this->_newobj();
$this->_out('<</Type /Page');
$this->_out('/Parent 1 0 R');
- if(isset($this->OrientationChanges[$n]))
- $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt));
+ if(isset($this->PageSizes[$n]))
+ $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
$this->_out('/Resources 2 0 R');
if(isset($this->PageLinks[$n]))
{
@@ -563,8 +563,8 @@ function _putpages()
else
{
$l=$this->links[$pl[4]];
- $h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
- $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k);
+ $h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
+ $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
}
}
$this->_out($annots.']');
|