Updating.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 124 insertions, 14 deletions

diff --git a/bin/debian-chroot b/bin/debian-chroot
index 3aaf7b8..c783bb2 100755
--- a/bin/debian-chroot
+++ b/bin/debian-chroot
@@ -27,6 +27,10 @@ case "${DISTRIBUTION}" in
 	bullseye*)
 		DERIVATIVE_DISTRIBUTION="fuchur"
 		;;
+
+	bookworm*)
+		DERIVATIVE_DISTRIBUTION="graograman"
+		;;
 esac
 
 MIRROR="debian.ethz.ch"
@@ -197,36 +201,69 @@ EOF
 
 		case "${BASH_HISTORY}" in
 			arch)
-
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
-
+						;;
+				esac
 				;;
 
 			indep)
 
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
-clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION} -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
+						;;
 
+					*)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+				esac
 				;;
 
 			source)
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
 
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
-
+						;;
+				esac
 				;;
 		esac
 
@@ -288,35 +325,68 @@ EOF
 
 		case "${BASH_HISTORY}" in
 			arch)
-
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -B && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -a -o -n -u -b binary-arch -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
-
+						;;
+				esac
 				;;
 
 			indep)
 
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
-clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION} -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
+						;;
 
+					*)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -a -o -n -u -b binary-indep -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+				esac
 				;;
 
 			source)
-
+				case "${DERIVATIVE_DISTRIBUTION}" in
+					graograman)
+cat > "${CHROOT}/build/.bash_history" << EOF
+cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
+sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
+clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION} -p 
+rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
+EOF
+						;;
+					*)
 cat > "${CHROOT}/build/.bash_history" << EOF
 cd */ && sudo apt-get build-dep -y . && dpkg-buildpackage -A && cd .. && rm -rf */
 sudo apt-get install -y -t ${DERIVATIVE_DISTRIBUTION}-backports debhelper
 clear && pbuild.sh -o -u -b source -d ${DERIVATIVE_DISTRIBUTION}-backports -p 
 rsync -aPv --progress --stats * apt.progress-linux.org::upload && rm -rf *
 EOF
+						;;
+				esac
 				;;
 		esac
 
diff --git a/bin/git-debian-changelog b/bin/git-debian-changelog
index 2197979..c514cf9 100755
--- a/bin/git-debian-changelog
+++ b/bin/git-debian-changelog
@@ -128,6 +128,34 @@ then
 							;;
 					esac
 					;;
+
+				graograman)
+					case "${VERSION}" in
+						*-*)
+							# non-native
+							VERSION="--dch-opt=-b -N ${VERSION}progress7u1"
+							;;
+
+						*)
+							# native
+							VERSION="--dch-opt=-b -N ${VERSION}-0progress7u1"
+							;;
+					esac
+					;;
+
+				graograman-backports)
+					case "${VERSION}" in
+						*-*)
+							# non-native
+							VERSION="--dch-opt=-b -N ${VERSION}~progress7+u1"
+							;;
+
+						*)
+							# native
+							VERSION="--dch-opt=-b -N ${VERSION}-0.0~progress7+u1"
+							;;
+					esac
+					;;
 			esac
 			;;
 	esac
diff --git a/bin/pbuild.sh b/bin/pbuild.sh
index 49c5242..1df64f5 100755
--- a/bin/pbuild.sh
+++ b/bin/pbuild.sh
@@ -198,6 +198,10 @@ do
 		case "${ONLY_MISSING_BUILDS}" in
 			true)
 				case "${BUILD}" in
+					binary-indep)
+						URL="https://apt.progress-linux.org/archive/${DISTRIBUTION}/${PACKAGE}/${VERSION}_all"
+						;;
+
 					source)
 						URL="https://apt.progress-linux.org/archive/${DISTRIBUTION}/${PACKAGE}/${VERSION}_source"
 						;;
@@ -252,7 +256,7 @@ do
 
 				mv "${TARGET}" "${TARGET}-${UPSTREAM_VERSION}"
 
-				for DIST in engywuck fuchur
+				for DIST in engywuck fuchur graograman
 				do
 					if [ ! -e "${TARGET}_${UPSTREAM_VERSION}.orig.tar.xz" ]
 					then
diff --git a/bin/pimport.sh b/bin/pimport.sh
index b72bc5c..573789e 100755
--- a/bin/pimport.sh
+++ b/bin/pimport.sh
@@ -34,6 +34,10 @@ case "${MODE}" in
 		then
 			VCS_BROWSER="https://git.progress-linux.org/packages/fuchur-backports"
 			VCS_GIT="https://git.progress-linux.org/packages/fuchur-backports"
+		elif echo ${PWD} | grep -qs graograman-backports
+		then
+			VCS_BROWSER="https://git.progress-linux.org/packages/graograman-backports"
+			VCS_GIT="https://git.progress-linux.org/packages/graograman-backports"
 		elif echo ${PWD} | grep -qs engywuck
 		then
 			VCS_BROWSER="https://git.progress-linux.org/packages/engywuck"
@@ -42,9 +46,13 @@ case "${MODE}" in
 		then
 			VCS_BROWSER="https://git.progress-linux.org/packages/fuchur"
 			VCS_GIT="https://git.progress-linux.org/packages/fuchur"
+		elif echo ${PWD} | grep -qs graograman
+		then
+			VCS_BROWSER="https://git.progress-linux.org/packages/graograman"
+			VCS_GIT="https://git.progress-linux.org/packages/graograman"
 		else
-			VCS_BROWSER="https://git.progress-linux.org/packages/engywuck-backports"
-			VCS_GIT="https://git.progress-linux.org/packages/engywuck-backports"
+			echo "NO VCS detection"
+			exit 1
 		fi
 
 		DOWNSTREAM_BRANCH="progress-linux"
diff --git a/bin/psign.sh b/bin/psign.sh
index 7762087..f3353c7 100755
--- a/bin/psign.sh
+++ b/bin/psign.sh
@@ -36,7 +36,7 @@ do
 
 				graograman*)
 					DESCRIPTION="Progress Linux 7 (graograman) Archive Key"
-					KEY=""
+					KEY="0x076B33250B5DD18B"
 					;;
 
 				*)
@@ -86,7 +86,7 @@ do
 
 				graograman*)
 					DESCRIPTION="Progress Linux 7 (graograman) Archive Key"
-					KEY=""
+					KEY="0x076B33250B5DD18B"
 					;;
 
 				*)
diff --git a/bin/pupdate.sh b/bin/pupdate.sh
index 1ed020f..da3bc23 100755
--- a/bin/pupdate.sh
+++ b/bin/pupdate.sh
@@ -208,7 +208,7 @@ Switch_downstream_branch ()
 
 Merge_upstream_version ()
 {
-	git cherry-pick -n upstream
+	git cherry-pick -n --allow-empty upstream
 	git commit -a -s -S -m "Merging upstream version ${DEB_UPSTREAM_VERSION}."
 }