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/meld/patches/Makefile.patch
author Rich Burridge <rich.burridge@oracle.com>
Sat, 06 Apr 2013 08:18:24 -0700
branchs11-update
changeset 2551 0391c5c3b137
parent 227 1e1ccdc6b1e6
permissions -rw-r--r--
16431724 Adjust how license text and Oracle internal tracking numbers are propagated
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
227
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     1
 
--- meld-1.4.0/Makefile	Sun Sep 26 15:25:02 2010
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     2
 
+++ meld-1.4.0/new.Makefile	Thu Apr 21 11:55:26 2011
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     3
 
@@ -47,7 +47,6 @@
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     4
 
 		$(DESTDIR)$(libdir_)/meld/vc \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     5
 
 		$(DESTDIR)$(sharedir_)/ui \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     6
 
 		$(DESTDIR)$(sharedir_)/icons \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     7
 
-		$(DESTDIR)$(docdir_) \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     8
 
 		$(DESTDIR)$(sharedir)/applications \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
     9
 
 		$(DESTDIR)$(sharedir)/pixmaps \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    10
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    11
 
@@ -56,43 +55,44 @@
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    12
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    13
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    14
 
 		$(DESTDIR)$(helpdir_)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    15
 
-	install -m 755 bin/meld.install \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    16
 
+#		$(DESTDIR)$(docdir_)
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    17
 
+	ginstall -m 555 bin/meld.install \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    18
 
 		$(DESTDIR)$(bindir)/meld
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    19
 
-	install -m 644 meld/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    20
 
+	ginstall -m 444 meld/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    21
 
 		$(DESTDIR)$(libdir_)/meld
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    22
 
-	install -m 644 meld/ui/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    23
 
+	ginstall -m 444 meld/ui/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    24
 
 		$(DESTDIR)$(libdir_)/meld/ui
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    25
 
-	install -m 644 meld/util/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    26
 
+	ginstall -m 444 meld/util/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    27
 
 		$(DESTDIR)$(libdir_)/meld/util
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    28
 
-	install -m 644 meld/vc/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    29
 
+	ginstall -m 444 meld/vc/*.py \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    30
 
 		$(DESTDIR)$(libdir_)/meld/vc
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    31
 
-	install -m 644 meld/paths.py.install \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    32
 
+	ginstall -m 444 meld/paths.py.install \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    33
 
 		$(DESTDIR)$(libdir_)/meld/paths.py
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    34
 
-	install -m 644 data/meld.desktop \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    35
 
+	ginstall -m 444 data/meld.desktop \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    36
 
 		$(DESTDIR)$(sharedir)/applications
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    37
 
 	$(PYTHON)    -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    38
 
-	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    39
 
-	install -m 644 \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    40
 
+#	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    41
 
+	ginstall -m 444 \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    42
 
 		data/ui/*.glade \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    43
 
 		$(DESTDIR)$(sharedir_)/ui
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    44
 
-	install -m 644 \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    45
 
+	ginstall -m 444 \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    46
 
 		data/ui/*.xml \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    47
 
 		$(DESTDIR)$(sharedir_)/ui
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    48
 
-	install -m 644 \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    49
 
+	ginstall -m 444 \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    50
 
 		data/icons/*.xpm \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    51
 
 		data/icons/*.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    52
 
 		$(DESTDIR)$(sharedir_)/icons
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    53
 
-	install -m 644 data/icons/icon.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    54
 
+	ginstall -m 444 data/icons/icon.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    55
 
 		$(DESTDIR)$(sharedir)/pixmaps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    56
 
-	install -m 644 data/icons/16x16/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    57
 
+	ginstall -m 444 data/icons/16x16/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    58
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    59
 
-	install -m 644 data/icons/22x22/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    60
 
+	ginstall -m 444 data/icons/22x22/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    61
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    62
 
-	install -m 644 data/icons/32x32/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    63
 
+	ginstall -m 444 data/icons/32x32/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    64
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    65
 
-	install -m 644 data/icons/48x48/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    66
 
+	ginstall -m 444 data/icons/48x48/meld.png \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    67
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    68
 
-	install -m 644 data/icons/48x48/meld.svg \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    69
 
+	ginstall -m 444 data/icons/48x48/meld.svg \
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    70
 
 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    71
 
 	$(MAKE) -C po install
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset 
    72
 
 	$(MAKE) -C help install
upstream/oracle/userland-gate