[mate-system-tools] 04/20: debian/patches: Add README file explaining our patch naming scheme.

Mike Gabriel sunweaver at debian.org
Sat Oct 25 07:59:32 UTC 2014


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

sunweaver pushed a commit to branch master
in repository mate-system-tools.

commit 5b944049c2d307a66d56ef799d743df2487bbacb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 25 02:23:03 2014 +0200

    debian/patches: Add README file explaining our patch naming scheme.
---
 debian/changelog                               |  2 +-
 debian/copyright                               | 46 +-------------------------
 debian/patches/00-fix-undefined-reference.diff | 13 --------
 debian/patches/README                          |  3 ++
 debian/patches/series                          |  1 -
 5 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 903dcba..748a0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-system-tools (1.6.0-1) UNRELEASED; urgency=low
+mate-system-tools (1.8.1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #734959).
 
diff --git a/debian/copyright b/debian/copyright
index db937fa..d098e3d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -136,50 +136,6 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: 2011, Stefano Karapetsas <stefano at karapetsas.com>
-           2013, Mike Gabriel <sunweaver at debian.org>
+           2013-2014, Mike Gabriel <sunweaver at debian.org>
 License: GPL-2+
 
-License: GPL-2+
- 
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your opinion) any later version.
-.
-This package 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 Genaral Public License for more details.
-.
-You should have received a copy og the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>
-.
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: LGPL
-
-  The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-.
-On Debian systems, the complete text of the GNU General
-Public License version LGPL can be found in "/usr/share/common-licenses/LGPL".
diff --git a/debian/patches/00-fix-undefined-reference.diff b/debian/patches/00-fix-undefined-reference.diff
deleted file mode 100644
index 4304832..0000000
--- a/debian/patches/00-fix-undefined-reference.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/time/Makefile.am b/src/time/Makefile.am
-index 73e9ee2..02ccf5b 100644
---- a/src/time/Makefile.am
-+++ b/src/time/Makefile.am
-@@ -15,7 +15,7 @@ INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
- CLEANFILES = $(GST_TOOL_CLEANFILES)
- EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
- 
--mate_time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS)
-+mate_time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) -lm
- mate_time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES)
- mate_time_admin_SOURCES = \
- 	time-tool.c \
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ae16f0b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix-undefined-reference.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-system-tools.git



More information about the pkg-mate-commits mailing list