Changeset 4011680


Ignore:
Timestamp:
Aug 27, 2018 1:13:42 PM (2 years ago)
Author:
slumlord <slumlord@…>
Branches:
master
Children:
be4c1af
Parents:
8730874 (diff), 48c787b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head f7b28892c564f2b360f9f9dc8a8ad11c760b347a)

to branch 'i2p.i2p.slumlord' (head 0eab0dc27f9269e2791700882ad4b289d566348a)

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • debian-alt/bionic/rules

    r8730874 r4011680  
    7575        fi
    7676ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    77         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     77        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7878        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7979else
  • debian-alt/buster/rules

    r8730874 r4011680  
    7373        fi
    7474ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    75         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     75        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7676        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7777else
  • debian-alt/doc/debian-build.txt

    r8730874 r4011680  
    7575reprepro -v update trusty
    7676reprepro -v update xenial
    77 reprepro -v update artful
    7877reprepro -v update bionic
     78reprepro -v update cosmic
    7979# todo when set up
    8080# To add or remove distributions, edit /var/www/debian/conf/distributions
     
    9393reprepro -v copysrc jessie trusty i2p
    9494
    95 # To copy artful to stretch and sid:
     95# To copy bionic to stretch and sid:
    9696# Note that syntax is reprepro copysrc TO FROM package!
    97 reprepro -v copysrc stretch artful i2p
    98 reprepro -v copysrc sid artful i2p
     97reprepro -v copysrc stretch bionic i2p
     98reprepro -v copysrc sid bionic i2p
    9999
    100100# install in the architectures not copied from ubuntu
  • debian-alt/jessie/rules

    r8730874 r4011680  
    7070        fi
    7171ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    72         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     72        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7373        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7474else
  • debian-alt/precise/rules

    r8730874 r4011680  
    7171        fi
    7272ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    73         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     73        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7474        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7575else
  • debian-alt/trusty/rules

    r8730874 r4011680  
    7070        fi
    7171ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    72         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     72        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7373        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7474else
  • debian-alt/wheezy/rules

    r8730874 r4011680  
    7070        fi
    7171ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    72         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     72        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7373        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7474else
  • debian-alt/xenial/rules

    r8730874 r4011680  
    7070        fi
    7171ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    72         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     72        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7373        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7474else
  • debian/rules

    r8730874 r4011680  
    7373        fi
    7474ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
    75         sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"\2-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
     75        sed -e "s/\(.*EXTRA\ =\ \)[^ ]*\"\(.*\)\"/\1\"-$$EXTRAPREFIX$$DEBIANVERSION\"/" < $(ROUTERVERSION) > $(ROUTERVERSION).tmp
    7676        mv -f $(ROUTERVERSION).tmp $(ROUTERVERSION)
    7777else
Note: See TracChangeset for help on using the changeset viewer.