[Freeciv-Dev] (PR#6968) Remove debian files from tarballs

["Jordi Mallach" <jordi@xxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=6968 >

This transaction appears to have no content

Hi guys!

As you might know (from IRC discussions), having a debian/ dir in the
upstream tarball makes the Debian work a bit more difficult, as
patch conflicts happen quite regularly between the upstream debian/ and
the official debian/.

When I've discussed this on IRC, I think nobody thought removing the
files from CVS was the best idea (even if they are awfully outdated --
more on this later). What we thought could be done is to have them on
CVS but not on the tarballs. Just removing them from EXTRA_DIST will
suffice; the attached patch does it. It would be really nice to have
this done for 1.14.1.

When freeciv 1.14.1 final is released I'll send in an updated debian/
dir.

Thanks,
Jordi, aka Oskuro.
-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
jordi@xxxxxxxxxxxxxx     jordi@xxxxxxxxxx     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/~jordi/

Index: Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/Makefile.am,v
retrieving revision 1.24.2.3
diff -u -r1.24.2.3 Makefile.am
--- Makefile.am 2003/09/21 08:56:26     1.24.2.3
+++ Makefile.am 2003/11/28 11:03:47
@@ -42,28 +42,6 @@
                amiga/smakefile                 \
                amiga/vmakefile                 \
                amiga/vsnprintf.c               \
-               debian/INSTALL.debian           \
-               debian/README.debian            \
-               debian/build.debian             \
-               debian/changelog                \
-               debian/civclient.6              \
-               debian/civserver.6              \
-               debian/control                  \
-               debian/copyright                \
-               debian/dirs                     \
-               debian/docs                     \
-               debian/freeciv-gtk.dirs         \
-               debian/freeciv-gtk.menu         \
-               debian/freeciv-gtk.postinst     \
-               debian/freeciv-gtk.postrm       \
-               debian/freeciv-xaw3d.dirs       \
-               debian/freeciv-xaw3d.menu       \
-               debian/freeciv-xaw3d.postinst   \
-               debian/freeciv-xaw3d.postrm     \
-               debian/freeciv.desktop          \
-               debian/menu                     \
-               debian/rules                    \
-               debian/watch                    \
                m4/ac_path_lib.m4               \
                m4/locale.m4                    \
                m4/debug.m4                     \

signature.asc
Description: PGP signature