Manual Changelog versioning

distro/scripts/obs-upload.sh

@@ -792,7 +792,15 @@ if [[ "$UPLOAD_DEBIAN" == true ]] && [[ "$SOURCE_FORMAT" == *"native"* ]] && [[
                     echo "    Renaming $EXTRACTED to $EXPECTED_SOURCE_DIR"
                     mv "$EXTRACTED" "$EXPECTED_SOURCE_DIR"
                     rm -f "$WORK_DIR/dms-source.tar.gz"
-                    tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/dms-source.tar.gz" "$EXPECTED_SOURCE_DIR"
+                    if ! tar --sort=name --mtime='2000-01-01 00:00:00' --owner=0 --group=0 -czf "$WORK_DIR/dms-source.tar.gz" "$EXPECTED_SOURCE_DIR"; then
+                        echo "    Error: Failed to create dms-source.tar.gz"
+                        ls -lah "$EXPECTED_SOURCE_DIR" | head -20
+                        exit 1
+                    fi
+                    if [[ ! -f "$WORK_DIR/dms-source.tar.gz" ]]; then
+                        echo "    Error: dms-source.tar.gz was not created"
+                        exit 1
+                    fi
                     ROOT_DIR=$(tar -tf "$WORK_DIR/dms-source.tar.gz" | head -1 | cut -d/ -f1)
                     if [[ "$ROOT_DIR" != "$EXPECTED_SOURCE_DIR" ]]; then
                         echo "    Error: Recreated tarball has wrong root directory: $ROOT_DIR (expected $EXPECTED_SOURCE_DIR)"
@@ -917,15 +925,31 @@ EOF
     fi
 fi
 
-cd "$WORK_DIR"
+# Ensure we're in WORK_DIR and it exists
+if [[ ! -d "$WORK_DIR" ]]; then
+    echo "ERROR: WORK_DIR does not exist: $WORK_DIR"
+    exit 1
+fi
+
+cd "$WORK_DIR" || {
+    echo "ERROR: Cannot cd to WORK_DIR: $WORK_DIR"
+    exit 1
+}
 
 find . -maxdepth 1 -type f \( -name "*.dsc" -o -name "*.spec" \) -exec grep -l "^<<<<<<< " {} \; 2>/dev/null | while read -r conflicted_file; do
     echo "  Removing conflicted text file: $conflicted_file"
     rm -f "$conflicted_file"
 done
 
-# Ensure we're in WORK_DIR before running osc commands
-cd "$WORK_DIR"
+# Ensure we're STILL in WORK_DIR before running osc commands
+cd "$WORK_DIR" || {
+    echo "ERROR: Cannot cd to WORK_DIR: $WORK_DIR"
+    exit 1
+}
+echo "DEBUG: Current directory: $(pwd)"
+echo "DEBUG: WORK_DIR=$WORK_DIR"
+echo "DEBUG: Files in directory:"
+ls -la 2>&1 | head -20
 
 echo "==> Staging changes"
 echo "Files to upload:"

distro/scripts/ppa-build.sh

@@ -50,9 +50,15 @@ fi
 # Get absolute path
 PACKAGE_DIR=$(cd "$PACKAGE_DIR" && pwd)
 PACKAGE_NAME=$(basename "$PACKAGE_DIR")
+PACKAGE_PARENT=$(dirname "$PACKAGE_DIR")
+
+# Create temporary working directory (like OBS)
+TEMP_WORK_DIR=$(mktemp -d -t ppa_build_work_XXXXXX)
+trap "rm -rf '$TEMP_WORK_DIR'" EXIT
 
 info "Building source package for: $PACKAGE_NAME"
 info "Package directory: $PACKAGE_DIR"
+info "Working directory: $TEMP_WORK_DIR"
 info "Target Ubuntu series: $UBUNTU_SERIES"
 
 # Check for required files
@@ -119,8 +125,13 @@ elif [[ -z "${GITHUB_ACTIONS:-}" ]] && [[ -z "${CI:-}" ]]; then
     echo "==> Local/manual run detected (not in CI)"
 fi
 
+# Copy package to temp working directory
+info "Copying package to working directory..."
+cp -r "$PACKAGE_DIR" "$TEMP_WORK_DIR/"
+WORK_PACKAGE_DIR="$TEMP_WORK_DIR/$PACKAGE_NAME"
+
 # Detect package type and update version automatically
-cd "$PACKAGE_DIR"
+cd "$WORK_PACKAGE_DIR"
 
 # Function to get latest tag from GitHub
 get_latest_tag() {
@@ -589,10 +600,12 @@ info "Building source package..."
 echo
 
 # Determine if we need to include orig tarball (-sa) or just debian changes (-sd)
-# Check if .orig.tar.xz already exists in parent directory (previous build)
+# Check if .orig.tar.xz already exists in real parent directory (previous build)
 ORIG_TARBALL="${PACKAGE_NAME}_${VERSION%.ppa*}.orig.tar.xz"
-if [ -f "../$ORIG_TARBALL" ]; then
-    info "Found existing orig tarball, using -sd (debian changes only)"
+if [ -f "$PACKAGE_PARENT/$ORIG_TARBALL" ]; then
+    info "Found existing orig tarball in $PACKAGE_PARENT, using -sd (debian changes only)"
+    # Copy it to temp parent so debuild can find it
+    cp "$PACKAGE_PARENT/$ORIG_TARBALL" "$TEMP_WORK_DIR/"
     DEBUILD_SOURCE_FLAG="-sd"
 else
     info "No existing orig tarball found, using -sa (include original source)"
@@ -606,15 +619,19 @@ if yes | DEBIAN_FRONTEND=noninteractive debuild -S $DEBUILD_SOURCE_FLAG -d; then
     echo
     success "Source package built successfully!"
 
+    # Copy build artifacts back to parent directory
+    info "Copying build artifacts to $PACKAGE_PARENT..."
+    cp -v "$TEMP_WORK_DIR"/${SOURCE_NAME}_${CHANGELOG_VERSION}* "$PACKAGE_PARENT/" 2>/dev/null || true
+
     # List generated files
-    info "Generated files in $(dirname "$PACKAGE_DIR"):"
-    ls -lh "$(dirname "$PACKAGE_DIR")"/${SOURCE_NAME}_${CHANGELOG_VERSION}* 2>/dev/null || true
+    info "Generated files in $PACKAGE_PARENT:"
+    ls -lh "$PACKAGE_PARENT"/${SOURCE_NAME}_${CHANGELOG_VERSION}* 2>/dev/null || true
 
     # Show what to do next
     echo
     info "Next steps:"
     echo "  1. Review the source package:"
-    echo "     cd $(dirname "$PACKAGE_DIR")"
+    echo "     cd $PACKAGE_PARENT"
     echo "     ls -lh ${SOURCE_NAME}_${CHANGELOG_VERSION}*"
     echo
     echo "  2. Upload to PPA (stable):"
@@ -624,7 +641,7 @@ if yes | DEBIAN_FRONTEND=noninteractive debuild -S $DEBUILD_SOURCE_FLAG -d; then
     echo "     dput ppa:avengemedia/dms-git ${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes"
     echo
     echo "  4. Or use the upload script:"
-    echo "     ./upload-ppa.sh $(dirname "$PACKAGE_DIR")/${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes dms"
+    echo "     ./upload-ppa.sh $PACKAGE_PARENT/${SOURCE_NAME}_${CHANGELOG_VERSION}_source.changes dms"
 
 else
     error "Source package build failed!"

distro/scripts/ppa-dput.sh

@@ -150,7 +150,38 @@ fi
 info "Uploading to Launchpad..."
 echo
 
-if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; then
+UPLOAD_SUCCESS=false
+
+if [ "$UPLOAD_METHOD" = "dput" ]; then
+    if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; then
+        UPLOAD_SUCCESS=true
+    fi
+elif [ "$UPLOAD_METHOD" = "lftp" ]; then
+    # Use lftp to upload to Launchpad PPA
+    CHANGES_DIR=$(dirname "$CHANGES_FILE")
+    CHANGES_BASENAME=$(basename "$CHANGES_FILE")
+    
+    # Extract files to upload from .changes file
+    FILES_TO_UPLOAD=("$CHANGES_BASENAME")
+    while IFS= read -r line; do
+        if [[ "$line" =~ ^\ [a-f0-9]+\ [0-9]+\ [^\ ]+\ [^\ ]+\ (.+)$ ]]; then
+            FILES_TO_UPLOAD+=("${BASH_REMATCH[1]}")
+        fi
+    done < "$CHANGES_FILE"
+    
+    # Build lftp command to upload all files
+    LFTP_COMMANDS="set ftp:ssl-allow no; open ftp://ppa.launchpad.net; user anonymous ''; cd ~avengemedia/ubuntu/$PPA_NAME/;"
+    for file in "${FILES_TO_UPLOAD[@]}"; do
+        LFTP_COMMANDS="$LFTP_COMMANDS put '$CHANGES_DIR/$file';"
+    done
+    LFTP_COMMANDS="$LFTP_COMMANDS bye"
+    
+    if echo "$LFTP_COMMANDS" | lftp; then
+        UPLOAD_SUCCESS=true
+    fi
+fi
+
+if [ "$UPLOAD_SUCCESS" = true ]; then
     echo
     success "Upload successful!"
     echo
@@ -166,7 +197,6 @@ if dput "ppa:avengemedia/$PPA_NAME" "$CHANGES_FILE"; then
     echo "  sudo add-apt-repository ppa:avengemedia/$PPA_NAME"
     echo "  sudo apt update"
     echo "  sudo apt install $PACKAGE_NAME"
-
 else
     error "Upload failed!"
     echo