[prev in list] [next in list] [prev in thread] [next in thread]
List: ogg-dev
Subject: [ogg-dev] Please remove the debian/ subdirectory in several
From: Adeodato =?utf-8?B?U2ltw7M=?= <adeodato () debian ! org>
Date: 2006-01-18 22:09:17
Message-ID: 20060118220917.GA21008 () chistera ! yi ! org
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
[Attachment #4 (multipart/mixed)]
Hello,
I've recently started to take care of some Xiph.org packages in Debian
(namely, ao, ogg, vorbis and theora), and I have noticed that a debian/
subdir exists both in svn and in the released tarballs. I'd like to
ask that these are removed.
With respect to tarballs, most Debian developers prefer not to have a
debian/ subdir in upstream's tarballs, since several of our tools work
better if upstream code and Debian specific bits are kept separate;
also, some kind of changes (e.g., removal of a file under debian/) are
not even supported.
So please apply the attached patch to svn/trunk so that debian/ gets
not shipped in the next tarballs that you release.
And as for debian/ being present in upstream's VCS, this normally
makes sense when the person doing the package has commit access to
such VCS, but it's suboptimal when the people making the packages can
change over time. Since I've put these debian/ subdirs in our own svn
repository [1], I don't think it makes much sense to keep an outdated
copy in svn.xiph.org.
[1] svn://svn.debian.org/pkg-xiph
So please issue the following command from svn/trunk:
% svn rm ao/debian ogg/debian theora/debian vorbis/debian
Thanks in advance,
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
Beauty, brains, availability, personality: pick any two.
["xiph-dont-ship-debian-subdir.diff" (text/plain)]
Index: ao/configure.in
===================================================================
--- ao/configure.in (revision 10738)
+++ ao/configure.in (working copy)
@@ -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)
Index: ao/Makefile.am
===================================================================
--- ao/Makefile.am (revision 10738)
+++ ao/Makefile.am (working copy)
@@ -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
Index: ao/autogen.sh
===================================================================
--- ao/autogen.sh (revision 10738)
+++ ao/autogen.sh (working copy)
@@ -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
Index: ogg/README
===================================================================
--- ogg/README (revision 10738)
+++ ogg/README (working copy)
@@ -23,8 +23,6 @@
./include Library API headers and codebooks
-./debian Rules/spec files for building Debian .deb packages
-
./doc Ogg specification documents
./win32 Win32 projects and build automation
Index: ogg/Makefile.am
===================================================================
--- ogg/Makefile.am (revision 10738)
+++ ogg/Makefile.am (working copy)
@@ -10,18 +10,12 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ogg.pc
-# we include the whole debian/ dir in EXTRA_DIST because there's a problem
-# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
-# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
-# because of it, breaking make dist. This works just as well.
EXTRA_DIST = README AUTHORS CHANGES COPYING \
libogg.spec libogg.spec.in \
ogg.m4 ogg.pc.in ogg-uninstalled.pc.in \
- debian macos macosx win32
+ macos macosx win32
dist-hook:
- rm -rf `find $(distdir)/debian -name .svn`
- rm -rf `find $(distdir)/debian -name "Makefile*"`
rm -rf `find $(distdir)/macos -name .svn`
rm -rf `find $(distdir)/macosx -name .svn`
rm -rf `find $(distdir)/win32 -name .svn`
Index: theora/Makefile.am
===================================================================
--- theora/Makefile.am (revision 10738)
+++ theora/Makefile.am (working copy)
@@ -4,21 +4,14 @@
SUBDIRS = lib include doc examples tests m4
-# we include the whole debian/ dir in EXTRA_DIST because there's a problem
-# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
-# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
-# because of it, breaking make dist. This works just as well.
EXTRA_DIST = \
COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
- theora-uninstalled.pc.in \
- debian
+ theora-uninstalled.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = theora.pc
dist-hook:
- rm -rf `find $(distdir)/debian -name .svn`
- rm -rf `find $(distdir)/debian -name "Makefile*"`
rm -rf `find $(distdir)/win32 -name .svn`
debug:
Index: vorbis/README
===================================================================
--- vorbis/README (revision 10738)
+++ vorbis/README (working copy)
@@ -51,8 +51,6 @@
./include Library API headers
-./debian Rules/spec files for building Debian .deb packages
-
./doc Vorbis documentation
./examples Example code illustrating programmatic use of libvorbis,
Index: vorbis/Makefile.am
===================================================================
--- vorbis/Makefile.am (revision 10738)
+++ vorbis/Makefile.am (working copy)
@@ -10,10 +10,6 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
-# we include the whole debian/ dir in EXTRA_DIST because there's a problem
-# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
-# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
-# because of it, breaking make dist. This works just as well.
EXTRA_DIST = \
todo.txt autogen.sh \
libvorbis.spec libvorbis.spec.in \
@@ -22,14 +18,12 @@
vorbis-uninstalled.pc.in \
vorbisenc-uninstalled.pc.in \
vorbisfile-uninstalled.pc.in \
- debian macos macosx win32
+ macos macosx win32
DISTCHECK_CONFIGURE_FLAGS = --enable-docs
dist-hook:
- rm -rf `find $(distdir)/debian -name .svn`
- rm -rf `find $(distdir)/debian -name "Makefile*"`
rm -rf `find $(distdir)/macos -name .svn`
rm -rf `find $(distdir)/macosx -name .svn`
rm -rf `find $(distdir)/win32 -name .svn`
["signature.asc" (application/pgp-signature)]
_______________________________________________
ogg-dev mailing list
ogg-dev@xiph.org
http://lists.xiph.org/mailman/listinfo/ogg-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic