/[pkg-kde]/branches/kde-3.4.0/packages/kdelibs/debian/changelog
ViewVC logotype

Log of /branches/kde-3.4.0/packages/kdelibs/debian/changelog

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 6385)

Revision 1466 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 16 17:59:15 2005 UTC (7 years, 9 months ago) by adeodato
File length: 69030 byte(s)
Diff to previous 1464 , to selected 940
Add blank line.

Revision 1464 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 16 15:25:18 2005 UTC (7 years, 9 months ago) by chrsmrtn-guest
File length: 69029 byte(s)
Diff to previous 1463 , to selected 940
New branch.diff for kdelibs. Sync kdelibs4-dev' deps
with kdelibs's build-deps, and get the changelog
ready for release.

Revision 1463 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 16 14:57:49 2005 UTC (7 years, 9 months ago) by adeodato
File length: 69005 byte(s)
Diff to previous 1461 , to selected 940
Closing the KXMLGUIClient bugs.

Revision 1461 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 16 14:04:14 2005 UTC (7 years, 9 months ago) by adeodato
File length: 68807 byte(s)
Diff to previous 1412 , to selected 940
Close a bug.

Revision 1412 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 5 23:02:58 2005 UTC (7 years, 9 months ago) by chrsmrtn-guest
File length: 68728 byte(s)
Diff to previous 1388 , to selected 940
Tighten libtiff4-dev build-deps. Also sync kdelibs4-dev's deps with the kdelibs source build-deps.

Revision 1388 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 28 21:07:32 2005 UTC (7 years, 9 months ago) by adeodato
File length: 68713 byte(s)
Diff to previous 1381 , to selected 940
Tighten build-dependencies on libfam-dev and libopenexr-dev.

Revision 1381 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 26 20:48:04 2005 UTC (7 years, 9 months ago) by adeodato
File length: 68685 byte(s)
Diff to previous 1372 , to selected 940
Remove obsolete conflicts/replaces relationships against
packages/versions not present in Sarge.

Revision 1372 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jul 26 20:14:28 2005 UTC (7 years, 9 months ago) by chrsmrtn-guest
File length: 68545 byte(s)
Diff to previous 1250 , to selected 940
Commit kdelibs transition changes. kdelibs4 becomes kdelibs4c2, build-depends are tightened, etc.
shlibs are bumped.

Revision 1250 - (view) (download) (annotate) - [select for diffs]
Modified Wed Jul 6 04:04:32 2005 UTC (7 years, 10 months ago) by chrsmrtn-guest
File length: 68347 byte(s)
Diff to previous 1191 , to selected 940
Merge 3.3.2-7 changes into 3.4.x.

Revision 1191 - (view) (download) (annotate) - [select for diffs]
Modified Mon Jun 6 20:49:42 2005 UTC (7 years, 11 months ago) by chrsmrtn-guest
File length: 67484 byte(s)
Diff to previous 1173 , to selected 940
Tighten kdelibs4's kdelibs-data dependency.

Revision 1173 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 31 19:49:57 2005 UTC (7 years, 11 months ago) by chrsmrtn-guest
File length: 67200 byte(s)
Diff to previous 1107 , to selected 940
Bump changelog versions, dates, and set disto to experimental.

Revision 1107 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 24 13:49:34 2005 UTC (8 years ago) by madcoder-guest
File length: 67198 byte(s)
Diff to previous 1097 , to selected 940
kdelibs 3.4.1 : upgrade patches + buildprep

Revision 1097 - (view) (download) (annotate) - [select for diffs]
Modified Mon May 23 13:15:48 2005 UTC (8 years ago) by chrsmrtn-guest
File length: 67029 byte(s)
Diff to previous 1093 , to selected 940
Add kdelibs changelog entries from trunk to the 3.4.0 branch.

Revision 1093 - (view) (download) (annotate) - [select for diffs]
Modified Sun May 22 16:44:36 2005 UTC (8 years ago) by dato-guest
File length: 65930 byte(s)
Diff to previous 1067 , to selected 940
Change the distribution of the 3.4.0 packages from experimental to
alioth, as agreed.

Revision 1067 - (view) (download) (annotate) - [select for diffs]
Modified Sat May 14 17:03:02 2005 UTC (8 years ago) by chrsmrtn-guest
File length: 65936 byte(s)
Diff to previous 1063 , to selected 940
Bump versions of packages affected by the applications.menu/applications-merged move.

Revision 1063 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 13 23:05:00 2005 UTC (8 years ago) by chrsmrtn-guest
File length: 65936 byte(s)
Diff to previous 1056 , to selected 940
Add changelog entry for the new Konq string.

Also fix up the default font patch - now patch Konq's default fonts
as well.

Revision 1056 - (view) (download) (annotate) - [select for diffs]
Modified Sun May 8 14:54:57 2005 UTC (8 years ago) by chrsmrtn-guest
File length: 65860 byte(s)
Diff to previous 1047 , to selected 940
Move applications.menu to kde-applications.menu, and applications-merged
becomes kde-applications-merged. Fixes the GNOME conflict.

Revision 1047 - (view) (download) (annotate) - [select for diffs]
Modified Wed May 4 13:33:37 2005 UTC (8 years ago) by chrsmrtn-guest
File length: 65727 byte(s)
Diff to previous 1013 , to selected 940
Branch update containing important updates. New packages will follow.

Revision 1013 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 21 17:34:16 2005 UTC (8 years, 1 month ago) by chrsmrtn-guest
File length: 65727 byte(s)
Diff to previous 1006 , to selected 940
Let's see if this breaks anything... weirdness abounds.

Revision 1006 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 19 17:07:11 2005 UTC (8 years, 1 month ago) by chrsmrtn-guest
File length: 65546 byte(s)
Diff to previous 977 , to selected 940
Branch update, with packages about to be uploaded to alioth.

Revision 977 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 6 22:56:40 2005 UTC (8 years, 1 month ago) by chrsmrtn-guest
File length: 65518 byte(s)
Diff to previous 971 , to selected 940
Branch pull, and the kdelibs half of a font patch I've been brewing...

Revision 971 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 5 14:16:28 2005 UTC (8 years, 1 month ago) by chrsmrtn-guest
File length: 65518 byte(s)
Diff to previous 940
Tighten build-deps for kdelibs.

Revision 940 - (view) (download) (annotate) - [selected]
Modified Tue Mar 29 21:37:30 2005 UTC (8 years, 1 month ago) by chrsmrtn-guest
File length: 65454 byte(s)
Diff to previous 846
Woops.

Revision 846 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 18 17:25:07 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 65549 byte(s)
Diff to previous 843 , to selected 940
Merge entry for 3.3.2-4.

Revision 843 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 18 17:06:29 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 64031 byte(s)
Diff to previous 842 , to selected 940
Bump version and date.

Revision 842 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 18 16:57:02 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 64031 byte(s)
Diff to previous 797 , to selected 940
kdelibs:

  * Added new package kdelibs4-dbg, with separate debugging symbols. Added
    Build-Dependency on binutils (>= 2.14.90.0.7) as per the dh_strip man
    page. (Closes: #257588).

  * Now that graphviz is in main, add it to Build-Depends-Indep together with
    gsfonts-x11 to generate diagrams in the API documentation.


Revision 797 - (view) (download) (annotate) - [select for diffs]
Modified Sun Mar 13 15:53:13 2005 UTC (8 years, 2 months ago) by chrsmrtn-guest
File length: 63710 byte(s)
Diff to previous 786 , to selected 940
changelog for dato's patch.

Revision 786 - (view) (download) (annotate) - [select for diffs]
Modified Sat Mar 12 04:56:06 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 63480 byte(s)
Diff to previous 651 , to selected 940
Close FTBFS on amd64/gcc-4.0 in changelog.

Revision 651 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 4 19:45:34 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 63361 byte(s)
Diff to previous 640 , to selected 940
give the changelog a date.

Revision 640 - (view) (download) (annotate) - [select for diffs]
Modified Fri Mar 4 18:38:34 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 63334 byte(s)
Diff to previous 569 , to selected 940
Changelog for kdelibs 3.4.0.

Revision 569 - (view) (download) (annotate) - [select for diffs]
Modified Thu Mar 3 00:12:51 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 63518 byte(s)
Diff to previous 567 , to selected 940
Make whitespace equal in branches/3.4 and trunk, so that we don't have
problems later when merging.

Revision 567 - (view) (download) (annotate) - [select for diffs]
Modified Wed Mar 2 21:41:15 2005 UTC (8 years, 2 months ago) by chrsmrtn-guest
File length: 63515 byte(s)
Diff to previous 538 , to selected 940
Removed xlibmesa-glu-dev from build-deps.

Changed "replaces x.3.91" to x.3.99 so all pre 3.4.0 stuff is covered.

kdelibs4-dev (more closely) depends on what the whole package build-depends on.

Preinst script cleanups.

Sync changelog with 3.3 branch uploads.

DEB_SHLIBDEPS_INCLUDE := debian/kdelibs-bin/usr/lib shouldn't be needed since nothing shared there.

Fiddled with the distribution of READMEs and other docs throughout the packages.


Revision 538 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 28 02:41:10 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 62630 byte(s)
Diff to previous 536 , to selected 940
cdbs/kde.mk:
  - Use escaped variables in the definitions of kde_htmldir and
    the like instead of absolute paths, so that /usr/bin/kde-config doesn't
    output them expanded even when --expandvars is not used. (Closes: #287822)

Revision 536 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 27 21:53:14 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 62241 byte(s)
Diff to previous 477 , to selected 940
The kdelibs changelog.

Revision 477 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 25 01:27:34 2005 UTC (8 years, 2 months ago) by dato-guest
File length: 61897 byte(s)
Diff to previous 465 , to selected 940
Created branch dir for 3.4.

Revision 465 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 13 04:06:30 2005 UTC (8 years, 3 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61897 byte(s)
Diff to previous 464 , to selected 940
patches/17_XMLHttpRequest_POST_fix.diff:
  * Include patch from CVS to fix XMLHttpRequest POST being broken in KHTML
    due to a blank line in headers. (Closes: #292765)


Revision 464 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 13 03:59:03 2005 UTC (8 years, 3 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61766 byte(s)
Diff to previous 460 , to selected 940
Added patches/01_kdelibs_branch_2005-02-12.diff.uu.
Fix changelog date for previous entry.

Revision 460 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 12 16:18:32 2005 UTC (8 years, 3 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61752 byte(s)
Diff to previous 459 , to selected 940
OK, old oo.org + new-KDE should work - nothing
spectacular changed in the .desktop files that I can
see. So Replaces only - one against pre-mimelnk oo.org,
and one against (<< 1.1.3) oo.org-mimelnk. Hopefully
this is right... peer review would be great :)

Revision 459 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 12 15:13:54 2005 UTC (8 years, 3 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61721 byte(s)
Diff to previous 458 , to selected 940
Revert openoffice.org 1.1.3 compatible changes since we're uploading
kdelibs before 1.1.3 enters testing.

Revision 458 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 12 15:06:20 2005 UTC (8 years, 3 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 62109 byte(s)
Diff to previous 457 , to selected 940
  * Include patch to fix CAN-2005-0365, "insecure temporary file creation in
    kdelibs 3.3.2". dcopidlng no longer creates its temporary files in /tmp.
    (Closes: #294832, #294896) Urgency set to high because of this and other
    RC bug fixes below.

Revision 457 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 12 14:40:03 2005 UTC (8 years, 3 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61862 byte(s)
Diff to previous 448 , to selected 940
Correct spelling of contributor name: Javier Fernández-Sanguino Peña.

Revision 448 - (view) (download) (annotate) - [select for diffs]
Modified Tue Feb 1 17:52:00 2005 UTC (8 years, 3 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61855 byte(s)
Diff to previous 446 , to selected 940
Add new manpage.

Revision 446 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 28 15:51:04 2005 UTC (8 years, 3 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61756 byte(s)
Diff to previous 431 , to selected 940
Commit for the post-OO.org-1.1.3-in-Sarge upload.
Re-add .desktop files, add Replaces/Conflicts,
etc.

Revision 431 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 20 20:23:41 2005 UTC (8 years, 4 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 61175 byte(s)
Diff to previous 420 , to selected 940
Add new patch - fixes starting of games from Run Dialog.

Revision 420 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 15 23:30:38 2005 UTC (8 years, 4 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 60790 byte(s)
Diff to previous 393 , to selected 940
Remove #287822 from pending.

Revision 393 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 13 16:04:47 2005 UTC (8 years, 4 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 60893 byte(s)
Diff to previous 383 , to selected 940
kdelibs copyright file fixes only.

Revision 383 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 8 23:28:51 2005 UTC (8 years, 4 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 60966 byte(s)
Diff to previous 382 , to selected 940
Add the kaccel russian fix, and lower perl-suid to Recommends.
This stuff is iffy... Comments welcome.

Revision 382 - (view) (download) (annotate) - [select for diffs]
Modified Sat Jan 8 19:56:31 2005 UTC (8 years, 4 months ago) by chrsmrtn-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 60603 byte(s)
Diff to previous 381 , to selected 940
kdelibs branch update, another cups patch.

Revision 381 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 7 20:05:07 2005 UTC (8 years, 4 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 60415 byte(s)
Diff to previous 380 , to selected 940
First round of kdelibs 3.3.2-1 updates.

Revision 380 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 7 19:43:20 2005 UTC (8 years, 4 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 58799 byte(s)
Diff to previous 379 , to selected 940
Changing a past changelog entry because it's important (provide
non-bogus CAN number):

  s/CAN-2004-115/CAN-2004-1158/ in the the entry for kdelibs 3.3.1-3.

Revision 379 - (view) (download) (annotate) - [select for diffs]
Modified Fri Jan 7 17:35:10 2005 UTC (8 years, 4 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 58798 byte(s)
Diff to previous 348 , to selected 940
BIG COMMIT: merged branches/kde-3.3.2 back to trunk.

Revision 348 - (view) (download) (annotate) - [select for diffs]
Modified Sun Dec 19 19:56:36 2004 UTC (8 years, 5 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 57308 byte(s)
Diff to previous 300 , to selected 940
Commited kdelibs 3.3.1-4 packaging.

Revision 300 - (view) (download) (annotate) - [select for diffs]
Modified Mon Dec 13 22:01:02 2004 UTC (8 years, 5 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 56919 byte(s)
Diff to previous 296 , to selected 940
Commited kdelibs 3.3.1-3 packaging.

Revision 296 - (view) (download) (annotate) - [select for diffs]
Modified Sat Dec 11 17:50:53 2004 UTC (8 years, 5 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 56627 byte(s)
Diff to previous 261 , to selected 940
Commited kdelibs 3.3.1-2 packaging.

Revision 261 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 18 22:49:46 2004 UTC (8 years, 6 months ago) by dato-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 55478 byte(s)
Diff to previous 145 , to selected 940
- Update trunk/packages/kdelibs from my trunk directory under people.


Revision 145 - (view) (download) (annotate) - [select for diffs]
Modified Mon Aug 2 23:43:14 2004 UTC (8 years, 9 months ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 54429 byte(s)
Diff to previous 143 , to selected 940
kdelibs 3.2.3-3 update

Revision 143 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 22 07:29:17 2004 UTC (8 years, 10 months ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 54278 byte(s)
Diff to previous 141 , to selected 940
kdelibs 3.2.3-2 update

Revision 141 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 22 07:24:23 2004 UTC (8 years, 10 months ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 54127 byte(s)
Diff to previous 122 , to selected 940
kdelibs 3.2.3-1 update

Revision 122 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 27 00:55:33 2004 UTC (9 years ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 53923 byte(s)
Diff to previous 99 , to selected 940
kdelibs 3.2.2-2 update

Revision 99 - (view) (download) (annotate) - [select for diffs]
Modified Fri Apr 9 05:02:00 2004 UTC (9 years, 1 month ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 53567 byte(s)
Diff to previous 98 , to selected 940
kdelibs 3.2.2-1 update

Revision 98 - (view) (download) (annotate) - [select for diffs]
Modified Thu Apr 8 19:40:30 2004 UTC (9 years, 1 month ago) by domi-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 53200 byte(s)
Diff to previous 97 , to selected 940
Commit a patch by Nathaniel W. Turner explaining how to use CDBS for
packaging a KDE app.


Revision 97 - (view) (download) (annotate) - [select for diffs]
Modified Wed Apr 7 22:49:49 2004 UTC (9 years, 1 month ago) by domi-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 53077 byte(s)
Diff to previous 93 , to selected 940
update the changelog

Revision 93 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 5 23:17:58 2004 UTC (9 years, 1 month ago) by domi-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 52840 byte(s)
Diff to previous 90 , to selected 940
debian/Packaging.txt, debian/dh-make/menu.ex: Added quotes to the menu
file examples. 


Revision 90 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 5 19:41:31 2004 UTC (9 years, 1 month ago) by domi-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 52699 byte(s)
Diff to previous 65 , to selected 940
Removed references to the obsolete kderemove menu tag in kdelibs' 
documentation. 


Revision 65 - (view) (download) (annotate) - [select for diffs]
Modified Sun Mar 21 23:47:34 2004 UTC (9 years, 2 months ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 52561 byte(s)
Diff to previous 62 , to selected 940
kdelibs 3.2.1-1 update

Revision 62 - (view) (download) (annotate) - [select for diffs]
Modified Sat Mar 6 16:51:30 2004 UTC (9 years, 2 months ago) by domi-guest
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 52601 byte(s)
Diff to previous 51 , to selected 940
Dominique Devriese <devriese@kde.org>: Make the versioned kdelibs-data
openoffice.org-mimelnk Replaces entry use the proper openoffice
version (<= 1.1.0+1.1.1rc-1).  Closes: 236508.


Revision 51 - (view) (download) (annotate) - [select for diffs]
Modified Sat Feb 21 01:34:15 2004 UTC (9 years, 3 months ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 52351 byte(s)
Diff to previous 7 , to selected 940
kdelibs 3.2.0-0pre1v1 update

KDE_3_2_BRANCH update
Corrected Conflicts/Replaces
Various other minor fixes

Revision 7 - (view) (download) (annotate) - [select for diffs]
Added Thu Jan 22 02:57:44 2004 UTC (9 years, 4 months ago) by ccheney
Original Path: trunk/packages/kdelibs/debian/changelog
File length: 52191 byte(s)
Diff to selected 940
kdelibs 3.1.95-1 import

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.5