Commit Graph

1385 Commits

Author SHA1 Message Date
Tim Waugh
9829b01410 Ported avahi support from 1.4. 2011-08-05 17:03:03 +01:00
Jiri Popelka
90cf1a0fdd 1.5.0 2011-07-26 13:23:01 +02:00
Jiri Popelka
dd41b5b161 Merge branch 'f14' into f15 2011-07-26 11:18:16 +02:00
Jiri Popelka
ccb8206c51 1.4.8 2011-07-26 11:06:18 +02:00
Tim Waugh
8612dba3d9 Merge branch 'f15' 2011-07-20 13:26:05 +01:00
Tim Waugh
ec3fa1014b Merge branch 'f14' into f15 2011-07-20 13:22:36 +01:00
Tim Waugh
39d7e8f15b Don't delete job data files when restarted (STR #3880). 2011-07-20 13:21:15 +01:00
Tim Waugh
4d5db8941a Merge branch 'f15' 2011-07-15 17:41:36 +01:00
Tim Waugh
f4afb07a4f Merge branch 'f14' into f15 2011-07-15 17:40:27 +01:00
Tim Waugh
f9ab38035f Ship an rpm macro for where to put driver executables. 2011-07-15 17:26:35 +01:00
Tim Waugh
0b72bc0b80 bug #720921 is already fixed in 1.5rc1 2011-07-13 11:18:40 +01:00
Tim Waugh
6d47608f7b Merge branch 'f14' into f15 2011-07-13 11:17:30 +01:00
Tim Waugh
a8d53773cf Avoid busy loop in cups-polld (bug #720921). 2011-07-13 11:15:52 +01:00
Jiri Popelka
b6aa13e821 Merge branch 'f15' 2011-07-07 17:15:40 +02:00
Jiri Popelka
f0218f3d42 Merge branch 'f14' into f15 2011-07-07 16:58:02 +02:00
Jiri Popelka
10829b97af Fix SNMP supply level crasher (STR #3875, bug #719057). 2011-07-07 16:54:10 +02:00
Tim Waugh
b0b655128e Merge branch 'f15' 2011-07-07 14:48:32 +01:00
Tim Waugh
011ba18f04 Merge branch 'f14' into f15 2011-07-07 14:47:30 +01:00
Tim Waugh
8882f95167 Undo last change which had no effect. We already remove the .SILENT
target from the Makefile as part of the build.
2011-07-07 14:46:50 +01:00
Tim Waugh
70134501f4 Merge branch 'f15' 2011-07-07 09:59:52 +01:00
Tim Waugh
efb27f9d3d Merge branch 'f14' into f15 2011-07-07 09:58:58 +01:00
Tim Waugh
ed0066fbe8 Make build log verbose enough to include compiler flags used. 2011-07-07 09:58:10 +01:00
Tim Waugh
a4f3be643f Removed udev rules file as it is no longer necessary. 2011-07-05 16:44:29 +01:00
Tim Waugh
3c2c7cee8a Add support for systemd socket activation (patch from Lennart Poettering). 2011-07-05 13:26:06 +01:00
Lennart Poettering
55dcb25aeb Add socket activation patch 2011-07-05 13:03:25 +01:00
Tim Waugh
4ed003264a Don't use portreserve any more. Better approach is to use systemd
socket activation (not yet done).
2011-06-29 16:35:40 +01:00
Tim Waugh
b7d9a11244 Ship systemd service unit instead of SysV initscript (bug #690766).
Note: no socket activation yet.
2011-06-29 14:18:42 +01:00
Tim Waugh
a4221da3e9 Merge branch 'f15' 2011-06-29 10:21:57 +01:00
Tim Waugh
2b48db91bb Merge branch 'f15' using 'ours' to allow merging upwards through the branches. 2011-06-29 10:21:01 +01:00
Tim Waugh
24f7bb4948 Merge branch 'f14' into f15 2011-06-29 10:18:44 +01:00
Tim Waugh
99d2fe0139 Merged f14 using 'ours' to allow merging upwards through the branches. 2011-06-29 10:16:54 +01:00
Tim Waugh
68e0ea8f6b Tag localization files correctly (bug #716421). 2011-06-29 10:11:01 +01:00
Tim Waugh
e6c38fe3de Updated avahi patches. 2011-06-28 12:57:58 +01:00
Jiri Popelka
1a668d884a added to sources 2011-06-28 13:30:13 +02:00
Jiri Popelka
993cfb6a8a 1.4.7. 2011-06-28 12:12:17 +02:00
Jiri Popelka
e663022e55 1.4.7. 2011-06-28 11:48:01 +02:00
Jiri Popelka
24f46305c8 1.5rc1 2011-06-15 12:11:10 +02:00
Richard Hughes
ab7ce8068f Updated colord patch with fixes from Tim Waugh. 2011-06-04 16:13:25 +01:00
Tim Waugh
28f2e3ad02 Use correct port number when publishing services through Avahi
(Ubuntu #792309).
2011-06-03 15:52:13 +01:00
Tim Waugh
1cca59f9dc Fixed some typos in cups-icc.patch. 2011-06-03 14:05:20 +01:00
Tim Waugh
9463d0b6c9 Don't crash when unable to connect to D-Bus. 2011-06-03 14:05:20 +01:00
Jiri Popelka
019a41cd01 Set the default RIPCache to 128m (STR #3535, bug #549901). 2011-06-03 14:43:17 +02:00
Jiri Popelka
a0358da130 enable LSPP support again 2011-05-31 18:35:20 +02:00
Richard Hughes
889eca67a1 Updated colord patch against 1.5 upstream and fixes from Tim Waugh. 2011-05-31 17:25:38 +01:00
Jiri Popelka
770e272bad fix lspp.patch to not include "config.h" in cups/cups.h (#709384) 2011-05-31 17:29:17 +02:00
Jiri Popelka
6152e4bf54 Added forgotten patch 2011-05-26 16:35:58 +02:00
Jiri Popelka
5bd20b0884 1.5b2 2011-05-26 16:27:09 +02:00
Jiri Popelka
cb43936c55 Upload 1.5b1 sources. 2011-05-26 09:45:27 +02:00
Jiri Popelka
4743e10770 1.5b1 2011-05-25 19:36:54 +02:00
Tim Waugh
2b082bd168 Fixed some warnings from the icc patch. 2011-05-24 12:49:43 +01:00