[SCM] gigedit packaging branch, master, updated. debian/0.1.1-2.2-10-g492ce3a

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Aug 16 21:32:48 UTC 2010


The following commit has been merged in the master branch:
commit 80ab79361c42d7916232515edf883361e99e1913
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Aug 16 23:29:52 2010 +0200

    Drop debian/Makefile.* files.

diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
new file mode 100644
index 0000000..edcc3c0
--- /dev/null
+++ b/debian/patches/01-makefiles.patch
@@ -0,0 +1,55 @@
+---
+ Makefile.am  |    2 +-
+ Makefile.in  |    2 +-
+ configure    |    3 +--
+ configure.ac |    1 -
+ 4 files changed, 3 insertions(+), 5 deletions(-)
+
+--- gigedit.orig/Makefile.am
++++ gigedit/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src gfx po debian doc win32
++SUBDIRS = src gfx po doc win32
+ 
+ EXTRA_DIST =			\
+ 	intltool-extract.in	\
+--- gigedit.orig/Makefile.in
++++ gigedit/Makefile.in
+@@ -231,7 +231,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src gfx po debian doc win32
++SUBDIRS = src gfx po doc win32
+ EXTRA_DIST = \
+ 	intltool-extract.in	\
+ 	intltool-merge.in	\
+--- gigedit.orig/configure
++++ gigedit/configure
+@@ -22479,7 +22479,7 @@ 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"
++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"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23090,7 +23090,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" ;;
+--- gigedit.orig/configure.ac
++++ gigedit/configure.ac
+@@ -125,7 +125,6 @@ AC_CONFIG_FILES([
+ 	src/plugin/Makefile
+ 	gfx/Makefile
+ 	po/Makefile.in
+-	debian/Makefile
+ 	doc/Makefile
+ 	doc/quickstart/Makefile
+ 	win32/libgigedit.dev
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ec078aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-makefiles.patch

-- 
gigedit packaging



More information about the pkg-multimedia-commits mailing list