From: John Stebbins <jstebbins.hb@gmail.com>
Date: Mon, 9 Nov 2015 18:11:55 +0000 (-0800)
Subject: LinGui: Force override ubuntu package versions
X-Git-Tag: 0.10.3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=844dad84baeeb1621f390b18b855c5610405f405;p=handbrake

LinGui: Force override ubuntu package versions

Idiot ubuntu packagers add a suffix to the "upstream" version number
that causes their handbrake packages to be seen as "more recent"
than our packages.  So add "zhb" suffix to our version number to
force our packages to be seen a "more recent".
---

diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index 7d4c64264..ea505f3c7 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -79,9 +79,9 @@ $(PKG.cli.deb): $(PKG.gui.tmp.deb)
 # Debian source package rules
 #
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
-	(cd $(STAGE.out.src/)wily && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-1ppa1~wily1_source.changes )
-	(cd $(STAGE.out.src/)vivid && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-1ppa1~vivid1_source.changes )
-	(cd $(STAGE.out.src/)trusty && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-1ppa1~trusty1_source.changes )
+	(cd $(STAGE.out.src/)wily && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)zhb-1ppa1~wily1_source.changes )
+	(cd $(STAGE.out.src/)vivid && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)zhb-1ppa1~vivid1_source.changes )
+	(cd $(STAGE.out.src/)trusty && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)zhb-1ppa1~trusty1_source.changes )
 
 $(PKG.src.deb.stamp): GNUmakefile
 	-$(RM.exe) -rf $(STAGE.out.src/)
@@ -93,7 +93,7 @@ $(PKG.src.deb.stamp): GNUmakefile
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)wily/$(PKG.deb.basename)
 	$(CP.exe) $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/control.wily $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/control
 	$(CP.exe) $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/rules.wily $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/rules
-	echo "$(HB.name.lower) ($(HB.debversion)-1ppa1~wily1) wily; urgency=low" > $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
+	echo "$(HB.name.lower) ($(HB.debversion)zhb-1ppa1~wily1) wily; urgency=low" > $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
 	echo "  * Snapshot" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
 	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
 	echo "" >> $(STAGE.out.src/)wily/$(PKG.deb.basename)/debian/changelog
@@ -107,7 +107,7 @@ $(PKG.src.deb.stamp): GNUmakefile
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)vivid/$(PKG.deb.basename)
 	$(CP.exe) $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/control.vivid $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/control
 	$(CP.exe) $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/rules.vivid $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/rules
-	echo "$(HB.name.lower) ($(HB.debversion)-1ppa1~vivid1) vivid; urgency=low" > $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
+	echo "$(HB.name.lower) ($(HB.debversion)zhb-1ppa1~vivid1) vivid; urgency=low" > $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
 	echo "  * Snapshot" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
 	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
 	echo "" >> $(STAGE.out.src/)vivid/$(PKG.deb.basename)/debian/changelog
@@ -121,7 +121,7 @@ $(PKG.src.deb.stamp): GNUmakefile
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)trusty/$(PKG.deb.basename)
 	$(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control
 	$(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules
-	echo "$(HB.name.lower) ($(HB.debversion)-1ppa1~trusty1) trusty; urgency=low" > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
+	echo "$(HB.name.lower) ($(HB.debversion)zhb-1ppa1~trusty1) trusty; urgency=low" > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
 	echo "  * Snapshot" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
 	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
 	echo "" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog