misc: bump version to apply latest fixes.
This commit is contained in:
parent
c03ed2178d
commit
b440107ea3
4 changed files with 16 additions and 8 deletions
|
|
@ -18,10 +18,13 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=4
|
VERSION=5
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
|
# Set version number due to source origin change
|
||||||
|
export FULLVERSION="$(sed 's|ubuntu0.22.04.1||' <<< $FULLVERSION)"
|
||||||
|
|
||||||
cp $DATA/Trisquel-mirror.list debian/
|
cp $DATA/Trisquel-mirror.list debian/
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -51,6 +54,7 @@ index e9c85e9..b6c1c97 100755
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
changelog "Added config and update manpage for Trisquel."
|
changelog "Added config and update manpage for Trisquel."
|
||||||
|
head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit
|
||||||
|
|
||||||
package
|
package
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
|
# Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -17,14 +17,18 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=1
|
VERSION=2
|
||||||
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe'
|
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble main universe'
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
|
# Set version number due to source origin change
|
||||||
|
export FULLVERSION="$(sed 's|build3||' <<< $FULLVERSION)"
|
||||||
|
|
||||||
# Add cracklib-runtime dependency to debian/control
|
# Add cracklib-runtime dependency to debian/control
|
||||||
patch --no-backup-if-mismatch -p1 < $DATA/add-cracklib-runtime-as-dependency.patch
|
patch --no-backup-if-mismatch -p1 < $DATA/add-cracklib-runtime-as-dependency.patch
|
||||||
|
|
||||||
changelog "Imported into Trisquel Aramo | Added cracklib-runtime dependency."
|
changelog "Imported into Trisquel Aramo | Added cracklib-runtime dependency."
|
||||||
|
head -n1 debian/changelog | grep -q build && echo "error: update upstream version" && exit
|
||||||
|
|
||||||
package
|
package
|
||||||
|
|
|
||||||
|
|
@ -17,14 +17,14 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=5
|
VERSION=6
|
||||||
NETINST=true
|
NETINST=true
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
#FIXME:T12
|
#FIXME:T12
|
||||||
# Set version number due to source origin change
|
# Set version number due to source origin change
|
||||||
export FULLVERSION="$(sed 's|ubuntu0.6||' <<< $FULLVERSION)"
|
export FULLVERSION="$(sed 's|ubuntu0.7||' <<< $FULLVERSION)"
|
||||||
|
|
||||||
sed 's:Ubuntu:Trisquel\ GNU/Linux:g' -i debian/rules
|
sed 's:Ubuntu:Trisquel\ GNU/Linux:g' -i debian/rules
|
||||||
sed "s|^SSH_EXTRAVERSION.*|SSH_EXTRAVERSION := Trisquel_GNU/Linux_$REVISION-$VERSION|" -i debian/rules
|
sed "s|^SSH_EXTRAVERSION.*|SSH_EXTRAVERSION := Trisquel_GNU/Linux_$REVISION-$VERSION|" -i debian/rules
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2023 Luis Guzman <ark@switnet.org>
|
# Copyright (C) 2024 Luis Guzman <ark@switnet.org>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=2
|
VERSION=3
|
||||||
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe'
|
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe'
|
||||||
BACKPORT=true
|
BACKPORT=true
|
||||||
BUILD_UNTIL=11.0
|
BUILD_UNTIL=11.0
|
||||||
|
|
@ -25,7 +25,7 @@ BUILD_UNTIL=11.0
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
# Fix version number due to early release.
|
# Fix version number due to early release.
|
||||||
export FULLVERSION="$(sed 's|ubuntu1||' <<< $FULLVERSION)"
|
export FULLVERSION="$(sed 's|ubuntu4||' <<< $FULLVERSION)"
|
||||||
|
|
||||||
|
|
||||||
changelog "Backported from noble as dependency of libsrtp2 for openssl 3.0 support. || Route backport to upstream ubuntu."
|
changelog "Backported from noble as dependency of libsrtp2 for openssl 3.0 support. || Route backport to upstream ubuntu."
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue