Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: patches/08_add_licenses.patch

Issue 2345493002: Uprev libmtp to 1.1.12 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master
Patch Set: Re-upload cl Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 Index: examples/evolution-sync.sh 1 diff --git a/examples/evolution-sync.sh b/examples/evolution-sync.sh
2 =================================================================== 2 index 53ca0b9..0c54a32 100755
3 --- examples/evolution-sync.sh» (revision 148712) 3 --- a/examples/evolution-sync.sh
4 +++ examples/evolution-sync.sh» (working copy) 4 +++ b/examples/evolution-sync.sh
5 @@ -1,4 +1,21 @@ 5 @@ -1,4 +1,21 @@
6 #!/bin/bash 6 #!/bin/bash
7 +# 7 +#
8 +# Copyright (C) 2006 Linus Walleij <triad@df.lth.se> 8 +# Copyright (C) 2006 Linus Walleij <triad@df.lth.se>
9 +# 9 +#
10 +# This library is free software; you can redistribute it and/or 10 +# This library is free software; you can redistribute it and/or
11 +# modify it under the terms of the GNU Lesser General Public 11 +# modify it under the terms of the GNU Lesser General Public
12 +# License as published by the Free Software Foundation; either 12 +# License as published by the Free Software Foundation; either
13 +# version 2 of the License, or (at your option) any later version. 13 +# version 2 of the License, or (at your option) any later version.
14 +# 14 +#
15 +# This library is distributed in the hope that it will be useful, 15 +# This library is distributed in the hope that it will be useful,
16 +# but WITHOUT ANY WARRANTY; without even the implied warranty of 16 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
17 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 17 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 +# Lesser General Public License for more details. 18 +# Lesser General Public License for more details.
19 +# 19 +#
20 +# You should have received a copy of the GNU Lesser General Public 20 +# You should have received a copy of the GNU Lesser General Public
21 +# License along with this library; if not, write to the 21 +# License along with this library; if not, write to the
22 +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, 22 +# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 +# Boston, MA 02111-1307, USA. 23 +# Boston, MA 02111-1307, USA.
24 24
25 # Example evolution synchronization script by Nicolas Tetreault, 25 # Example evolution synchronization script by Nicolas Tetreault,
26 # modified by Linus Walleij. 26 # modified by Linus Walleij.
27 Index: src/ptp-pack.c 27 diff --git a/ltmain.sh b/ltmain.sh
28 =================================================================== 28 index 63ae69d..96b101f 100644
29 --- src/ptp-pack.c» (revision 149246) 29 --- a/ltmain.sh
30 +++ src/ptp-pack.c» (working copy) 30 +++ b/ltmain.sh
31 @@ -1,3 +1,27 @@
32 +/* ptp-pack.c
33 + *
34 + * Copyright (C) 2001-2004 Mariusz Woloszyn <emsi@ipartners.pl>
35 + * Copyright (C) 2003-2012 Marcus Meissner <marcus@jet.franken.de>
36 + * Copyright (C) 2006-2008 Linus Walleij <triad@df.lth.se>
37 + * Copyright (C) 2007 Tero Saarni <tero.saarni@gmail.com>
38 + * Copyright (C) 2009 Axel Waggershauser <awagger@web.de>
39 + *
40 + * This library is free software; you can redistribute it and/or
41 + * modify it under the terms of the GNU Lesser General Public
42 + * License as published by the Free Software Foundation; either
43 + * version 2 of the License, or (at your option) any later version.
44 + *
45 + * This library is distributed in the hope that it will be useful,
46 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
47 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48 + * Lesser General Public License for more details.
49 + *
50 + * You should have received a copy of the GNU Lesser General Public
51 + * License along with this library; if not, write to the
52 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
53 + * Boston, MA 02111-1307, USA.
54 + */
55 +
56 /* currently this file is included into ptp.c */
57
58 #ifdef HAVE_ICONV
59 Index: ltmain.sh
60 ===================================================================
61 --- ltmain.sh» (revision 148712)
62 +++ ltmain.sh» (working copy)
63 @@ -1,4 +1,3 @@ 31 @@ -1,4 +1,3 @@
64 - 32 -
65 # libtool (GNU libtool) 2.4.2 33 # libtool (GNU libtool) 2.4.2
66 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 34 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
67 35
68 Index: doc/examples.h 36 diff --git a/doc/examples.h b/doc/examples.h
69 =================================================================== 37 index 3e88ca4..d6dbbcd 100644
70 --- doc/examples.h» (revision 148712) 38 --- a/doc/examples.h
71 +++ doc/examples.h» (working copy) 39 +++ b/doc/examples.h
72 @@ -1,3 +1,23 @@ 40 @@ -1,3 +1,23 @@
73 +/** 41 +/**
74 + * 42 + *
75 + * Copyright (C) 2006 Linus Walleij <triad@df.lth.se> 43 + * Copyright (C) 2006 Linus Walleij <triad@df.lth.se>
76 + * 44 + *
77 + * This library is free software; you can redistribute it and/or 45 + * This library is free software; you can redistribute it and/or
78 + * modify it under the terms of the GNU Lesser General Public 46 + * modify it under the terms of the GNU Lesser General Public
79 + * License as published by the Free Software Foundation; either 47 + * License as published by the Free Software Foundation; either
80 + * version 2 of the License, or (at your option) any later version. 48 + * version 2 of the License, or (at your option) any later version.
81 + * 49 + *
82 + * This library is distributed in the hope that it will be useful, 50 + * This library is distributed in the hope that it will be useful,
83 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 51 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
84 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 52 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
85 + * Lesser General Public License for more details. 53 + * Lesser General Public License for more details.
86 + * 54 + *
87 + * You should have received a copy of the GNU Lesser General Public 55 + * You should have received a copy of the GNU Lesser General Public
88 + * License along with this library; if not, write to the 56 + * License along with this library; if not, write to the
89 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 57 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
90 + * Boston, MA 02111-1307, USA. 58 + * Boston, MA 02111-1307, USA.
91 + */ 59 + */
92 + 60 +
93 /* 61 /*
94 * List examples here... 62 * List examples here...
95 */ 63 */
96 Index: doc/mainpage.h 64 diff --git a/doc/mainpage.h b/doc/mainpage.h
97 =================================================================== 65 index 19ef339..5e83263 100644
98 --- doc/mainpage.h» (revision 148712) 66 --- a/doc/mainpage.h
99 +++ doc/mainpage.h» (working copy) 67 +++ b/doc/mainpage.h
100 @@ -1,4 +1,24 @@ 68 @@ -1,4 +1,24 @@
101 /** 69 /**
102 + * 70 + *
103 + * Copyright (C) 2006 Linus Walleij <triad@df.lth.se> 71 + * Copyright (C) 2006 Linus Walleij <triad@df.lth.se>
104 + * 72 + *
105 + * This library is free software; you can redistribute it and/or 73 + * This library is free software; you can redistribute it and/or
106 + * modify it under the terms of the GNU Lesser General Public 74 + * modify it under the terms of the GNU Lesser General Public
107 + * License as published by the Free Software Foundation; either 75 + * License as published by the Free Software Foundation; either
108 + * version 2 of the License, or (at your option) any later version. 76 + * version 2 of the License, or (at your option) any later version.
109 + * 77 + *
110 + * This library is distributed in the hope that it will be useful, 78 + * This library is distributed in the hope that it will be useful,
111 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 79 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
112 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 80 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
113 + * Lesser General Public License for more details. 81 + * Lesser General Public License for more details.
114 + * 82 + *
115 + * You should have received a copy of the GNU Lesser General Public 83 + * You should have received a copy of the GNU Lesser General Public
116 + * License along with this library; if not, write to the 84 + * License along with this library; if not, write to the
117 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 85 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
118 + * Boston, MA 02111-1307, USA. 86 + * Boston, MA 02111-1307, USA.
119 + */ 87 + */
120 + 88 +
121 +/** 89 +/**
122 * \mainpage The official libmtp documentation 90 * \mainpage The official libmtp documentation
123 * 91 *
124 * \section Introduction 92 * \section Introduction
OLDNEW
« no previous file with comments | « patches/07_fix_strcpy_in_ptp_unpack_ptptime.patch ('k') | patches/09_do_not_build_udev_and_examples.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698