cleanup linux rpm and debian packaging

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3230 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 31 insertions, 14 deletions

diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs
index 267e5f70e..e4232b343 100644
--- a/pkg/linux/module.defs
+++ b/pkg/linux/module.defs
@@ -11,6 +11,7 @@ PKG.cli.deb = $(PKG.out/)$(HB.name)-$(HB.version)-Ubuntu_CLI_$(BUILD.machine).de
 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.stamp = $(STAGE.out.src/).debsrc.stamp
 PKG.src.deb = $(PKG.out/)handbrake_$(HB.version).deb
 
 PKG.cli.tmp.deb = $(PKG.out/)handbrake-cli_$(HB.version)_$(PKG.deb.machine).deb
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index 59751d648..00bac398f 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -1,17 +1,18 @@
 pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb)
 pkg.create.rpm:: $(PKG.gui.rpm)
-pkg.create.src.deb:: $(PKG.src.deb.tar)
+pkg.create.src.deb:: $(PKG.src.deb.stamp)
 
-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/)
+#
+# RPM binary package rules
+#
+$(PKG.rpm.src.tar.bz2): $(STAGE.out.rpm.src/)
 	$(TAR.exe) cjf $@ -C $(STAGE.out.rpm.src/) $(PKG.basename)
 
-$(STAGE.out.rpm.src/):
+$(STAGE.out.rpm.src/): GNUmakefile
 #	-$(MKDIR.exe) -p $(STAGE.out.rpm.src/)$(PKG.basename)
 #	tar c --exclude build ../* | tar x -C $(STAGE.out.rpm.src/)$(PKG.basename)
+	-$(RM.exe) -rf $(STAGE.out.src/)
+	make contrib.fetch
 	svn co -r$(HB.repo.rev) $(HB.repo.url) $@/$(PKG.basename)
 	-$(MKDIR.exe) $(STAGE.out.rpm.src/)$(PKG.basename)/download
 	$(CP.exe) $(SRC/)download/*.tar.* $(STAGE.out.rpm.src/)$(PKG.basename)/download
@@ -36,17 +37,34 @@ $(PKG.gui.rpm): $(PKG.native.rpm.stamp)
 	$(CP.exe) $(PKG.gui.native.rpm) $(PKG.gui.rpm)
 	$(CP.exe) $(PKG.cli.native.rpm) $(PKG.cli.rpm)
 
-$(PKG.gui.deb): | $(dir $(PKG.gui.deb))
-$(PKG.gui.deb):
-	-rm $(SRC/)debian
+#
+# Debian binary package rules
+#
+$(PKG.gui.tmp.deb): GNUmakefile
+	-$(RM.exe) $(SRC/)debian
 	ln -s $(PWD)/$(PKG.debian) $(SRC/)debian
 	fakeroot $(MAKE) -C $(SRC/) -f debian/rules clean
 	$(MAKE) BUILDDIR=$(PWD)/$(BUILD) CONFIGURE=configure -C $(SRC/) -f debian/rules build
 	echo $(PKG.out/)
 	fakeroot $(MAKE) FORCEVERSION="-- -v$(HB.version)" BUILDDIR=$(PWD)/$(BUILD) CONFIGURE=configure PKGDESTDIR=$(PWD)/$(PKG.out/) -C $(SRC/) -f debian/rules binary
+
+$(PKG.gui.deb): | $(dir $(PKG.gui.deb))
+$(PKG.gui.deb): $(PKG.gui.tmp.deb)
 	$(MV.exe) $(PKG.gui.tmp.deb) $(PKG.gui.deb)
 
-$(PKG.src.deb.tar):
+$(PKG.cli.deb): | $(dir $(PKG.cli.deb))
+$(PKG.cli.deb): $(PKG.gui.tmp.deb)
+	$(MV.exe) $(PKG.cli.tmp.deb) $(PKG.cli.deb)
+
+#
+# Debian source package rules
+#
+pkg.push.src.deb:: $(PKG.src.deb.stamp)
+	(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.src.deb.stamp): GNUmakefile
+	-$(RM.exe) -rf $(STAGE.out.src/)
 	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)
@@ -68,8 +86,6 @@ $(PKG.src.deb.tar):
 	echo " -- John Stebbins <[email protected]>  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)
+	$(TOUCH.exe) $(PKG.src.deb.stamp)
 
-$(PKG.cli.deb): | $(dir $(PKG.cli.deb))
-$(PKG.cli.deb): $(PKG.gui.deb)
-	$(MV.exe) $(PKG.cli.tmp.deb) $(PKG.cli.deb)