summaryrefslogtreecommitdiffstats
path: root/pkg/linux
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2015-11-09 10:11:55 -0800
committerJohn Stebbins <[email protected]>2015-11-09 10:11:55 -0800
commit8e997027c2d4df6444efc32cb1a2c8a1f30eab0d (patch)
treef3cc65e6fbdd03dedc9093f6b484b371529ee8e3 /pkg/linux
parentaadfe93eb653c6ba99eaadcb68e6de523e4d60f6 (diff)
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".
Diffstat (limited to 'pkg/linux')
-rw-r--r--pkg/linux/module.rules12
1 files changed, 6 insertions, 6 deletions
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