- initial 1.4.0 update (builds; files need to be updated)

[packages/cups.git] / cups-man_pages_linking.patch

diff --git a/cups-man_pages_linking.patch b/cups-man_pages_linking.patch
index 7a563ca0213727b8daed80e9d4cc826ea61e5bea..fba84c6a91229e40a4554ba9c07211edae1cc29a 100644 (file)
--- a/cups-man_pages_linking.patch
+++ b/cups-man_pages_linking.patch
@@ -1,48 +1,32 @@
-diff -urN cups-1.1.21.org/man/fr/Makefile cups-1.1.21/man/fr/Makefile
---- cups-1.1.21.org/man/fr/Makefile    2004-09-24 01:17:20.456195732 +0200
-+++ cups-1.1.21/man/fr/Makefile        2004-09-24 01:18:25.086350238 +0200
-@@ -65,7 +65,7 @@
-               $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
+--- cups-1.2rc1/man/Makefile.wiget     2006-04-05 12:06:41.000000000 +0200
++++ cups-1.2rc1/man/Makefile   2006-04-05 12:07:50.000000000 +0200
+@@ -149,10 +149,10 @@
        done
-       $(RM) $(MANDIR)/$(LANGUAGE)/man1/cancel.1
--      $(LN) lp.1 $(MANDIR)/$(LANGUAGE)/man1/cancel.1
-+      echo ".so lp.1" > $(MANDIR)/$(LANGUAGE)/man1/cancel.1
-       $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/man5
-       for file in $(MAN5); do \
-               $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man5/`basename $$file man`5; \
-@@ -75,9 +75,9 @@
-               $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
+       for file in accept cupsreject reject; do \
+               $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
+-              $(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
++              echo ".so cupsaccept.$(MAN8EXT)" > $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \
        done
-       $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
--      $(LN) accept.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+      echo ".so accept.$(MAN8EXT)" > $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
-       $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
--      $(LN) enable.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
-+      echo ".so enable.$(MAN8EXT)" > $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
-       $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat1
-       for file in $(CAT1); do \
-               $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat1; \
-diff -urN cups-1.1.21.org/man/Makefile cups-1.1.21/man/Makefile
---- cups-1.1.21.org/man/Makefile       2004-09-24 01:17:20.635157394 +0200
-+++ cups-1.1.21/man/Makefile   2004-09-24 01:18:00.631589097 +0200
-@@ -74,7 +74,7 @@
-               $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
-       done
-       $(RM) $(MANDIR)/man1/cancel.1
--      $(LN) lp.1 $(MANDIR)/man1/cancel.1
-+      echo ".so lp.1" > $(MANDIR)/man1/cancel.1
-       $(INSTALL_DIR) $(MANDIR)/man5
-       for file in $(MAN5); do \
-               echo Installing $$file in $(MANDIR)/man5...; \
-@@ -86,9 +86,9 @@
-               $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
-       done
-       $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
--      $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+      echo ".so accept.$(MAN8EXT)" > $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-       $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
--      $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-+      echo ".so enable.$(MAN8EXT)" > $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-       $(INSTALL_DIR) $(MANDIR)/cat1
-       for file in $(CAT1); do \
-               echo Installing $$file in $(MANDIR)/cat1...; \
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
+-      $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
++      echo ".so cupsenable.$(MAN8EXT)" > $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
+ 
+ 
+ #
+--- cups-1.4.0/config-scripts/cups-manpages.m4~        2009-01-12 20:17:09.000000000 +0100
++++ cups-1.4.0/config-scripts/cups-manpages.m4 2009-08-29 22:32:49.346665192 +0200
+@@ -69,10 +69,10 @@
+               ;;
+       Linux* | GNU* | Darwin*)
+               # Linux, GNU Hurd, and Mac OS X
+-              MAN1EXT=1.gz
+-              MAN5EXT=5.gz
+-              MAN7EXT=7.gz
+-              MAN8EXT=8.gz
++              MAN1EXT=1
++              MAN5EXT=5
++              MAN7EXT=7
++              MAN8EXT=8
+               MAN8DIR=8
+               ;;
+       *)