r29 - in trunk/packages/libao/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2006-01-16 23:54:43 +0000 (Mon, 16 Jan 2006)
New Revision: 29

Added:
   trunk/packages/libao/debian/patches/
   trunk/packages/libao/debian/patches/no_debian_subdir.diff
   trunk/packages/libao/debian/patches/series
Removed:
   trunk/packages/libao/debian/Makefile.am
   trunk/packages/libao/debian/Makefile.in
Modified:
   trunk/packages/libao/debian/changelog
Log:
no_debian_subdir.diff: teach Makefile.in and configure that debian/ is
not a subdirectory that they should be caring about.


Deleted: trunk/packages/libao/debian/Makefile.am

Deleted: trunk/packages/libao/debian/Makefile.in

Modified: trunk/packages/libao/debian/changelog
===================================================================
--- trunk/packages/libao/debian/changelog	2006-01-16 23:52:33 UTC (rev 28)
+++ trunk/packages/libao/debian/changelog	2006-01-16 23:54:43 UTC (rev 29)
@@ -9,6 +9,10 @@
     + drop version restriction on debhelper build-dependency, since it's
       already satisfied with stable.
 
+  * debian/patches:
+    + no_debian_subdir.diff: teach Makefile.in and configure that debian/ is
+      not a subdirectory that they should be caring about.
+
   * Update download URL in debian/copyright.
 
   * Add debian/watch file.

Added: trunk/packages/libao/debian/patches/no_debian_subdir.diff
===================================================================
--- trunk/packages/libao/debian/patches/no_debian_subdir.diff	2006-01-16 23:52:33 UTC (rev 28)
+++ trunk/packages/libao/debian/patches/no_debian_subdir.diff	2006-01-16 23:54:43 UTC (rev 29)
@@ -0,0 +1,30 @@
+--- libao-0.8.6.orig/Makefile.in
++++ libao-0.8.6/Makefile.in
+@@ -227,7 +227,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
+-SUBDIRS = src include doc debian
++SUBDIRS = src include doc
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = ao.m4
+ pkgconfigdir = $(libdir)/pkgconfig
+--- libao-0.8.6.orig/configure
++++ libao-0.8.6/configure
+@@ -24222,7 +24222,7 @@
+ 
+ 
+ 
+-                                                                                                                                                                                              ac_config_files="$ac_config_files 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_config_files="$ac_config_files 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"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -24913,7 +24913,6 @@
+   "src/plugins/macosx/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/macosx/Makefile" ;;
+   "src/plugins/nas/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/nas/Makefile" ;;
+   "src/plugins/polyp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/plugins/polyp/Makefile" ;;
+-  "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+   "ao.pc" ) CONFIG_FILES="$CONFIG_FILES ao.pc" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

Added: trunk/packages/libao/debian/patches/series
===================================================================
--- trunk/packages/libao/debian/patches/series	2006-01-16 23:52:33 UTC (rev 28)
+++ trunk/packages/libao/debian/patches/series	2006-01-16 23:54:43 UTC (rev 29)
@@ -0,0 +1 @@
+no_debian_subdir.diff