PackageReleaseProcedure.md

@@ -21,17 +21,20 @@
    ```
 1. Push back to gitlab.
 1. Switch to `debian/bullseye` branch
-1. Merge `debian/buster` into `debian/bullseye`.  There will be a merge conflict in the changelog.  You will need to accept the new changelog entry from debian/buster, but change the version from `+deb10` to `+deb11`.
-1. commit
-1. clean merge files with `git clean -f`
+1. Cherry-pick any changes to the debian directory of debian/buster into debian/bullseye.
+1. Make any other needed packing changes (but consider making them in debian/buster first).
 1. Import from the master branch with
     ```
-    gbp import-ref master -u <version> --upstream-tag='%(version)s' --debian-branch=debian/buster
+    gbp import-ref master -u <version> --upstream-tag='%(version)s' --debian-branch=debian/bullseye
     ```
+1. Update the changelog with
+   ```
+   gbp dch -Rc -N <version>-1+deb11 -D stable --debian-branch debian/bullseye
+   ```
 1. Tag the debian branch with
    ```
-   gbp tag --debian-branch=debian/buster
+   gbp tag --debian-branch=debian/bullseye
    ```
 1. Push tags back to gitlab.
-1. (optional) go start build in jenkins: Debian10/advLigoRTS
-1. Look for version update in: https://apt.ligo-wa.caltech.edu/debian/buster_status.txt
\ No newline at end of file
+1. (optional) go start build in jenkins: Debian10/advLigoRTS, Debian11/advLigoRTS
+1. Look for version update in: https://apt.ligo-wa.caltech.edu/debian/buster_status.txt https://apt.ligo-wa.caltech.edu/debian/bullseye_status.txt
\ No newline at end of file