Comparar commits
1 Commits
| Autor | SHA1 | Data | |
|---|---|---|---|
 msweet
|
9dbf508737 |
+1
-9
@@ -1,14 +1,6 @@
|
||||
CHANGES.txt - 1.6.1 - 2012-07-27
|
||||
CHANGES.txt - 1.6.0 - 2012-07-16
|
||||
--------------------------------
|
||||
|
||||
CHANGES IN CUPS V1.6.1
|
||||
|
||||
- Documentation fix (STR #4149)
|
||||
- RPM packaging fixes (STR #4129, #4145)
|
||||
- The Japanese and English web interface headers were swapped
|
||||
(STR #4148)
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.6.0
|
||||
|
||||
- Document changes (STR #4131)
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
INSTALL - CUPS v1.6.1 - 2012-07-27
|
||||
INSTALL - CUPS v1.6.0 - 2012-07-16
|
||||
----------------------------------
|
||||
|
||||
This file describes how to compile and install CUPS from source code. For more
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
README - CUPS v1.6.1 - 2012-07-27
|
||||
README - CUPS v1.6.0 - 2012-07-16
|
||||
---------------------------------
|
||||
|
||||
Looking for compile instructions? Read the file "INSTALL.txt"
|
||||
|
||||
+3
-5
@@ -128,7 +128,7 @@ install-exec: $(INSTALLXPC)
|
||||
$(RM) $(SERVERBIN)/backend/$$file; \
|
||||
$(LN) ipp $(SERVERBIN)/backend/$$file; \
|
||||
done
|
||||
if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \
|
||||
if test "x$(DNSSD_BACKEND)" != x; then \
|
||||
$(RM) $(SERVERBIN)/backend/mdns; \
|
||||
$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
|
||||
fi
|
||||
@@ -232,10 +232,8 @@ libbackend.a: $(LIBOBJS)
|
||||
dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
|
||||
echo Linking $@...
|
||||
$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
|
||||
if test `uname` = Darwin; then \
|
||||
$(RM) mdns; \
|
||||
$(LN) dnssd mdns; \
|
||||
fi
|
||||
$(RM) mdns
|
||||
$(LN) dnssd mdns
|
||||
|
||||
|
||||
#
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
dnl
|
||||
dnl "$Id: cups-common.m4 10553 2012-07-27 17:57:34Z mike $"
|
||||
dnl "$Id: cups-common.m4 10548 2012-07-16 18:21:43Z mike $"
|
||||
dnl
|
||||
dnl Common configuration stuff for CUPS.
|
||||
dnl
|
||||
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl Version number information...
|
||||
CUPS_VERSION="1.6.1"
|
||||
CUPS_VERSION="1.6.0"
|
||||
CUPS_REVISION=""
|
||||
#if test -z "$CUPS_REVISION" -a -d .svn; then
|
||||
# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
|
||||
@@ -452,5 +452,5 @@ esac
|
||||
AC_SUBST(BUILDDIRS)
|
||||
|
||||
dnl
|
||||
dnl End of "$Id: cups-common.m4 10553 2012-07-27 17:57:34Z mike $".
|
||||
dnl End of "$Id: cups-common.m4 10548 2012-07-16 18:21:43Z mike $".
|
||||
dnl
|
||||
|
||||
+2
-2
@@ -52,10 +52,10 @@ extern "C" {
|
||||
* Constants...
|
||||
*/
|
||||
|
||||
# define CUPS_VERSION 1.0601
|
||||
# define CUPS_VERSION 1.0600
|
||||
# define CUPS_VERSION_MAJOR 1
|
||||
# define CUPS_VERSION_MINOR 6
|
||||
# define CUPS_VERSION_PATCH 1
|
||||
# define CUPS_VERSION_PATCH 0
|
||||
|
||||
# define CUPS_BC_FD 3
|
||||
/* Back-channel file descriptor for
|
||||
|
||||
@@ -2679,10 +2679,8 @@ cups_dnssd_browse_cb(
|
||||
AvahiLookupResultFlags flags, /* I - Flags */
|
||||
void *context) /* I - Devices array */
|
||||
{
|
||||
#ifdef DEBUG
|
||||
AvahiClient *client = avahi_service_browser_get_client(browser);
|
||||
/* Client information */
|
||||
#endif /* DEBUG */
|
||||
_cups_dnssd_data_t *data = (_cups_dnssd_data_t *)context;
|
||||
/* Enumeration data */
|
||||
|
||||
@@ -3066,10 +3064,8 @@ cups_dnssd_query_cb(
|
||||
AvahiLookupResultFlags flags, /* I - Flags */
|
||||
void *context) /* I - Enumeration data */
|
||||
{
|
||||
# ifdef DEBUG
|
||||
AvahiClient *client = avahi_record_browser_get_client(browser);
|
||||
/* Client information */
|
||||
# endif /* DEBUG */
|
||||
# endif /* HAVE_DNSSD */
|
||||
_cups_dnssd_data_t *data = (_cups_dnssd_data_t *)context;
|
||||
/* Enumeration data */
|
||||
|
||||
@@ -609,6 +609,18 @@ lpr -o lpi=8 filename
|
||||
|
||||
<P>The default lines per inch is 6.</P>
|
||||
|
||||
<H3><A NAME="COLUMNS">Setting the Number of Columns</A></H3>
|
||||
|
||||
<P>The <CODE>-o columns=value</CODE> option sets the number of
|
||||
text columns:</P>
|
||||
|
||||
<PRE CLASS="command">
|
||||
lp -o columns=2 filename
|
||||
lpr -o columns=3 filename
|
||||
</PRE>
|
||||
|
||||
<P>The default number of columns is 1.</P>
|
||||
|
||||
<H3><A NAME="MARGINS">Setting the Page Margins</A></H3>
|
||||
|
||||
<P>Normally the page margins are set to the hard limits of the
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
%{?_with_dbus: %define _dbus --enable-dbus}
|
||||
%{!?_with_dbus: %define _dbus --disable-dbus}
|
||||
|
||||
%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}}
|
||||
%{!?_with_dnssd: %{!?_without_dnssd: %define _without_dnssd --without-dnssd}}
|
||||
%{?_with_dnssd: %define _dnssd --enable-dnssd}
|
||||
%{!?_with_dnssd: %define _dnssd --disable-dnssd}
|
||||
|
||||
@@ -179,7 +179,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /usr/lib/cups
|
||||
%dir /usr/lib/cups/backend
|
||||
%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
|
||||
# DNS-SD
|
||||
/usr/lib/cups/backend/dnssd
|
||||
%endif
|
||||
/usr/lib/cups/backend/http
|
||||
@@ -243,17 +242,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /usr/share/doc/cups/images
|
||||
/usr/share/doc/cups/images/*
|
||||
|
||||
%dir /usr/share/doc/cups/ca
|
||||
/usr/share/doc/cups/ca/*
|
||||
%dir /usr/share/doc/cups/es
|
||||
/usr/share/doc/cups/es/*
|
||||
%dir /usr/share/doc/cups/ja
|
||||
/usr/share/doc/cups/ja/*
|
||||
|
||||
%dir /usr/share/locale/ca
|
||||
/usr/share/locale/ca/cups_ca.po
|
||||
%dir /usr/share/locale/es
|
||||
/usr/share/locale/es/cups_es.po
|
||||
%dir /usr/share/locale/ja
|
||||
/usr/share/locale/ja/cups_ja.po
|
||||
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
<TR HEIGHT="36">
|
||||
<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
|
||||
SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
|
||||
<TD CLASS="unsel"><A HREF="/"> Home </A></TD>
|
||||
<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin"> Administration </A></TD>
|
||||
<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/"> Classes </A></TD>
|
||||
<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/"> Online Help </A></TD>
|
||||
<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/"> Jobs </A></TD>
|
||||
<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/"> Printers </A></TD>
|
||||
<TD CLASS="unsel"><A HREF="/"> ホーム </A></TD>
|
||||
<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin"> 管理 </A></TD>
|
||||
<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/"> クラス </A></TD>
|
||||
<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/"> ヘルプ </A></TD>
|
||||
<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/"> ジョブ </A></TD>
|
||||
<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/"> プリンター </A></TD>
|
||||
<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
|
||||
TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
|
||||
VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
<TR HEIGHT="36">
|
||||
<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
|
||||
SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
|
||||
<TD CLASS="unsel"><A HREF="/"> ホーム </A></TD>
|
||||
<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin"> 管理 </A></TD>
|
||||
<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/"> クラス </A></TD>
|
||||
<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/"> ヘルプ </A></TD>
|
||||
<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/"> ジョブ </A></TD>
|
||||
<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/"> プリンター </A></TD>
|
||||
<TD CLASS="unsel"><A HREF="/"> Home </A></TD>
|
||||
<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin"> Administration </A></TD>
|
||||
<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/"> Classes </A></TD>
|
||||
<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/"> Online Help </A></TD>
|
||||
<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/"> Jobs </A></TD>
|
||||
<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/"> Printers </A></TD>
|
||||
<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
|
||||
TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
|
||||
VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
|
||||
|
||||
Referência em uma Nova Issue
Bloquear um usuário