- up to 1.7.5

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

diff --git a/cups-man_pages_linking.patch b/cups-man_pages_linking.patch
index 84d845a09ca3b9828910f5dcc87d17dc7eb924ff..b6bfc0df9288b101776a885462e9184f73f56ea5 100644 (file)
--- a/cups-man_pages_linking.patch
+++ b/cups-man_pages_linking.patch
@@ -1,48 +1,32 @@
-diff -urN aaa/cups-1.1.18/man/Makefile cups-1.1.18/man/Makefile
---- aaa/cups-1.1.18/man/Makefile       Thu Jan  2 14:38:12 2003
-+++ cups-1.1.18/man/Makefile   Thu Jan  2 14:40:51 2003
-@@ -73,7 +73,7 @@
-               $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/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) $(DESTDIR)$(MANDIR)/man1/cancel.1
--      $(LN) lp.1 $(DESTDIR)$(MANDIR)/man1/cancel.1
-+      echo ".so lp.1" > $(DESTDIR)$(MANDIR)/man1/cancel.1
-       $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/man3
-       for file in $(MAN3); do \
-               $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/man3/`basename $$file man`3; \
-@@ -87,9 +87,9 @@
-               $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/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) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
--      $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+      echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
-       $(RM) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
--      $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-+      echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
-       $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/cat1
-       for file in $(CAT1); do \
-               $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/cat1; \
-diff -urN aaa/cups-1.1.18/man/fr/Makefile cups-1.1.18/man/fr/Makefile
---- aaa/cups-1.1.18/man/fr/Makefile    Thu Jan  2 14:38:12 2003
-+++ cups-1.1.18/man/fr/Makefile        Thu Jan  2 14:42:36 2003
-@@ -65,7 +65,7 @@
-               $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
-       done
-       $(RM) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
--      $(LN) lp.1 $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
-+      echo ".so lp.1" > $(DESTDIR)$(MANDIR)/$(LANGUAGE)/man1/cancel.1
-       $(INSTALL_DIR) $(DESTDIR)$(PMANDIR)/fr/man3
-       for file in $(MAN3); do \
-               $(INSTALL_MAN) $$file $(DESTDIR)$(PMANDIR)/fr/man3/`basename $$file man`3; \
-@@ -79,9 +79,9 @@
-               $(INSTALL_MAN) $$file $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
-       done
-       $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
--      $(LN) accept.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
-+      echo ".so accept.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
-       $(RM) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
--      $(LN) enable.$(MAN8EXT) $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
-+      echo ".so enable.$(MAN8EXT)" > $(DESTDIR)$(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
-       $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/$(LANGUAGE)/cat1
-       for file in $(CAT1); do \
-               $(INSTALL_MAN) $$file $(DESTDIR)$(MANDIR)/$(LANGUAGE)/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 OS X
+-              MAN1EXT=1.gz
+-              MAN5EXT=5.gz
+-              MAN7EXT=7.gz
+-              MAN8EXT=8.gz
++              MAN1EXT=1
++              MAN5EXT=5
++              MAN7EXT=7
++              MAN8EXT=8
+               MAN8DIR=8
+               ;;
+       *)