[Pkg-cups-devel] r496 - cupsys/branches/cups-1.2-ubuntu/debian/patches
Martin Pitt
mpitt at alioth.debian.org
Mon Jul 16 13:54:38 UTC 2007
Author: mpitt
Date: Mon Jul 16 13:54:38 2007
New Revision: 496
Log:
debian/patches/09_runasuser_autoconf.dpatch: remove .rej stuff
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/09_runasuser_autoconf.dpatch Mon Jul 16 13:54:38 2007
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.12~/configure cupsys-1.2.12/configure
---- cupsys-1.2.12~/configure 2007-07-14 15:39:04.616155164 +0900
-+++ cupsys-1.2.12/configure 2007-07-14 15:42:12.968290213 +0900
+diff -urNad cups-1.2-ubuntu~/configure cups-1.2-ubuntu/configure
+--- cups-1.2-ubuntu~/configure 2007-07-16 15:51:15.000000000 +0200
++++ cups-1.2-ubuntu/configure 2007-07-16 15:51:16.000000000 +0200
@@ -792,7 +792,9 @@
INSTALL_LANGUAGES
UNINSTALL_LANGUAGES
@@ -54,40 +54,3 @@
# Check whether --enable-browse_short was given.
if test "${enable_browse_short+set}" = set; then
-diff -urNad cupsys-1.2.12~/configure.rej cupsys-1.2.12/configure.rej
---- cupsys-1.2.12~/configure.rej 1970-01-01 09:00:00.000000000 +0900
-+++ cupsys-1.2.12/configure.rej 2007-07-14 15:39:04.776155278 +0900
-@@ -0,0 +1,33 @@
-+***************
-+*** 309,315 ****
-+ #endif"
-+
-+ ac_default_prefix=/
-+- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR RCLEVELS RCSTART RCSTOP XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
-+ ac_subst_files=''
-+
-+ # Initialize some variables set by options.
-+--- 309,315 ----
-+ #endif"
-+
-+ ac_default_prefix=/
-++ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CUPS_VERSION CUPS_REVISION AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB AR HTMLDOC LD LN MV RM RMDIR SED STRIP INSTALLSTATIC LIBMALLOC LIBPAPER EGREP ARFLAGS PKGCONFIG BACKLIBS CUPSDLIBS DBUSDIR DEFAULT_IPP_PORT INITDIR INITDDIR RCLEVELS RCSTART RCSTOP XINETD CUPS_CACHEDIR CUPS_DATADIR CUPS_DOCROOT CUPS_FONTPATH CUPS_LOCALEDIR CUPS_LOGDIR CUPS_REQUESTS CUPS_SERVERBIN INSTALL_SYSV CUPS_SERVERROOT CUPS_STATEDIR AMANDIR PMANDIR MAN1EXT MAN5EXT MAN7EXT MAN8EXT MAN8DIR INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS ARCH64FLAGS CXXLIBS PIEFLAGS IMGFILTERS LIBJPEG LIBPNG LIBTIFF LIBZ EXPORT_LIBJPEG EXPORT_LIBPNG EXPORT_LIBTIFF EXPORT_LIBZ CUPS_DEFAULT_DOMAINSOCKET CUPS_LISTEN_DOMAINSOCKET LIBSLP LIBLDAP LIBGNUTLSCONFIG SSLFLAGS SSLLIBS ENCRYPTION_REQUIRED EXPORT_SSLLIBS PAMDIR PAMFILE PAMLIBS PAMMOD PTHREAD_FLAGS LARGEFILE DEFAULT_LAUNCHD_CONF LAUNCHDLIBS LANGUAGES CUPS_CONFIG_FILE_PERM CUPS_LOG_FILE_PERM CUPS_BROWSING CUPS_BROWSE_LOCAL_PROTOCOLS CUPS_BROWSE_REMOTE_PROTOCOLS CUPS_BROWSE_SHORT_NAMES CUPS_DEFAULT_SHARED CUPS_IMPLICIT_CLASSES CUPS_USE_NETWORK_DEFAULT CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS CUPS_PRIMARY_SYSTEM_GROUP PAP CUPS_DROP_PRIVILEGES PDFTOPS JAVA PERL PHP PHPCONFIG PHPDIR PYTHON INSTALL_LANGUAGES UNINSTALL_LANGUAGES LIBOBJS LTLIBOBJS'
-+ ac_subst_files=''
-+
-+ # Initialize some variables set by options.
-+***************
-+*** 15882,15887 ****
-+ s, at CUPS_GROUP@,$CUPS_GROUP,;t t
-+ s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
-+ s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
-+ s, at PAP@,$PAP,;t t
-+ s, at PDFTOPS@,$PDFTOPS,;t t
-+ s, at JAVA@,$JAVA,;t t
-+--- 15903,15909 ----
-+ s, at CUPS_GROUP@,$CUPS_GROUP,;t t
-+ s, at CUPS_SYSTEM_GROUPS@,$CUPS_SYSTEM_GROUPS,;t t
-+ s, at CUPS_PRIMARY_SYSTEM_GROUP@,$CUPS_PRIMARY_SYSTEM_GROUP,;t t
-++ s, at CUPS_DROP_PRIVILEGES@,$CUPS_DROP_PRIVILEGES,;t t
-+ s, at PAP@,$PAP,;t t
-+ s, at PDFTOPS@,$PDFTOPS,;t t
-+ s, at JAVA@,$JAVA,;t t
More information about the Pkg-cups-devel
mailing list