[Pkg-cups-devel] r306 - in cupsys/branches/cups-1.2/debian: .
Martin Pitt
mpitt at costa.debian.org
Fri Jul 21 16:47:07 UTC 2006
Author: mpitt
Date: Fri Jul 21 16:47:07 2006
New Revision: 306
Modified:
cupsys/branches/cups-1.2/debian/changelog
cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
cupsys/branches/cups-1.2/debian/patches/09_runasuser_autoconf.dpatch
Log:
[ Martin Pitt ]
* Adapt patches to new upstream version.
Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog (original)
+++ cupsys/branches/cups-1.2/debian/changelog Fri Jul 21 16:47:07 2006
@@ -1,10 +1,14 @@
cupsys (1.2.2-1) UNRELEASED; urgency=low
* New upstream release
+
[ Kenshi Muto]
* Bug squash march
- -- Kenshi Muto <kmuto at debian.org> Fri, 21 Jul 2006 08:43:10 +0000
+ [ Martin Pitt ]
+ * Adapt patches to new upstream version.
+
+ -- Kenshi Muto <kmuto at debian.org> Fri, 21 Jul 2006 18:43:59 +0200
cupsys (1.2.1-4) unstable; urgency=medium
Modified: cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch (original)
+++ cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch Fri Jul 21 16:47:07 2006
@@ -5,23 +5,50 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
---- cupsys-1.2.1~/configure 2006-05-22 20:01:55.000000000 +0000
-+++ cupsys-1.2.1/configure 2006-05-28 13:11:46.000000000 +0000
-@@ -7856,11 +7856,11 @@
- IRIX | Linux | GNU)
- # IRIX, Linux, and HURD...
- if test $exec_prefix != /usr; then
-- DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
-- DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
-- DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
-- LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-- EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
-+ DSOFLAGS="$DSOFLAGS"
-+ DSO32FLAGS="$DSO32FLAGS"
-+ DSO64FLAGS="$DSO64FLAGS"
-+ LDFLAGS="$LDFLAGS"
-+ EXPORT_LDFLAGS=""
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure 2006-07-21 18:42:52.000000000 +0200
++++ cups-1.2/configure 2006-07-21 18:45:59.000000000 +0200
+@@ -7857,14 +7857,6 @@
fi
;;
+ IRIX | Linux | GNU)
+- # IRIX, Linux, and HURD...
+- if test $exec_prefix != /usr; then
+- DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+- DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS"
+- DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS"
+- LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+- EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
+- fi
+ ;;
esac
+ else
+diff -urNad cups-1.2~/configure.rej cups-1.2/configure.rej
+--- cups-1.2~/configure.rej 1970-01-01 01:00:00.000000000 +0100
++++ cups-1.2/configure.rej 2006-07-21 18:45:32.000000000 +0200
+@@ -0,0 +1,25 @@
++***************
++*** 7856,7866 ****
++ IRIX | Linux | GNU)
++ # IRIX, Linux, and HURD...
++ if test $exec_prefix != /usr; then
++- DSOFLAGS="-Wl,-rpath,\$(libdir) $DSOFLAGS"
++- DSO32FLAGS="-Wl,-rpath,\$(LIB32DIR) $DSO32FLAGS"
++- DSO64FLAGS="-Wl,-rpath,\$(LIB64DIR) $DSO64FLAGS"
++- LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
++- EXPORT_LDFLAGS="-Wl,-rpath,\$(libdir)"
++ fi
++ ;;
++ esac
++--- 7856,7866 ----
++ IRIX | Linux | GNU)
++ # IRIX, Linux, and HURD...
++ if test $exec_prefix != /usr; then
+++ DSOFLAGS="$DSOFLAGS"
+++ DSO32FLAGS="$DSO32FLAGS"
+++ DSO64FLAGS="$DSO64FLAGS"
+++ LDFLAGS="$LDFLAGS"
+++ EXPORT_LDFLAGS=""
++ fi
++ ;;
++ esac
Modified: cupsys/branches/cups-1.2/debian/patches/09_runasuser_autoconf.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/09_runasuser_autoconf.dpatch (original)
+++ cupsys/branches/cups-1.2/debian/patches/09_runasuser_autoconf.dpatch Fri Jul 21 16:47:07 2006
@@ -5,15 +5,15 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.1~/configure cupsys-1.2.1/configure
---- cupsys-1.2.1~/configure 2006-05-28 13:12:28.000000000 +0000
-+++ cupsys-1.2.1/configure 2006-05-28 13:13:47.000000000 +0000
+diff -urNad cups-1.2~/configure cups-1.2/configure
+--- cups-1.2~/configure 2006-07-21 18:43:01.000000000 +0200
++++ cups-1.2/configure 2006-07-21 18:43:41.000000000 +0200
@@ -309,7 +309,7 @@
#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 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 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 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 LIBOBJS LTLIBOBJS'
-+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 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 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL ARCHFLAGS OPTIM ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 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 LIBOBJS LTLIBOBJS'
+-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 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 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 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_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 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 DSO DSOFLAGS DSO32FLAGS DSO64FLAGS LIBCUPS LIBCUPSIMAGE LINKCUPS LINKCUPSIMAGE DSOLIBS IMGLIBS EXPORT_LDFLAGS LIBTOOL OPTIM ARCHFLAGS ARCH32FLAGS INSTALL32 LIB32CUPS LIB32CUPSIMAGE LIB32DIR UNINSTALL32 ARCH64FLAGS INSTALL64 LIB64CUPS LIB64CUPSIMAGE LIB64DIR UNINSTALL64 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.
@@ -25,7 +25,7 @@
--enable-pdftops build pdftops filter, default=auto
Optional Packages:
-@@ -13147,6 +13148,26 @@
+@@ -13297,6 +13298,26 @@
_ACEOF
@@ -52,7 +52,7 @@
# Check whether --with-printcap or --without-printcap was given.
if test "${with_printcap+set}" = set; then
-@@ -14415,6 +14436,7 @@
+@@ -14584,6 +14605,7 @@
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
More information about the Pkg-cups-devel
mailing list