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

Unified 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, 3 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/08_add_licenses.patch
diff --git a/patches/08_add_licenses.patch b/patches/08_add_licenses.patch
index 97fd856a1a1dec0d47ce317c0bfb53e5abc1804f..94532d6093c256bb1e5297fcec76ee9e62ca4992 100644
--- a/patches/08_add_licenses.patch
+++ b/patches/08_add_licenses.patch
@@ -1,7 +1,7 @@
-Index: examples/evolution-sync.sh
-===================================================================
---- examples/evolution-sync.sh (revision 148712)
-+++ examples/evolution-sync.sh (working copy)
+diff --git a/examples/evolution-sync.sh b/examples/evolution-sync.sh
+index 53ca0b9..0c54a32 100755
+--- a/examples/evolution-sync.sh
++++ b/examples/evolution-sync.sh
@@ -1,4 +1,21 @@
#!/bin/bash
+#
@@ -24,51 +24,19 @@ Index: examples/evolution-sync.sh
# Example evolution synchronization script by Nicolas Tetreault,
# modified by Linus Walleij.
-Index: src/ptp-pack.c
-===================================================================
---- src/ptp-pack.c (revision 149246)
-+++ src/ptp-pack.c (working copy)
-@@ -1,3 +1,27 @@
-+/* ptp-pack.c
-+ *
-+ * Copyright (C) 2001-2004 Mariusz Woloszyn <emsi@ipartners.pl>
-+ * Copyright (C) 2003-2012 Marcus Meissner <marcus@jet.franken.de>
-+ * Copyright (C) 2006-2008 Linus Walleij <triad@df.lth.se>
-+ * Copyright (C) 2007 Tero Saarni <tero.saarni@gmail.com>
-+ * Copyright (C) 2009 Axel Waggershauser <awagger@web.de>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
- /* currently this file is included into ptp.c */
-
- #ifdef HAVE_ICONV
-Index: ltmain.sh
-===================================================================
---- ltmain.sh (revision 148712)
-+++ ltmain.sh (working copy)
+diff --git a/ltmain.sh b/ltmain.sh
+index 63ae69d..96b101f 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -1,4 +1,3 @@
-
# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-Index: doc/examples.h
-===================================================================
---- doc/examples.h (revision 148712)
-+++ doc/examples.h (working copy)
+diff --git a/doc/examples.h b/doc/examples.h
+index 3e88ca4..d6dbbcd 100644
+--- a/doc/examples.h
++++ b/doc/examples.h
@@ -1,3 +1,23 @@
+/**
+ *
@@ -93,10 +61,10 @@ Index: doc/examples.h
/*
* List examples here...
*/
-Index: doc/mainpage.h
-===================================================================
---- doc/mainpage.h (revision 148712)
-+++ doc/mainpage.h (working copy)
+diff --git a/doc/mainpage.h b/doc/mainpage.h
+index 19ef339..5e83263 100644
+--- a/doc/mainpage.h
++++ b/doc/mainpage.h
@@ -1,4 +1,24 @@
/**
+ *
« 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