moat-src 0.9.7__tar.gz → 0.9.10__tar.gz

{moat_src-0.9.7/src/moat_src.egg-info → moat_src-0.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.9.7
+Version: 0.9.10
 Summary: Tools for managing the MoaT sources
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org

{moat_src-0.9.7 → moat_src-0.9.10}/debian/changelog

@@ -1,3 +1,27 @@
+moat-src (0.9.10-1) unstable; urgency=medium
+
+  * New release for 25.3.7
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 22 Jul 2025 13:25:14 +0200
+
+moat-src (0.9.9-1) unstable; urgency=medium
+
+  * New release for 25.3.6
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 22 Jul 2025 13:22:59 +0200
+
+moat-src (0.9.8-1) unstable; urgency=medium
+
+  * New release for 25.3.6
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 22 Jul 2025 13:12:31 +0200
+
+moat-src (0.9.7-2) unstable; urgency=medium
+
+  * New release for 25.3.5
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 22 Jul 2025 12:41:50 +0200
+
 moat-src (0.9.7-1) unstable; urgency=medium
 
   * New release for 25.3.4

{moat_src-0.9.7 → moat_src-0.9.10}/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
 	"gitpython",
 	"packaging",
 	]
-version = "0.9.7"
+version = "0.9.10"
 keywords = [ "MoaT",]
 requires-python = ">=3.8"
 name = "moat-src"

{moat_src-0.9.7 → moat_src-0.9.10}/src/moat/src/_main.py

@@ -190,8 +190,12 @@ class Package(_Common):
             lc = self.last_commit
         except AttributeError:
             return True
-        for d in head.diff(self.last_commit, paths=self.path if main else Path("packaging")/self.dash):
-            if Path(d.b_path).name == "changelog":
+        for d in head.diff(
+                self.last_commit if main else self._repo.last_tag,
+                paths=self.path if main else Path("packaging")/self.dash,
+            ):
+            pp=Path(d.b_path)
+            if pp.name == "changelog" and pp.parent.name == "debian":
                 continue
             if (
                 self._repo.repo_for(d.a_path, main) != self.name
@@ -1046,7 +1050,7 @@ async def build(
                 )
                 tag,ptag = res.stdout.strip().decode("utf-8").rsplit("-", 1)
                 ptag = int(ptag)
-                if tag != ltag or r.vers.pkg != ptag:
+                if tag != ltag or r.vers.pkg > ptag:
                     subprocess.run(
                         [
                             "debchange",
@@ -1061,6 +1065,9 @@ async def build(
                     )
                     repo.index.add(p / "changelog")
 
+                elif tag == ltag and r.vers.pkg < ptag:
+                    r.vers.pkg = ptag
+
                 changes = PACK / f"{r.mdash}_{ltag}-{r.vers.pkg}_{ARCH}.changes"
                 if debversion.get(r.dash, "") != ltag or r.vers.pkg != ptag or test_chg and not changes.exists():
 

{moat_src-0.9.7 → moat_src-0.9.10/src/moat_src.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.9.7
+Version: 0.9.10
 Summary: Tools for managing the MoaT sources
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org