I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 48c787ba authored by zzz's avatar zzz
Browse files

Debian: Prevent dup version (ticket #2300)

parent c9002b32
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian-alt/bionic/rules
+ 1
− 1
View file @ 48c787ba
...@@ -74,7 +74,7 @@ build-indep: ...@@ -74,7 +74,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian-alt/buster/rules
+ 1
− 1
View file @ 48c787ba
...@@ -72,7 +72,7 @@ build-indep: ...@@ -72,7 +72,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian-alt/doc/debian-build.txt
+ 4
− 4
View file @ 48c787ba
...@@ -74,8 +74,8 @@ reprepro includedsc stable i2p_0.9.XX-1.dsc ...@@ -74,8 +74,8 @@ reprepro includedsc stable i2p_0.9.XX-1.dsc
reprepro -v update precise reprepro -v update precise
reprepro -v update trusty reprepro -v update trusty
reprepro -v update xenial reprepro -v update xenial
reprepro -v update artful
reprepro -v update bionic reprepro -v update bionic
reprepro -v update cosmic
# todo when set up # todo when set up
# To add or remove distributions, edit /var/www/debian/conf/distributions # To add or remove distributions, edit /var/www/debian/conf/distributions
# and /var/www/debian/conf/updates # and /var/www/debian/conf/updates
...@@ -92,10 +92,10 @@ reprepro -v copysrc wheezy precise i2p ...@@ -92,10 +92,10 @@ reprepro -v copysrc wheezy precise i2p
# Note that syntax is reprepro copysrc TO FROM package! # Note that syntax is reprepro copysrc TO FROM package!
reprepro -v copysrc jessie trusty i2p reprepro -v copysrc jessie trusty i2p
# To copy artful to stretch and sid: # To copy bionic to stretch and sid:
# Note that syntax is reprepro copysrc TO FROM package! # Note that syntax is reprepro copysrc TO FROM package!
reprepro -v copysrc stretch artful i2p reprepro -v copysrc stretch bionic i2p
reprepro -v copysrc sid artful i2p reprepro -v copysrc sid bionic i2p
# install in the architectures not copied from ubuntu # install in the architectures not copied from ubuntu
# 'flood' should do this but forgot how, can't make it work any more # 'flood' should do this but forgot how, can't make it work any more
......
debian-alt/jessie/rules
+ 1
− 1
View file @ 48c787ba
...@@ -69,7 +69,7 @@ build-indep: ...@@ -69,7 +69,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian-alt/precise/rules
+ 1
− 1
View file @ 48c787ba
...@@ -70,7 +70,7 @@ build-indep: ...@@ -70,7 +70,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian-alt/trusty/rules
+ 1
− 1
View file @ 48c787ba
...@@ -69,7 +69,7 @@ build-indep: ...@@ -69,7 +69,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian-alt/wheezy/rules
+ 1
− 1
View file @ 48c787ba
...@@ -69,7 +69,7 @@ build-indep: ...@@ -69,7 +69,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian-alt/xenial/rules
+ 1
− 1
View file @ 48c787ba
...@@ -69,7 +69,7 @@ build-indep: ...@@ -69,7 +69,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
debian/rules
+ 1
− 1
View file @ 48c787ba
...@@ -72,7 +72,7 @@ build-indep: ...@@ -72,7 +72,7 @@ build-indep:
cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \
fi fi
ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION) mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
else else
@echo "Already found deb in version, not doing anything" @echo "Already found deb in version, not doing anything"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]