[SCM] gigedit/master: Not patch Makefile.in and configure file.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sat Dec 3 00:39:55 UTC 2016
The following commit has been merged in the master branch:
commit c50dbb53f92c19ebe97b8f9c7e8f870af1fe8289
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sat Dec 3 00:42:13 2016 +0100
Not patch Makefile.in and configure file.
diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
index a0472b3..82a46b0 100644
--- a/debian/patches/01-makefiles.patch
+++ b/debian/patches/01-makefiles.patch
@@ -1,12 +1,6 @@
Description: Skip Makefile,configure scripts which are in the debian/ directory.
Origin: Debian
Forwarded: no
----
- Makefile.am | 2 +-
- Makefile.in | 2 +-
- configure | 3 +--
- configure.ac | 1 -
- 4 files changed, 3 insertions(+), 5 deletions(-)
Index: gigedit/Makefile.am
===================================================================
@@ -18,40 +12,6 @@ Index: gigedit/Makefile.am
DISTCLEANFILES = \
intltool-extract \
-Index: gigedit/Makefile.in
-===================================================================
---- gigedit.orig/Makefile.in
-+++ gigedit/Makefile.in
-@@ -364,7 +364,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src gfx po debian doc win32
-+SUBDIRS = src gfx po doc win32
- DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
-Index: gigedit/configure
-===================================================================
---- gigedit.orig/configure
-+++ gigedit/configure
-@@ -18753,7 +18753,7 @@ END
- fi
-
-
--ac_config_files="$ac_config_files Makefile src/Makefile src/gigedit/Makefile src/plugin/Makefile gfx/Makefile po/Makefile.in debian/Makefile doc/Makefile doc/quickstart/Makefile win32/libgigedit.dev win32/gigedit.dev win32/gigedit.nsi win32/Makefile gigedit.spec"
-+ac_config_files="$ac_config_files Makefile src/Makefile src/gigedit/Makefile src/plugin/Makefile gfx/Makefile po/Makefile.in doc/Makefile doc/quickstart/Makefile win32/libgigedit.dev win32/gigedit.dev win32/gigedit.nsi win32/Makefile gigedit.spec"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -19897,7 +19897,6 @@ do
- "src/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin/Makefile" ;;
- "gfx/Makefile") CONFIG_FILES="$CONFIG_FILES gfx/Makefile" ;;
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-- "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
- "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "doc/quickstart/Makefile") CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;;
- "win32/libgigedit.dev") CONFIG_FILES="$CONFIG_FILES win32/libgigedit.dev" ;;
Index: gigedit/configure.ac
===================================================================
--- gigedit.orig/configure.ac
--
gigedit packaging
More information about the pkg-multimedia-commits
mailing list