[Pkg-wmaker-commits] [wmrack] 85/97: debian/patches: (rename_configure.in.patch) Split from update_autotools.patch to increase readability.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sat Aug 22 02:42:09 UTC 2015


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

dtorrance-guest pushed a commit to branch master
in repository wmrack.

commit d93289665ec2d1f758dec6d238b3453c65794105
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sun Dec 28 15:36:49 2014 -0600

    debian/patches: (rename_configure.in.patch) Split from update_autotools.patch to increase readability.
---
 ...e_autotools.patch => rename_configure.in.patch} |  31 +--
 debian/patches/series                              |   1 +
 debian/patches/update_autotools.patch              | 234 ++-------------------
 3 files changed, 17 insertions(+), 249 deletions(-)

diff --git a/debian/patches/update_autotools.patch b/debian/patches/rename_configure.in.patch
similarity index 88%
copy from debian/patches/update_autotools.patch
copy to debian/patches/rename_configure.in.patch
index 43e5983..cce36aa 100644
--- a/debian/patches/update_autotools.patch
+++ b/debian/patches/rename_configure.in.patch
@@ -1,10 +1,7 @@
-Description: Update autotools files
- In particular,
- - rename configure.in to configure.ac
- - avoid "missing template" warning for HAVE_GNUSTEP
- - avoid "'Makefile.in' seems to ignore the --datarootdir setting" warning
+Description: Rename configure.in to configure.ac to avoid autoconf warning.
+ Split from update_autotools.patch.
 Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-08-14
+Last-Update: 2014-12-28
 
 --- a/configure.in
 +++ /dev/null
@@ -214,7 +211,7 @@ Last-Update: 2014-08-14
 +  if test -d "$prefix/GNUstep" -o -d "$ac_default_prefix/GNUstep"; then
 +    libdir=[\${prefix}/GNUstep/Library]
 +    echo " $libdir"
-+    AC_DEFINE(HAVE_GNUSTEP, 1, [Define if you want GNUstep compliant paths.])
++    AC_DEFINE(HAVE_GNUSTEP)
 +  else
 +    echo " NOT FOUND -- DISABLED"
 +  fi
@@ -226,23 +223,3 @@ Last-Update: 2014-08-14
 +dnl create output
 +dnl
 +AC_OUTPUT(Makefile XPM/Makefile)
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -24,6 +24,7 @@
- BINDIR = @bindir@
- MANDIR = @mandir@
- LIBDIR = @libdir@/WMRack
-+datarootdir = @datarootdir@
- 
- MAN1DIR = $(MANDIR)/man1
- 
---- a/XPM/Makefile.in
-+++ b/XPM/Makefile.in
-@@ -8,6 +8,7 @@
- BINDIR = @bindir@
- MANDIR = @mandir@
- LIBDIR = @libdir@/WMRack
-+datarootdir = @datarootdir@
- 
- standart.style: grey.style
- 	$(LN) grey.style standart.style
diff --git a/debian/patches/series b/debian/patches/series
index 6bf1530..b4e26bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fix_manpage.patch
 add_format_arg_to_fprintf.patch
+rename_configure.in.patch
 update_autotools.patch
 fix_hurd_ftbfs.patch
 fix_kfreebsd_ftbfs.patch
diff --git a/debian/patches/update_autotools.patch b/debian/patches/update_autotools.patch
index 43e5983..38df4be 100644
--- a/debian/patches/update_autotools.patch
+++ b/debian/patches/update_autotools.patch
@@ -1,231 +1,10 @@
 Description: Update autotools files
  In particular,
- - rename configure.in to configure.ac
  - avoid "missing template" warning for HAVE_GNUSTEP
  - avoid "'Makefile.in' seems to ignore the --datarootdir setting" warning
 Author: Doug Torrance <dtorrance at monmouthcollege.edu>
-Last-Update: 2014-08-14
+Last-Update: 2014-12-28
 
---- a/configure.in
-+++ /dev/null
-@@ -1,107 +0,0 @@
--dnl
--dnl WMRack autoconf stuff
--dnl
--dnl Copyright (c) 1997 by Oliver Graf <ograf at fga.de>
--dnl
--
--AC_INIT(wmrack.c)
--AC_CONFIG_HEADER(config.h)
--
--dnl package switches
--dnl
--dnl AC_ARG_WITH(cdplayer,[  --with-cdplayer	Include cdplayer support.])
--dnl AC_ARG_WITH(mixer,   [  --with-mixer	Include mixer support.])
--AC_ARG_WITH(debug, [  --with-debug         Compile with extra debug messages.])
--AC_ARG_WITH(gnustep, \
--[  --without-gnustep       Don't use GNUstep style library paths.])
--
--dnl check for standart compile && install stuff
--dnl
--AC_PROG_CC
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_SUBST(INSTALL)
--
--dnl check for needed headers
--dnl
--AC_HEADER_STDC
--AC_CHECK_HEADER(unistd.h)
--
--dnl Check for Linux CDROM support
--dnl
--dnl if test "x${enable_cdplayer}" = "xno"; then
--dnl   AC_MSG_WARN([cdplayer feature disabled])
--dnl else
--dnl   AC_MSG_CHECKING([for cdplayer support])
--dnl   AC_EGREP_HEADER([struct cdrom_msf],linux/cdrom.h,[echo yes
--dnl AC_DEFINE(WITH_CDPLAYER,linux)],[echo no])
--dnl fi
--
--dnl Check for Linux MIXER support
--dnl
--dnl if test "x${enable_mixer}" = "xno"; then
--dnl   AC_MSG_WARN([mixer feature disabled])
--dnl else
--dnl   AC_MSG_CHECKING([for mixer support])
--dnl   AC_EGREP_HEADER([typedef struct mixer_info],linux/soundcard.h,[echo yes
--dnl AC_DEFINE(WITH_MIXER,linux)],[echo no])
--dnl fi
--
--dnl check for X11
--dnl
--AC_PATH_X
--if test "x$no_x" = "xyes"; then
--  AC_MSG_ERROR([WMRack needs X Windows!!!])
--else
--  CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
--  LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
--  CPPFLAGS="$CPPFLAGS ${x_includes:+-I$x_includes}"
--fi
--
--dnl check for Xpm
--dnl
--AC_CHECK_LIB(Xpm,XpmCreatePixmapFromBuffer,\
--	[LIBS="$LIBS -lXpm"],\
--	AC_MSG_ERROR([WMRack needs XPM support!!!]),\
--	-lX11)
--
--dnl check for Shape extensions
--dnl
--AC_CHECK_HEADER(X11/extensions/shape.h,[],\
--	[AC_MSG_ERROR([WMRack needs X11 Shape extensions!!!])])
--AC_CHECK_LIB(Xext,XShapeCombineMask,\
--	[LIBS="$LIBS -lXext"],\
--	AC_MSG_ERROR([WMRack needs the X11 extension library!!!]),\
--	-lX11)
--
--dnl check for extra package options
--dnl
--echo
--
--dnl DEBUG
--if test "x${with_debug}" = "xyes"; then
--  echo "adding extra DEBUG output"
--  CFLAGS="-ggdb -DDEBUG $CFLAGS"
--fi
--
--dnl GNUstep paths
--if test "x${with_gnustep}" = "xno"; then
--  echo "GNUstep path standarts disabled"
--else
--  echo -n "Trying to detect GNUstep paths..."
--  if test -d "$prefix/GNUstep" -o -d "$ac_default_prefix/GNUstep"; then
--    libdir=[\${prefix}/GNUstep/Library]
--    echo " $libdir"
--    AC_DEFINE(HAVE_GNUSTEP)
--  else
--    echo " NOT FOUND -- DISABLED"
--  fi
--fi
--
--echo
--
--dnl All done
--dnl create output
--dnl
--AC_OUTPUT(Makefile XPM/Makefile)
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,107 @@
-+dnl
-+dnl WMRack autoconf stuff
-+dnl
-+dnl Copyright (c) 1997 by Oliver Graf <ograf at fga.de>
-+dnl
-+
-+AC_INIT(wmrack.c)
-+AC_CONFIG_HEADER(config.h)
-+
-+dnl package switches
-+dnl
-+dnl AC_ARG_WITH(cdplayer,[  --with-cdplayer	Include cdplayer support.])
-+dnl AC_ARG_WITH(mixer,   [  --with-mixer	Include mixer support.])
-+AC_ARG_WITH(debug, [  --with-debug         Compile with extra debug messages.])
-+AC_ARG_WITH(gnustep, \
-+[  --without-gnustep       Don't use GNUstep style library paths.])
-+
-+dnl check for standart compile && install stuff
-+dnl
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+
-+AC_SUBST(INSTALL)
-+
-+dnl check for needed headers
-+dnl
-+AC_HEADER_STDC
-+AC_CHECK_HEADER(unistd.h)
-+
-+dnl Check for Linux CDROM support
-+dnl
-+dnl if test "x${enable_cdplayer}" = "xno"; then
-+dnl   AC_MSG_WARN([cdplayer feature disabled])
-+dnl else
-+dnl   AC_MSG_CHECKING([for cdplayer support])
-+dnl   AC_EGREP_HEADER([struct cdrom_msf],linux/cdrom.h,[echo yes
-+dnl AC_DEFINE(WITH_CDPLAYER,linux)],[echo no])
-+dnl fi
-+
-+dnl Check for Linux MIXER support
-+dnl
-+dnl if test "x${enable_mixer}" = "xno"; then
-+dnl   AC_MSG_WARN([mixer feature disabled])
-+dnl else
-+dnl   AC_MSG_CHECKING([for mixer support])
-+dnl   AC_EGREP_HEADER([typedef struct mixer_info],linux/soundcard.h,[echo yes
-+dnl AC_DEFINE(WITH_MIXER,linux)],[echo no])
-+dnl fi
-+
-+dnl check for X11
-+dnl
-+AC_PATH_X
-+if test "x$no_x" = "xyes"; then
-+  AC_MSG_ERROR([WMRack needs X Windows!!!])
-+else
-+  CFLAGS="$CFLAGS ${x_includes:+-I$x_includes}"
-+  LIBS="$LIBS ${x_libraries:+-L$x_libraries} -lX11"
-+  CPPFLAGS="$CPPFLAGS ${x_includes:+-I$x_includes}"
-+fi
-+
-+dnl check for Xpm
-+dnl
-+AC_CHECK_LIB(Xpm,XpmCreatePixmapFromBuffer,\
-+	[LIBS="$LIBS -lXpm"],\
-+	AC_MSG_ERROR([WMRack needs XPM support!!!]),\
-+	-lX11)
-+
-+dnl check for Shape extensions
-+dnl
-+AC_CHECK_HEADER(X11/extensions/shape.h,[],\
-+	[AC_MSG_ERROR([WMRack needs X11 Shape extensions!!!])])
-+AC_CHECK_LIB(Xext,XShapeCombineMask,\
-+	[LIBS="$LIBS -lXext"],\
-+	AC_MSG_ERROR([WMRack needs the X11 extension library!!!]),\
-+	-lX11)
-+
-+dnl check for extra package options
-+dnl
-+echo
-+
-+dnl DEBUG
-+if test "x${with_debug}" = "xyes"; then
-+  echo "adding extra DEBUG output"
-+  CFLAGS="-ggdb -DDEBUG $CFLAGS"
-+fi
-+
-+dnl GNUstep paths
-+if test "x${with_gnustep}" = "xno"; then
-+  echo "GNUstep path standarts disabled"
-+else
-+  echo -n "Trying to detect GNUstep paths..."
-+  if test -d "$prefix/GNUstep" -o -d "$ac_default_prefix/GNUstep"; then
-+    libdir=[\${prefix}/GNUstep/Library]
-+    echo " $libdir"
-+    AC_DEFINE(HAVE_GNUSTEP, 1, [Define if you want GNUstep compliant paths.])
-+  else
-+    echo " NOT FOUND -- DISABLED"
-+  fi
-+fi
-+
-+echo
-+
-+dnl All done
-+dnl create output
-+dnl
-+AC_OUTPUT(Makefile XPM/Makefile)
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -24,6 +24,7 @@
@@ -246,3 +25,14 @@ Last-Update: 2014-08-14
  
  standart.style: grey.style
  	$(LN) grey.style standart.style
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,7 +93,7 @@
+   if test -d "$prefix/GNUstep" -o -d "$ac_default_prefix/GNUstep"; then
+     libdir=[\${prefix}/GNUstep/Library]
+     echo " $libdir"
+-    AC_DEFINE(HAVE_GNUSTEP)
++    AC_DEFINE(HAVE_GNUSTEP, 1, [Define if you want GNUstep compliant paths.])
+   else
+     echo " NOT FOUND -- DISABLED"
+   fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmrack.git



More information about the Pkg-wmaker-commits mailing list