From 147d714b2706ca63ead0a0070b49579957867cc1 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Thu, 15 Apr 2010 14:44:30 +0000 Subject: add packaging rules for building debian source packages and fix a build issue with a52dec when the path has a '~' in it this is a step towards using the launchpad build farm for ubuntu snapshots git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3226 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/a52dec/module.defs | 2 ++ pkg/linux/debian/control | 6 +++--- pkg/linux/debian/rules | 2 -- pkg/linux/module.defs | 4 ++++ pkg/linux/module.rules | 27 +++++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/contrib/a52dec/module.defs b/contrib/a52dec/module.defs index 470ddfa12..3d62d3175 100644 --- a/contrib/a52dec/module.defs +++ b/contrib/a52dec/module.defs @@ -4,3 +4,5 @@ $(eval $(call import.CONTRIB.defs,A52DEC)) A52DEC.FETCH.url = http://download.m0k.org/handbrake/contrib/a52dec-0.7.4.tar.gz A52DEC.EXTRACT.tarbase = a52dec A52DEC.INSTALL.strip = liba52.a + +A52DEC.CONFIGURE.bootstrap = ./bootstrap; diff --git a/pkg/linux/debian/control b/pkg/linux/debian/control index e6b955284..035e1f50d 100644 --- a/pkg/linux/debian/control +++ b/pkg/linux/debian/control @@ -2,8 +2,8 @@ Source: handbrake Section: graphics Priority: optional Maintainer: John Stebbins -Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgtkhtml3.14-dev, libhal-storage-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 6), autotools-dev, libtool, libhal-storage-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkit-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget +Standards-Version: 3.8.4 Homepage: http://www.handbrake.fr/ Package: handbrake-cli @@ -19,7 +19,7 @@ Description: versatile DVD ripper and video transcoder - command line Package: handbrake-gtk Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkit-dev, libnotify-dev Conflicts: handbrake Description: versatile DVD ripper and video transcoder - GTK GUI HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos diff --git a/pkg/linux/debian/rules b/pkg/linux/debian/rules index 036aa3b90..630b49234 100755 --- a/pkg/linux/debian/rules +++ b/pkg/linux/debian/rules @@ -53,7 +53,6 @@ binary-indep: build install dh_installdocs -i dh_install --sourcedir=debian/tmp -i dh_icons -i - dh_desktop -i dh_link -i dh_compress -i dh_fixperms -i @@ -73,7 +72,6 @@ binary-arch: build install dh_installman -a dh_link -a dh_icons -a - dh_desktop -a dh_strip -a dh_compress -a dh_fixperms -a diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs index 93d686ced..267e5f70e 100644 --- a/pkg/linux/module.defs +++ b/pkg/linux/module.defs @@ -9,6 +9,9 @@ STAGE.out.rpm.src/ = $(STAGE.out.src/)rpm/ PKG.debian = $(PKG.in/)linux/debian PKG.cli.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_CLI_$(BUILD.machine).deb PKG.gui.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_GUI_$(BUILD.machine).deb +PKG.deb.basename = handbrake-$(HB.version) +PKG.src.deb.tar = handbrake_$(HB.version).tar.gz +PKG.src.deb = $(PKG.out/)handbrake_$(HB.version).deb PKG.cli.tmp.deb = $(PKG.out/)handbrake-cli_$(HB.version)_$(PKG.deb.machine).deb PKG.gui.tmp.deb = $(PKG.out/)handbrake-gtk_$(HB.version)_$(PKG.deb.machine).deb @@ -27,6 +30,7 @@ RPMROOT.out/ = $(PWD)/$(STAGE.out/)rpmroot/ ############################################################################### +BUILD.out += $(PKG.src.tar) BUILD.out += $(PKG.cli.deb) BUILD.out += $(PKG.gui.deb) BUILD.out += $(PKG.cli.rpm) diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules index dcc387020..93f7368d6 100644 --- a/pkg/linux/module.rules +++ b/pkg/linux/module.rules @@ -1,5 +1,10 @@ pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb) pkg.create.rpm:: $(PKG.gui.rpm) +pkg.create.src.deb:: $(PKG.src.deb.tar) + +pkg.push.src.deb:: $(PKG.src.deb.tar) + (cd $(STAGE.out.src/)lucid && dput handbrake-snapshots $(PKG.deb.basename)_$(HB.version)ppa1~lucid1)_source.changes ) + (cd $(STAGE.out.src/)karmic && dput handbrake-snapshots $(PKG.deb.basename)_$(HB.version)ppa1~karmic1)_source.changes ) $(PKG.rpm.src.tar.bz2): | $(STAGE.out.rpm.src/) $(TAR.exe) cjf $@ -C $(STAGE.out.rpm.src/) $(PKG.basename) @@ -41,6 +46,28 @@ $(PKG.gui.deb): fakeroot $(MAKE) FORCEVERSION="-- -v$(HB.version)" BUILDDIR=$(PWD)/$(BUILD) CONFIGURE=configure PKGDESTDIR=$(PWD)/$(PKG.out/) -C $(SRC/) -f debian/rules binary $(MV.exe) $(PKG.gui.tmp.deb) $(PKG.gui.deb) +$(PKG.src.deb.tar): + svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)lucid/$(PKG.deb.basename) + $(CP.exe) -a $(SRC/)download $(STAGE.out.src/)lucid/$(PKG.deb.basename) + cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)lucid/$(PKG.deb.basename) + echo "handbrake ($(HB.version)ppa1~lucid1) lucid; urgency=low" > $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog + echo " * Snapshot" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog + echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog + echo "" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog + echo " -- John Stebbins Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog + $(TAR.exe) czf $(STAGE.out.src/)lucid/$(PKG.src.deb.tar) -C $(STAGE.out.src/)lucid $(PKG.deb.basename) + (cd $(STAGE.out.src/)lucid/$(PKG.deb.basename) && debuild -S -kjstebbins.hb) + svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)karmic/$(PKG.deb.basename) + $(CP.exe) -a $(SRC/)download $(STAGE.out.src/)karmic/$(PKG.deb.basename) + cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)karmic/$(PKG.deb.basename) + echo "handbrake ($(HB.version)ppa1~karmic) karmic; urgency=low" > $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog + echo " * Snapshot" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog + echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog + echo "" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog + echo " -- John Stebbins Sun, 11 Apr 2010 9:51:07 -0800" >> $(STAGE.out.src/)karmic/$(PKG.deb.basename)/debian/changelog + $(TAR.exe) czf $(STAGE.out.src/)karmic/$(PKG.src.deb.tar) -C $(STAGE.out.src/)karmic $(PKG.deb.basename) + (cd $(STAGE.out.src/)karmic/$(PKG.deb.basename) && debuild -S -kjstebbins.hb) + $(PKG.cli.deb): | $(dir $(PKG.cli.deb)) $(PKG.cli.deb): $(PKG.gui.deb) $(MV.exe) $(PKG.cli.tmp.deb) $(PKG.cli.deb) -- cgit v1.2.3