[xiph-commits] r10739 - in trunk/ao: . debian

[giles at svn.xiph.org]

Author: giles
Date: 2006-01-19 15:14:52 -0800 (Thu, 19 Jan 2006)
New Revision: 10739

Removed:
   trunk/ao/debian/Makefile.am
Modified:
   trunk/ao/Makefile.am
   trunk/ao/autogen.sh
   trunk/ao/configure.in
Log:
Remove the debian directory from distribution tarballs at debian 
maintainer's request.


Modified: trunk/ao/Makefile.am
===================================================================
--- trunk/ao/Makefile.am	2006-01-17 19:53:01 UTC (rev 10738)
+++ trunk/ao/Makefile.am	2006-01-19 23:14:52 UTC (rev 10739)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
 
-SUBDIRS = src include doc debian
+SUBDIRS = src include doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ao.m4

Modified: trunk/ao/autogen.sh
===================================================================
--- trunk/ao/autogen.sh	2006-01-17 19:53:01 UTC (rev 10738)
+++ trunk/ao/autogen.sh	2006-01-19 23:14:52 UTC (rev 10739)
@@ -112,10 +112,5 @@
 echo "  autoconf"
 autoconf || exit 1
 
-# this search and replace hack is specifically for MacOSX where automake
-# picks up changelog in debian/ because of filesystem
-# case-not-quite-sensitivity breaking make distcheck
-perl -i -p -e 's/DIST_COMMON = ChangeLog/DIST_COMMON =/g' debian/Makefile.in
-
 cd $olddir
 $srcdir/configure --enable-maintainer-mode "$@" && echo

Modified: trunk/ao/configure.in
===================================================================
--- trunk/ao/configure.in	2006-01-17 19:53:01 UTC (rev 10738)
+++ trunk/ao/configure.in	2006-01-19 23:14:52 UTC (rev 10739)
@@ -364,4 +364,4 @@
 AC_SUBST(PLUGIN_LDFLAGS)
 
 
-AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile src/plugins/nas/Makefile src/plugins/polyp/Makefile debian/Makefile ao.pc)
+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile src/plugins/nas/Makefile src/plugins/polyp/Makefile ao.pc)

Deleted: trunk/ao/debian/Makefile.am
===================================================================
--- trunk/ao/debian/Makefile.am	2006-01-17 19:53:01 UTC (rev 10738)
+++ trunk/ao/debian/Makefile.am	2006-01-19 23:14:52 UTC (rev 10739)
@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = changelog control copyright libao-dev.docs libao-dev.install \
-	libao.conf libao2.README.Debian libao2.install libao2.manpages rules