[gazebo] 02/07: Remove merged patch

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Aug 3 01:14:23 UTC 2015


This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository gazebo.

commit 5c90ac2a63602624f13a43eee7f54ab8c6e5ccc4
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu Jul 30 18:21:20 2015 +0000

    Remove merged patch
---
 debian/patches/0001-remove-baemuk-license.patch | 33 -------------------------
 debian/patches/series                           |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/0001-remove-baemuk-license.patch b/debian/patches/0001-remove-baemuk-license.patch
deleted file mode 100644
index ba22614..0000000
--- a/debian/patches/0001-remove-baemuk-license.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: clean up old license file
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1462 
-
-diff --git a/media/gui/fonts/CMakeLists.txt b/media/gui/fonts/CMakeLists.txt
---- a/media/gui/fonts/CMakeLists.txt
-+++ b/media/gui/fonts/CMakeLists.txt
-@@ -1,5 +1,4 @@
- set (files Font.xsd
--           baemuk.txt
-            DejaVuSans-10.font
-            DejaVuSans.ttf
-            FairChar-30.font
-
-diff --git a/media/gui/fonts/baemuk.txt b/media/gui/fonts/baemuk.txt
-deleted file mode 100644
-index 220407d..0000000
---- a/media/gui/fonts/baemuk.txt
-+++ /dev/null
-@@ -1,12 +0,0 @@
--Copyright (c) 1986-2002 Kim Jeong-Hwan
--All rights reserved.
--
--Permission to use, copy, modify and distribute this font is
--hereby granted, provided that both the copyright notice and
--this permission notice appear in all copies of the font,
--derivative works or modified versions, and that the following
--acknowledgement appear in supporting documentation:
--    Baekmuk Batang, Baekmuk Dotum, Baekmuk Gulim, and
--    Baekmuk Headline are registered trademarks owned by
--    Kim Jeong-Hwan.
--
-
diff --git a/debian/patches/series b/debian/patches/series
index b0e0596..61fcee2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-remove-baemuk-license.patch
 0002-missing-license-files.patch
 0003-respect-cmake-c-flags.patch
 0004-update-ann-copyright.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git



More information about the debian-science-commits mailing list