[caja-actions] 13/15: Revert "debian/patches:Drop 2003_no-extra-license-file.patch and README."
Mike Gabriel
sunweaver at debian.org
Thu Oct 13 11:29:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository caja-actions.
commit b44e2f82278ec80186f0075d648360da3d95d4fb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Oct 13 11:05:29 2016 +0200
Revert "debian/patches:Drop 2003_no-extra-license-file.patch and README."
This reverts commit e24dc80927b3df289d8934404f063bdc7e029b2c.
Conflicts (resolved by Mike Gabriel):
debian/patches/series
---
debian/patches/2003_no-extra-license-file.patch | 13 +++++++++++++
debian/patches/README | 3 +++
debian/patches/series | 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/debian/patches/2003_no-extra-license-file.patch b/debian/patches/2003_no-extra-license-file.patch
new file mode 100644
index 0000000..3fc1021
--- /dev/null
+++ b/debian/patches/2003_no-extra-license-file.patch
@@ -0,0 +1,13 @@
+Description: Don't ship the COPYING file in the caja-actions .deb package
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -87,7 +87,6 @@
+ ChangeLog-2010 \
+ ChangeLog-2011 \
+ ChangeLog-2012 \
+- COPYING \
+ INSTALL \
+ MAINTAINERS \
+ NEWS \
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
index 5a11197..c3dca52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-
1001_fix-spelling-errors.patch
1002_add-keywords-entry-to-desktop-file.patch
1003_no-version-in-doc-path.patch
+2003_no-extra-license-file.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-actions.git
More information about the pkg-mate-commits
mailing list