Bas Couwenberg pushed to branch master at Debian GIS Project / geos


Commits:
e5773c8c by Bas Couwenberg at 2023-08-12T11:29:15+02:00
Use execute_{before,after} instead of override in rules file.

- - - - -


4 changed files:

- debian/changelog
- + debian/clean
- + debian/not-installed
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,7 @@ geos (3.12.0-1) unstable; urgency=medium
   * Update symbols for other architectures.
   * Strip pre-releases from symbols version.
   * Move from experimental to unstable.
+  * Use execute_{before,after} instead of override in rules file.
 
  -- Bas Couwenberg <[email protected]>  Tue, 27 Jun 2023 20:14:27 +0200
 


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+debian/libgeos++-dev.install


=====================================
debian/not-installed
=====================================


=====================================
debian/rules
=====================================
@@ -19,15 +19,10 @@ export DEB_CXXFLAGS_MAINT_PREPEND=-fpermissive
 %:
        dh $@ --with pkgkde_symbolshelper --builddirectory=build 
--buildsystem=cmake
 
-override_dh_clean:
-       dh_clean debian/libgeos++-dev.install
-
 override_dh_auto_configure:
        dh_auto_configure -- -DBUILD_DOCUMENTATION=ON
 
-override_dh_auto_build:
-       dh_auto_build
-
+execute_after_dh_auto_build:
        $(MAKE) -C build docs
 
 override_dh_auto_test:
@@ -38,7 +33,7 @@ else
        dh_auto_test
 endif
 
-override_dh_install:
+execute_before_dh_install:
        # add C++ headers to C++ dev package install file
        cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install
        find debian/tmp/usr/include/geos \( -name "*.h" -o -name "*.hpp" \) -a 
! -name "export.h" | sed -e 's/^debian\/tmp\///' >> debian/libgeos++-dev.install
@@ -46,11 +41,6 @@ override_dh_install:
        # Remove .asm files
        rm -f 
debian/tmp/usr/include/geos/algorithm/ttmath/ttmathuint_x86_64_msvc.asm
 
-       # Remove .la files
-       find debian/tmp/usr/lib -name '*.la' -delete
-
-       dh_install
-
 override_dh_installman:
        dh_installman -plibgeos-dev debian/geos-config.1
 



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/geos/-/commit/e5773c8c276b7b8f39e8512f0cd2f1d6676680ca

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/geos/-/commit/e5773c8c276b7b8f39e8512f0cd2f1d6676680ca
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to