* Changed debian/control to fix Debian bug #83707

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8abb706764cb4fb02e5af4d607452bf3bf45a697..51d9ee7454f6ed6cc04a27873afbb719ced89a2a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -487,7 +487,7 @@ show:
 
 # ugliest of all, but I have no time to do it -- sam
 snapshot:
-       rm -rf /tmp/vlc-@VLC_VERSION@ /tmp/vlc-@VLC_VERSION@nocss
+       rm -rf /tmp/vlc-@VLC_VERSION@* /tmp/vlc-@VLC_VERSION@nocss*
        # copy archive in /tmp
        find -type d | while read i ; \
                do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
@@ -507,7 +507,7 @@ snapshot:
                Makefile.in Makefile.dep configure configure.in install-sh \
                config.sub config.guess todo.pl \
                        /tmp/vlc-@VLC_VERSION@/
-       for file in control vlc-gnome.menu vlc.copyright vlc.docs changelog \
+       for file in control vlc-gtk.menu vlc.copyright vlc.docs changelog \
                rules vlc.1 vlc.dirs vlc.menu ; do \
                        cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
        for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
@@ -521,28 +521,28 @@ snapshot:
        mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
 
        # removing CSS stuff
-#      find /tmp/vlc-@VLC_VERSION@ -type f -name '*css*' | xargs rm -f
-#      for x in Makefile.in src/input/input_dvd.c src/input/input_dvd.h ; do \
-#      rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
-#      perl -ne 'if (/^#e(lse|ndif)/) { $$i=0; } \
-#                      if (/^#if.*DVD/) { $$i=1; print "#if 0\n"; } \
-#                      elsif (!$$i || /^#/) { print $$_; }' \
-#              < $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \
-#      done
-#      rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
-#      sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
-#              > /tmp/vlc-@VLC_VERSION@/debian/changelog
-#
-#      # build nocss archives
-#      (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
-#              tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
-#              bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
-#                      > vlc-@VLC_VERSION@nocss.tar.bz2 ; \
-#              gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
-#      mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
-#              /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
-#
-#      # clean up
+       for x in plugins/dvd/dvd.c plugins/dvd/dvd_css.c ; do \
+       rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
+       perl -ne 'if (/^#e(lse|ndif).*HAVE_CSS/) { $$i=0; } \
+                       if (/^#if.*HAVE_CSS/) { $$i=1; } \
+                       elsif (!$$i && !/^#.*HAVE_CSS/) { print $$_; }' \
+               < $$x >| /tmp/vlc-@VLC_VERSION@/$$x ; \
+       done
+       rm -f /tmp/vlc-@VLC_VERSION@/plugins/dvd/dvd_csstables.c
+       rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
+       sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
+               > /tmp/vlc-@VLC_VERSION@/debian/changelog
+
+       # build nocss archives
+       (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
+               tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
+               bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
+                       > vlc-@VLC_VERSION@nocss.tar.bz2 ; \
+               gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
+       mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
+               /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
+
+       # clean up
        rm -rf /tmp/vlc-@VLC_VERSION@*
 
 plugins: $(PLUGINS:%=lib/%.so)