[SCM] gigedit packaging branch, master, updated. upstream/0.2.0-25-gb041fb6

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 102a85258014318b9536dd94e94e01cd25371d74
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 17 01:06:34 2010 +0200

    Refresh debian/patches/01-makefiles.patch.

diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
index edcc3c0..9940e3a 100644
--- a/debian/patches/01-makefiles.patch
+++ b/debian/patches/01-makefiles.patch
@@ -11,31 +11,31 @@
 -SUBDIRS = src gfx po debian doc win32
 +SUBDIRS = src gfx po doc win32
  
- EXTRA_DIST =			\
- 	intltool-extract.in	\
+ DISTCLEANFILES =		\
+ 	intltool-extract	\
 --- gigedit.orig/Makefile.in
 +++ gigedit/Makefile.in
-@@ -231,7 +231,7 @@ sysconfdir = @sysconfdir@
+@@ -237,7 +237,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ 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	\
+ DISTCLEANFILES = \
+ 	intltool-extract	\
+ 	intltool-merge		\
 --- gigedit.orig/configure
 +++ gigedit/configure
-@@ -22479,7 +22479,7 @@ fi
+@@ -23619,7 +23619,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"
+-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
-@@ -23090,7 +23090,6 @@ do
+@@ -24232,7 +24232,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" ;;
@@ -45,7 +45,7 @@
      "win32/libgigedit.dev") CONFIG_FILES="$CONFIG_FILES win32/libgigedit.dev" ;;
 --- gigedit.orig/configure.ac
 +++ gigedit/configure.ac
-@@ -125,7 +125,6 @@ AC_CONFIG_FILES([
+@@ -187,7 +187,6 @@ AC_CONFIG_FILES([
  	src/plugin/Makefile
  	gfx/Makefile
  	po/Makefile.in

-- 
gigedit packaging