[debian-edu-commits] [Git][debian-edu/debian-edu-install][master] 4 commits: Change install paths, to make package usrmerge-compliant

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-install


Commits:
d6a57a03 by Philip Hands at 2025-11-07T14:16:37+01:00
Change install paths, to make package usrmerge-compliant

- - - - -
c6d767b6 by Philip Hands at 2025-11-07T14:16:37+01:00
Bump standards version to 4.7.2, no changes needed.

- - - - -
b1ae4916 by Philip Hands at 2025-11-07T14:25:06+01:00
enable salsa-CI pipeline

It would be nice to use branch2repo here, in order to build mini-ISOs
for testing, but having tried that I noticed that the mini-ISO that
currently gets built is a standard build rather than a Debian-Edu
variant, which makes building it pointless, so for now I've only enabled
the standard salsa-CI pipeline.

- - - - -
58d6a016 by Philip Hands at 2025-11-07T14:25:43+01:00
changelog for usrmerge MR

- - - - -


6 changed files:

- Makefile
- debian/changelog
- debian/control
- debian/debian-edu-profile-udeb.dirs
- debian/rules
- + debian/salsa-ci.yml


Changes:

=====================================
Makefile
=====================================
@@ -80,7 +80,7 @@ update-partman-recipes: lib/partman/common/* lib/partman/recipes*-specific
 
 install-partman-recipes: update-partman-recipes
 	for partarch in $(PART_ARCHES) ; do \
-		$(INSTALL_DATA) lib/partman/$$partarch/* $(DESTDIR)/lib/partman/$$partarch ;\
+		$(INSTALL_DATA) lib/partman/$$partarch/* $(DESTDIR)/usr/lib/partman/$$partarch ;\
         done
 
 minimum-diskreq:


=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+debian-edu-install (2.12.11+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Change install paths, to make package usrmerge-compliant
+  * bump standards version to 4.7.2, no changes needed.
+  * salsa-CI: enable default pipeline
+
+ -- Philip Hands <phil at hands.com>  Fri, 07 Nov 2025 13:03:14 +0100
+
 debian-edu-install (2.12.11) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
 Build-Depends: debhelper-compat (= 13),
                po-debconf
 Build-Depends-Indep: dash
-Standards-Version: 4.6.2
+Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Homepage: https://blends.debian.org/edu
 Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu-install


=====================================
debian/debian-edu-profile-udeb.dirs
=====================================
@@ -6,6 +6,6 @@ usr/lib/post-base-installer.d
 usr/lib/base-installer.d
 usr/lib/debian-edu-install
 usr/lib/pre-pkgsel.d
-lib/partman/recipes
-lib/partman/recipes-amd64-efi
-lib/partman/not-enough-space.d
+usr/lib/partman/recipes
+usr/lib/partman/recipes-amd64-efi
+usr/lib/partman/not-enough-space.d


=====================================
debian/rules
=====================================
@@ -29,8 +29,8 @@ override_dh_auto_install:
 	for profile in $(DEFAULTS) ; do \
 	    cp preseed-values/defaults.$$profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install ; \
 	done
-	cp lib/partman/not-enough-space.d/01debian-edu-install-udeb $(CURDIR)/debian/debian-edu-profile-udeb/lib/partman/not-enough-space.d/01debian-edu-install-udeb
-	cp lib/debian-edu-common $(CURDIR)/debian/debian-edu-profile-udeb/lib/
+	cp lib/partman/not-enough-space.d/01debian-edu-install-udeb $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/partman/not-enough-space.d/01debian-edu-install-udeb
+	cp lib/debian-edu-common $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/
 	cp debian-edu-profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin
 
 override_dh_installinit:


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,7 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+variables:
+  SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1
+  SALSA_CI_DISABLE_PIUPARTS: 1
+  SALSA_CI_DISABLE_BLHC: 1



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/bf3598f3200c1c11b18d5931f5d9e75e103a0065...58d6a016e802fab6eb47e81640d608a8a6081734

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/-/compare/bf3598f3200c1c11b18d5931f5d9e75e103a0065...58d6a016e802fab6eb47e81640d608a8a6081734
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20251110/b35cdc0d/attachment-0001.htm>