[SCM] x264/master: Fix location to get copy of GPL and LGPL licenses.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Mon Jul 25 23:18:36 UTC 2011
The following commit has been merged in the master branch:
commit a20725ba51ed2ca11cb46e81e25b2745c83be218
Author: Andres Mejia <mcitadel at gmail.com>
Date: Mon Jul 25 19:09:15 2011 -0400
Fix location to get copy of GPL and LGPL licenses.
diff --git a/debian/copyright b/debian/copyright
index e1bf573..9a809cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,8 +17,7 @@ License: GPL-2+ or other
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
.
This program is also available under a commercial proprietary license.
For more information, contact us at licensing at x264.com.
@@ -58,9 +57,7 @@ License: GPL-2+ with other exception
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
- http://www.gnu.org/copyleft/gpl.html .
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
.
As a special exception, I give you permission to link to the
Avisynth C interface with independent modules that communicate with
@@ -92,10 +89,8 @@ License: LGPL-2.1+
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 the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02111-1307 USA.
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Files: extras/inttypes.h
Copyright: 2006 Alexander Chemeris
@@ -153,8 +148,7 @@ License: GPL-2+
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian GNU/Linux systems, the complete text of the GNU General Public
License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
@@ -170,9 +164,8 @@ License: LGPL-2.1+
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public
License can be found in `/usr/share/common-licenses/LGPL-2.1'.
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list