First package build for Ubuntu 24.04 Noble, minor changes to the

build environment.
rsyslog · Jul 1, 2024 · 60a8e0a · 60a8e0a
1 parent a5e6ed4
commit 60a8e0a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 15 deletions.
diff --git a/libestr/noble/v8-stable/changelog b/libestr/noble/v8-stable/changelog
@@ -1,4 +1,4 @@
-libestr (0.1.9-0adiscon1noble1) noble; urgency=low
+libestr (0.1.11-0adiscon1noble1) noble; urgency=low
 
   * Initial build for Ubuntu 24.04 Noble
 

diff --git a/libestr/noble/v8-stable/debian/changelog b/libestr/noble/v8-stable/debian/changelog
@@ -1,5 +1,5 @@
-libestr (0.1.11-0adiscon1jammy1) jammy; urgency=medium
+libestr (0.1.11-0adiscon1noble1) noble; urgency=medium
 
-  * Initial libestr package for Ubuntu 22.04 Jammy
+  * Initial libestr package for Ubuntu 24.04 Noble
 
- -- Florian Riedl <adiscon-pkg-maintainers@adiscon.com>  Thu, 24 Mar 2022 17:45:39 +0000
+ -- Florian Riedl <adiscon-pkg-maintainers@adiscon.com>  Mon, 01 Jul 2024 13:45:39 +0000
diff --git a/libfastjson/noble/v8-stable/debian/changelog b/libfastjson/noble/v8-stable/debian/changelog
@@ -1,5 +1,5 @@
 libfastjson (1.2304.0-0adiscon1noble1) noble; urgency=medium
 
   * Initial Packages for Ubuntu 24.04 Noble
-  
- -- Rainer Gerhards <adiscon-pkg-maintainers@adiscon.com>  Fri, 28 Jun 2024 15:29:59 +0000
+
+ -- Rainer Gerhards <adiscon-pkg-maintainers@adiscon.com>  Fri, 28 Jun 2024 14:57:39 +0000
diff --git a/librelp/noble/v8-stable/debian/changelog b/librelp/noble/v8-stable/debian/changelog
@@ -1,4 +1,4 @@
-librelp (1.10.0-0adiscon1noble1) noble; urgency=medium
+librelp (1.11.0-0adiscon1noble1) noble; urgency=medium
 
   * Initial upstream release for Ubuntu 24.04 Noble
 

diff --git a/scripts/config.sh b/scripts/config.sh
@@ -2,5 +2,7 @@ PLATFORM="precise trusty xenial bionic eoan focal groovy jammy noble"
 ARCHTECT="amd64 i386"
 BRANCHES="v8-stable v8-stable-testing daily-stable"
 # OLD GPG KEY	AEF0CF8E
-export KEY_ID=60A6DC05CFD77E25BFB74F0F8B4ED6BFE8EDD305
+export PACKAGE_SIGNING_KEY_ID=60A6DC05CFD77E25BFB74F0F8B4ED6BFE8EDD305
 export PPA=ppa:adiscon
+export DEBEMAIL="adiscon-pkg-maintainers@adiscon.com"
+export EMAIL="adiscon-pkg-maintainers@adiscon.com"
diff --git a/scripts/uploadppa.sh b/scripts/uploadppa.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 # Definitions common to these scripts
+echo load config from $(dirname "$0")/config.sh
+
 source $(dirname "$0")/config.sh
-export DEBEMAIL="adiscon-pkg-maintainers@adiscon.com"
 
 #set -o xtrace  # use for debugging
 
@@ -51,12 +52,26 @@ if [ "$RESULT" == "y" ]; then
 fi
 
 # Build Source package now!
-debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID"
+if [ -v PACKAGE_SIGNING_KEY_ID ]; then
+	echo "RUN debuild -S -sa -rfakeroot -k $PACKAGE_SIGNING_KEY_ID
+	debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID"
+else
+	echo "RUN WITHOUT KEY debuild -S -sa -rfakeroot -us -uc
+    debuild -S -sa -rfakeroot -us -uc
+fi
+if [ $? -ne 0 ]; then
+	echo "FAIL in debuild for $PACKAGENAME $VERSION on $szPlatform"
+    exit 1
+fi
+
+# Fix filepermissions
 chmod -f g+w *
 
+# we now need to climb out of the working tree, all distributable
+# files are generated in the home directory.
+cd ..
+
 if [ "$RESULT" == "y" ]; then
-	# Save Changes back now
-	cd ..
 	szDebian="debian"
 	echo    # (optional) move to a new line
 	read -p "Copy $szPrepareDir$szDebian folder back to $szPlatform/$szBranch/$szDebian (y/n)? " RESULT
@@ -67,21 +82,39 @@ if [ "$RESULT" == "y" ]; then
 	fi
 fi
 
-CHANGESFILES=`ls *.changes`
+echo "-------------------------------------"
+echo "--- ls *.changes ---"
+ls -al 
+ls *.changes
 
 echo "-------------------------------------"
 echo "--- Select change file for upload ---"
 echo "-------------------------------------"
+CHANGESFILES=`ls *.changes`
+
+if [ -z "$CHANGESFILES" ]; then
+	echo "FAILED: ls *.changes No changefiles found"
+	exit 1
+fi
 
 echo "Select Changefile:"
 select szChangeFile in $CHANGESFILES
 do
-        break;
+	break;
 done
 
 # Upload changes to PPA now!
+echo "Sign $szChangeFile"
+debsign -k $PACKAGE_SIGNING_KEY_ID $szChangeFile
+echo "Upload to ppa:adiscon/$szBranch"
 dput -f ppa:adiscon/$szBranch $szChangeFile
+if [ $? -ne 0 ]; then
+	echo "FAILED dput, PPA upload to Launchpad ppa:adiscon/$szBranch for $PACKAGENAME failed"
+	exit 1
+fi
 
 # cleanup
-rm -v *.changes *.debian.tar.gz
+rm -v *.changes
+rm -v *.debian.tar.gz
+# Fix filepermissions
 chmod -f g+w *