From 3a59da325de7524ebb698376d707dfb2c3415cf2 Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@exn.st>
Date: Wed, 17 Dec 2025 15:30:55 +0000
Subject: [PATCH 1/2] Allow opam users to pin the camp repository

---
 camp.opam    | 36 ++++++++++++++++++++++++++++++++++++
 dune-project |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 camp.opam

diff --git a/camp.opam b/camp.opam
new file mode 100644
index 0000000..21761e4
--- /dev/null
+++ b/camp.opam
@@ -0,0 +1,36 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "Camp"
+description: "A music player"
+authors: ["Andreas Rossberg"]
+license: "CC-BY-NC-SA-4.0"
+homepage: "https://github.com/rossberg/camp"
+doc: "https://github.com/rossberg/camp/blob/main/README.txt"
+bug-reports: "https://github.com/rossberg/camp/issues"
+depends: [
+  "ocaml" {>= "5.04"}
+  "dune" {>= "3.20"}
+  "raylib" {>= "1.6.0"}
+  "raylib-callbacks" {>= "1.6.0"}
+  "uunf"
+  "uucp"
+  "confero"
+  "directories"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/rossberg/camp.git"
+x-maintenance-intent: ["(latest)"]
diff --git a/dune-project b/dune-project
index a377055..ce47b85 100644
--- a/dune-project
+++ b/dune-project
@@ -5,6 +5,7 @@
 (source (github rossberg/camp))
 (license CC-BY-NC-SA-4.0)
 (documentation https://github.com/rossberg/camp/blob/main/README.txt)
+(generate_opam_files true)
 
 (package
   (name camp)

From fe48a53def593305975d581db41830e9f05af5db Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@exn.st>
Date: Wed, 17 Dec 2025 15:37:05 +0000
Subject: [PATCH 2/2] Deduplicate and move the packaging description from dune
 to opam

---
 camp.opam    | 18 ++----------------
 dune-project | 17 -----------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/camp.opam b/camp.opam
index 21761e4..7ad1838 100644
--- a/camp.opam
+++ b/camp.opam
@@ -1,4 +1,3 @@
-# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Camp"
 description: "A music player"
@@ -16,21 +15,8 @@ depends: [
   "uucp"
   "confero"
   "directories"
-  "odoc" {with-doc}
-]
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
 ]
+build: ["dune" "build" "-p" name "-j" jobs]
+run-test: ["dune" "runtest" "-p" name "-j" jobs]
 dev-repo: "git+https://github.com/rossberg/camp.git"
 x-maintenance-intent: ["(latest)"]
diff --git a/dune-project b/dune-project
index ce47b85..ce686b8 100644
--- a/dune-project
+++ b/dune-project
@@ -1,19 +1,2 @@
 (lang dune 3.20)
-
 (name camp)
-(authors "Andreas Rossberg")
-(source (github rossberg/camp))
-(license CC-BY-NC-SA-4.0)
-(documentation https://github.com/rossberg/camp/blob/main/README.txt)
-(generate_opam_files true)
-
-(package
-  (name camp)
-  (synopsis "Camp")
-  (description "A music player")
-  (depends
-    (ocaml (>= 5.04)) dune
-    (raylib (>= 1.6.0)) (raylib-callbacks (>= 1.6.0))
-    uunf uucp confero directories
-  )
-)