diff options
| author | jstebbins <[email protected]> | 2010-04-16 15:07:03 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-04-16 15:07:03 +0000 |
| commit | 34ac0b7697e575b9c9f2fbfe441d6da324311ec8 (patch) | |
| tree | 99319c203195b5d3dc3b0fa437b2f2783e1467fa | |
| parent | b9d2f77023faef439a033eb9e0435bd0c3f7ca86 (diff) | |
only allow building i386 and amd64 builds on launchpad build farm
make sure contribs are all fetched before creating debian source pkg
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3229 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | pkg/linux/debian/control | 4 | ||||
| -rw-r--r-- | pkg/linux/module.rules | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkg/linux/debian/control b/pkg/linux/debian/control index 035e1f50d..f68d19701 100644 --- a/pkg/linux/debian/control +++ b/pkg/linux/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.4 Homepage: http://www.handbrake.fr/ Package: handbrake-cli -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: handbrake Description: versatile DVD ripper and video transcoder - command line @@ -18,7 +18,7 @@ Description: versatile DVD ripper and video transcoder - command line HandBrakeCLI Package: handbrake-gtk -Architecture: any +Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkit-dev, libnotify-dev Conflicts: handbrake Description: versatile DVD ripper and video transcoder - GTK GUI diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules index 93f7368d6..59751d648 100644 --- a/pkg/linux/module.rules +++ b/pkg/linux/module.rules @@ -47,6 +47,7 @@ $(PKG.gui.deb): $(MV.exe) $(PKG.gui.tmp.deb) $(PKG.gui.deb) $(PKG.src.deb.tar): + make contrib.fetch 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) @@ -60,7 +61,7 @@ $(PKG.src.deb.tar): 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 "handbrake ($(HB.version)ppa1~karmic1) 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 |