Changeset 09496f19392df3684c51ff5950234cafbedc11ec

Timestamp:

07/05/03 16:47:53 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1057416473 +0000

git-parent:

[1cd9bbce16fec86c505d7c1712b96ea730a56955]

git-author:

Sam Hocevar <sam@videolan.org> 1057416473 +0000

Message:

• Makefile.am: "make dist-woody" builds a tarball suitable for a Debian
  woody package build.
  
• bootstrap:
  + Remove config.h.in and config.h before running autoheader.
  + Added "set -e" for better error tracking.
  + Call autoheader and automake after autoconf so that the first build does
  

not need to call autoheader.

• debian/woody-buildpackage:
  + Removed that script and put the code in toolbox.
  
• debian/control:
  + Added a build-dependency on libmatroska-dev.
  
• debian/rules:
  + Activated Matroska support.
  + Re-enabled dh_installchangelogs.
  

Files:

• Makefile.am (modified) (1 diff)
• bootstrap (modified) (12 diffs)
• debian/Makefile.am (modified) (1 diff)
• debian/changelog (modified) (3 diffs)
• debian/control (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• debian/woody-buildpackage (deleted)
• toolbox (modified) (4 diffs)

Makefile.am

@@ -422 +422 @@
-
-###############################################################################
+# Building specific source packages
+###############################################################################
+
+dist-woody: distdir
+    $(remove_distdir_woody)
+    mv $(distdir) $(PACKAGE)-woody-$(VERSION)
+    $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION)
+    $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \
+      | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz
+    $(remove_distdir_woody)
+
+remove_distdir_woody = \
+  { test ! -d $(PACKAGE)-woody-$(VERSION) \
+    || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \
+           -exec chmod u+w {} ';' \
+         && rm -fr $(PACKAGE)-woody-$(VERSION); }; }
+
+###############################################################################
-# Building architecture-specific binary packages
-###############################################################################

bootstrap

@@ -2 +2 @@
-
-##  bootstrap file for the VLC media player
-4 2003/07/04 14:56:51
+5 2003/07/05 14:47:53
-##
-##  Authors: Sam Hocevar <sam@zoy.org>
@@ -21 +21 @@
-export CYGWIN
-
+set -e
+
-##
-## Naively assume our system doesn't suck. Unfortunately it seldom doesn't.
@@ -26 +28 @@
-AUTOMAKESUCKS=no
-INSTALLSUCKS=no
-
-##
-## Check that our tools don't suck
-##
-
-##
@@ -253 +251 @@
-
-# remove autotools cruft
-
+ config.h config.h.in
-# remove old autotools extra cruft
-rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
@@ -270 +268 @@
-        '>=' 0.11.5 >/dev/null 2>&1; then
-  # We have gettext, and a recent version! Everything is cool.
- || exit 1
+
-  GETTEXT=yes
-else
@@ -350 +348 @@
-
-# Do the rest
- || exit 1
-header || exit 1
-
+
+conf
+
-automake${amvers} --add-missing --copy
-
-autoconf || exit 1
-
-##
@@ -365 +361 @@
-rm -f mozilla/vlcintf.h
-
-
-
-
+
-set +x
-
@@ -374 +368 @@
-##
-case "${GETTEXT}" in
-
-
-
-
+
+
-
-===========================================================
@@ -385 +377 @@
-EOF
-  ;;
-
-
+
-
-==========================================================
@@ -398 +389 @@
-
-case "$PKGCONFIG" in
-
-
-
-
+
+
-
-==============================================================
@@ -412 +401 @@
-
-case "$AUTOMAKESUCKS" in
-
-
-
-
+
+
-
-=============================================================
@@ -427 +414 @@
-
-case "$INSTALLSUCKS" in
-
-
-
-
+
+
-
-=============================================================

debian/Makefile.am

@@ -29 +29 @@
-    vlc-plugin-sdl.dirs \
-    vlc-plugin-svgalib.dirs \
-    woody-buildpackage \
-    wxvlc.dirs \
-    wxvlc.menu \

debian/changelog

@@ -1 @@
-4
+5
-
-  * New CVS snapshot.
@@ -6 +6 @@
-      failures are missed. Thanks to LaMont Jones for pointing out the problem.
-  * debian/rules:
+    + Enabled Matroska support.
-    + Only build builtins in the first compile pass so that we don't mix PIC
-      and non-PIC code (Closes: #199968). Phew, I hope I got it right this
@@ -13 +14 @@
-      disappeared in 0.6.0+cvs-20030703-1.
-
-Thu,  3 Jul 2003 11:25:57
+Sat,  5 Jul 2003 01:09:11
-
-vlc (0.6.0+cvs-20030703-1) unstable; urgency=low

debian/control

@@ -3 +3 @@
-Priority: optional
-Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-
+, libmatroska-dev
-Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
-Standards-Version: 3.5.10

debian/rules

@@ -45 +45 @@
-    --disable-basic-skins \
-    --disable-freetype \
-dis
+en
-    --enable-v4l \
-    $(NULL)
@@ -367 +367 @@
-    dh_installman doc/vlc.1 -p vlc
-    dh_installman doc/vlc-config.1 -p libvlc0-dev
-
-
-
-
+
+
-    dh_link -s
-    dh_strip -s

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-7 2003/07/02 20:01:51 gbazin
+8 2003/07/05 14:47:53 sam
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -29 +29 @@
-  --changelog             update the CVS changelog
-  --distclean             "make distclean"
+  --make-woody <dir>      change distdir <dir> to a woody distdir
-EOF
-  exit 1
@@ -77 +78 @@
-  --distclean)
-    action=distclean
+    ;;
+  --make-woody)
+    action=woody
-    ;;
-  --help)
@@ -542 +546 @@
-fi
-
+if test "${action}" = "woody"
+then
+  set -ex
+  test -d "$1"
+
+  # changelog: replace (1.2.3-4) with (1.2.3-0woody.4)
+  sed -e 's/^vlc (\([^)]*\)-\([^-)]*\))/vlc-woody (\1-0woody.\2)/' \
+      -e 's/ unstable; / stable; /' \
+      < "$1/debian/changelog" > "$1/debian/changelog.woody"
+  mv "$1/debian/changelog.woody" "$1/debian/changelog"
+
+  # control: replace liba52-*-dev with a52dec-dev (>=0.7.3)
+  #                  libdv*-dev with libdv-dev
+  #                  kdelibs4-dev with kdelibs-dev
+  #                  libqt3-mt-dev libqt3-compat-headers with libqt-dev
+  #                  libarts1-dev with libarts-dev
+  #                  libdvdread3-dev with libdvdread2-dev
+  #                  libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
+  #          remove libwxgtk2.4-dev
+  #                 libflac-dev
+  #                 libidl0 (workaround for mozilla-dev's bad deps)
+  #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
+  #                 libmatroska-dev
+  #          change Source: vlc with Source: vlc-woody
+  #                 Section: gnome with Section: graphics
+  #                 Section: kde with Section: kde
+  #                 Section: libdevel with Section: devel
+  sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
+      -e 's/libdv[0-9]*-dev/libdv-dev/' \
+      -e 's/kdelibs[0-9]*-dev/kdelibs-dev/' \
+      -e 's/libqt[0-9]*-mt-dev/libqt-dev/' \
+      -e 's/, libqt[0-9]*-compat-headers[^,]*//' \
+      -e 's/libarts[0-9]*-dev/libarts-dev/' \
+      -e 's/libdvdread[0-9]*-dev/libdvdread2-dev/' \
+      -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
+      -e 's/, libwx[^,]*//' \
+      -e '/Package: wxvlc/,/^ *$/d' \
+      -e 's/, libflac-dev[^,]*//' \
+      -e 's/, libidl0[^,]*//' \
+      -e 's/, libglib2.0-0[^,]*//' \
+      -e 's/, libmatroska-dev[^,]*//' \
+      -e 's/Source: vlc/Source: vlc-woody/' \
+      -e 's/Section: gnome/Section: graphics/' \
+      -e 's/Section: kde/Section: graphics/' \
+      -e 's/Section: libdevel/Section: devel/' \
+      < "$1/debian/control" > "$1/debian/control.woody"
+  mv "$1/debian/control.woody" "$1/debian/control"
+
+  # rules: remove wxwindows and skins stuff
+  #        remove flac support
+  #        remove matroska support
+  sed -e '/# Package: wxvlc/,/^ *$/d' \
+      -e 's,--enable-wxwindows,--disable-wxwindows,' \
+      -e 's,--enable-skins,--disable-skins,' \
+      -e 's,--enable-flac,--disable-flac,' \
+      -e 's,--enable-mkv,--disable-mkv,' \
+      < "$1/debian/rules" > "$1/debian/rules.woody"
+  mv "$1/debian/rules.woody" "$1/debian/rules"
+  chmod 0755 "$1/debian/rules"
+fi
+