diff --git a/debian-alt/bionic/rules b/debian-alt/bionic/rules index 12cbd12397946a9b1e40148f275cfe6050bdb6aa..d98bd954ef9978571cb4edd548767193b3c75c71 100755 --- a/debian-alt/bionic/rules +++ b/debian-alt/bionic/rules @@ -74,7 +74,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian-alt/buster/rules b/debian-alt/buster/rules index 56bf2f0fe0b0a1fd0488f57ccc16c87de9cf7394..adff48473c0c772c94f5c70367a1f051f7de8d45 100755 --- a/debian-alt/buster/rules +++ b/debian-alt/buster/rules @@ -72,7 +72,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt index b1370b09bd8c7800a744c5b512c1686b82085c34..6d1d2f971a9e099ec0918d17bdeeb6b8553afc01 100644 --- a/debian-alt/doc/debian-build.txt +++ b/debian-alt/doc/debian-build.txt @@ -74,8 +74,8 @@ reprepro includedsc stable i2p_0.9.XX-1.dsc reprepro -v update precise reprepro -v update trusty reprepro -v update xenial -reprepro -v update artful reprepro -v update bionic +reprepro -v update cosmic # todo when set up # To add or remove distributions, edit /var/www/debian/conf/distributions # and /var/www/debian/conf/updates @@ -92,10 +92,10 @@ reprepro -v copysrc wheezy precise i2p # Note that syntax is reprepro copysrc TO FROM package! 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! -reprepro -v copysrc stretch artful i2p -reprepro -v copysrc sid artful i2p +reprepro -v copysrc stretch bionic i2p +reprepro -v copysrc sid bionic i2p # install in the architectures not copied from ubuntu # 'flood' should do this but forgot how, can't make it work any more diff --git a/debian-alt/jessie/rules b/debian-alt/jessie/rules index 574e62fdec0e16e1fd6dba0f0c88fdca7def4170..d8658440206161d84f20f0d2b7a71198cedc8abf 100755 --- a/debian-alt/jessie/rules +++ b/debian-alt/jessie/rules @@ -69,7 +69,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules index cf06493ce07edb9393d5f7eb9fd0d6912445435d..70628f573e4a1672f4bfc9686570d8307d4c66f8 100755 --- a/debian-alt/precise/rules +++ b/debian-alt/precise/rules @@ -70,7 +70,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules index a09d6c549362e0fb3fe15ee651f2adc8d8d61d7d..f00691a92f7c853009ef8e0da2ace31138fab7e6 100755 --- a/debian-alt/trusty/rules +++ b/debian-alt/trusty/rules @@ -69,7 +69,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian-alt/wheezy/rules b/debian-alt/wheezy/rules index a846ebc8fd486f04fb5266a943eb73b78a728f9d..1d463b13e336e853dc6e75d2489f75f670015859 100755 --- a/debian-alt/wheezy/rules +++ b/debian-alt/wheezy/rules @@ -69,7 +69,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian-alt/xenial/rules b/debian-alt/xenial/rules index 29919c90d83da2490040d231ac2a551cda3f98b2..701918109fcd201e12d3b1aaa4a25e671aa931e1 100755 --- a/debian-alt/xenial/rules +++ b/debian-alt/xenial/rules @@ -69,7 +69,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything" diff --git a/debian/rules b/debian/rules index 2b9f2410c991d3227ef3a8cb546ef487fb33c701..e502c447e4fc84fec9113646c920d9990013536d 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ build-indep: cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ fi 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) else @echo "Already found deb in version, not doing anything"