Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/cups/patches/03-cups.pc.patch
author Jiri Sasek <Jiri.Sasek@Sun.COM>
Mon, 09 May 2011 15:26:57 -0700
changeset 220 3ff562b51ff5
permissions -rw-r--r--
7040638 CUPS (Common Unix Printing System) should move to Userland.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
220
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     1
 
Index: Makefile
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     2
 
===================================================================
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     3
 
--- Makefile.orig	Fri Apr 23 11:56:34 2010
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     4
 
+++ Makefile	Tue Dec  7 01:16:04 2010
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     5
 
@@ -237,7 +237,10 @@
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     6
 
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps; \
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     7
 
 		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     8
 
 	fi
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
     9
 
+	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    10
 
+	$(INSTALL_DATA) cups.pc $(BUILDROOT)$(libdir)/pkgconfig/cups.pc
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    11
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    12
 
+
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    13
 
 #
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    14
 
 # Install header files...
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    15
 
 #
3ff562b51ff5 7040638 CUPS (Common Unix Printing System) should move to Userland.
Jiri Sasek <Jiri.Sasek@Sun.COM>
parents:
diff changeset 
    16
 












3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    17


Index: cups.pc.in













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    18


===================================================================













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    19


--- cups.pc.in	(revision 0)













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    20


+++ cups.pc.in	(revision 0)













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    21


@@ -0,0 +1,18 @@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    22


+prefix=@prefix@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    23


+exec_prefix=@exec_prefix@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    24


+bindir=@bindir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    25


+includedir=@includedir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    26


+libdir=@libdir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    27


+imagelibdir=@libdir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    28


+datarootdir=@datadir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    29


+datadir=@datadir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    30


+sysconfdir=@sysconfdir@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    31


+cups_datadir=@CUPS_DATADIR@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    32


+cups_serverbin=@CUPS_SERVERBIN@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    33


+cups_serverroot=@CUPS_SERVERROOT@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    34


+













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    35


+Name: cups













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    36


+Description: Common Unix Printing System













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    37


+Version: @CUPS_VERSION@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    38


+Cflags: -I${includedir}













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    39


+Libs: -L${libdir} -lcupsimage -lcups













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    40














3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    41


Property changes on: cups.pc.in













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    42


___________________________________________________________________













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    43


Name: svn:executable













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    44


   + *













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    45














3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    46


Index: configure.in













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    47


===================================================================













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    48


--- configure.in.orig	Tue Jun 22 14:42:44 2010













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    49


+++ configure.in	Mon Dec  6 03:26:15 2010













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    50


@@ -71,7 +71,7 @@













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    51


 	  man/client.conf.man man/cups-deviced.man man/cups-driverd.man













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    52


 	  man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    53


 	  man/cupsd.conf.man man/lpoptions.man













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    54


-	  templates/header.tmpl













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    55


+	  templates/header.tmpl cups.pc













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    56


 	  $LANGFILES)













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    57


 













3ff562b51ff5
7040638 CUPS (Common Unix Printing System) should move to Userland.



Jiri Sasek <Jiri.Sasek@Sun.COM>


parents: 

diff
changeset




    58


 chmod +x cups-config















upstream/oracle/userland-gate