Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

5 files changed, 51 insertions, 28 deletions

diff --git a/package/cups/patches/patch-Makefile b/package/cups/patches/patch-Makefile
index 663b989b9..70febbf51 100644
--- a/package/cups/patches/patch-Makefile
+++ b/package/cups/patches/patch-Makefile
@@ -1,12 +1,16 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/Makefile	2009-03-12 22:34:21.000000000 +0100
-+++ cups-1.3.10/Makefile	2009-05-09 22:41:42.000000000 +0200
-@@ -19,7 +19,7 @@ include Makedefs
+--- cups-1.4.2.orig/Makefile	2009-07-01 06:01:31.000000000 +0200
++++ cups-1.4.2/Makefile	2009-11-19 22:04:36.000000000 +0100
+@@ -27,10 +27,10 @@ include Makedefs
  # Directories to make...
  #
  
--DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
-+DIRS	=	cups backend berkeley cgi-bin filter locale monitor \
- 		notifier scheduler systemv test \
+-DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
+-		notifier ppdc scheduler systemv test \
++DIRS	=	cups filter backend berkeley cgi-bin driver locale monitor \
++		notifier ppdc scheduler systemv \
  		$(PHPDIR) \
- 		conf data doc $(FONTS) ppd templates
+-		conf data doc examples $(FONTS) templates
++		conf data examples doc $(FONTS) templates
+ 
+ 
+ #
diff --git a/package/cups/patches/patch-conf_Makefile b/package/cups/patches/patch-conf_Makefile
new file mode 100644
index 000000000..f3ae5c8dd
--- /dev/null
+++ b/package/cups/patches/patch-conf_Makefile
@@ -0,0 +1,18 @@
+--- cups-1.4.2.orig/conf/Makefile	2009-09-22 23:53:31.000000000 +0200
++++ cups-1.4.2/conf/Makefile	2009-11-19 22:02:20.000000000 +0100
+@@ -72,12 +72,12 @@ install:	all install-data install-header
+ install-data:
+ 	for file in $(KEEP); do \
+ 		if test -r $(SERVERROOT)/$$file ; then \
+-			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
++			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
+ 		else \
+-			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
++			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
+ 		fi ; \
+ 	done
+-	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
++	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
+ 	for file in $(REPLACE); do \
+ 		if test -r $(DATADIR)/mime/$$file ; then \
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure
index 82550e632..f23196c67 100644
--- a/package/cups/patches/patch-configure
+++ b/package/cups/patches/patch-configure
@@ -1,26 +1,17 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/configure	2009-04-16 22:02:06.000000000 +0200
-+++ cups-1.3.10/configure	2009-05-31 19:41:18.000000000 +0200
-@@ -7460,9 +7460,6 @@ done
- 
- 
- case $uname in
--        Darwin* | *BSD*)
--                ARFLAGS="-rcv"
--                ;;
-         *)
-                 ARFLAGS="crvs"
-                 ;;
-@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib
+--- cups-1.4.2.orig/configure	2009-11-10 00:04:25.000000000 +0100
++++ cups-1.4.2/configure	2010-01-07 23:11:46.635118361 +0100
+@@ -9850,8 +9850,8 @@ if test "$libdir" = "\${exec_prefix}/lib
+ 			libdir="$exec_prefix/lib32"
  			;;
  		Linux*)
- 			if test -d /usr/lib64; then
+-			if test -d /usr/lib64; then
 -				libdir="$exec_prefix/lib64"
++			if test -d /usr/lib; then
 +				libdir="$exec_prefix/lib"
  			fi
  			;;
  		HP-UX*)
-@@ -9587,11 +9584,6 @@ _ACEOF
+@@ -10260,11 +10260,6 @@ _ACEOF
  
  # Server executables...
  case "$uname" in
diff --git a/package/cups/patches/patch-ppdc_Makefile b/package/cups/patches/patch-ppdc_Makefile
new file mode 100644
index 000000000..5cfa1ac9b
--- /dev/null
+++ b/package/cups/patches/patch-ppdc_Makefile
@@ -0,0 +1,11 @@
+--- cups-1.4.2.orig/ppdc/Makefile	2009-05-27 01:27:06.000000000 +0200
++++ cups-1.4.2/ppdc/Makefile	2009-11-19 21:58:49.000000000 +0100
+@@ -244,7 +244,7 @@ genstrings:		genstrings.o libcupsppdc.a 
+ 		libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+ 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+ 	echo Generating localization strings...
+-	./genstrings >sample.c
++	#./genstrings >sample.c
+ 
+ 
+ #
diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c
index c1f3a3e94..d9892c206 100644
--- a/package/cups/patches/patch-scheduler_auth_c
+++ b/package/cups/patches/patch-scheduler_auth_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cups-1.3.10.orig/scheduler/auth.c	2009-02-07 06:06:11.000000000 +0100
-+++ cups-1.3.10/scheduler/auth.c	2009-06-01 19:17:20.000000000 +0200
-@@ -54,6 +54,7 @@
+--- cups-1.4.2.orig/scheduler/auth.c	2009-05-27 00:01:23.000000000 +0200
++++ cups-1.4.2/scheduler/auth.c	2009-12-30 12:30:13.000000000 +0100
+@@ -57,6 +57,7 @@
   * Include necessary headers...
   */