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


Commits:
3e7eafbb by Bas Couwenberg at 2023-08-12T21:39:57+02:00
Use execute_{before,after} instead of override in rules file.

- - - - -


3 changed files:

- debian/changelog
- + debian/clean
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,7 @@ mapserver (8.0.1-3) UNRELEASED; urgency=medium
   * Re-instate MapScript Java bindings.
   * Export DEB_PYTHON_INSTALL_LAYOUT=deb_system instead of patching
     `setup.py install` to use --install-layout=deb.
+  * Use execute_{before,after} instead of override in rules file.
 
  -- Bas Couwenberg <[email protected]>  Wed, 21 Jun 2023 05:34:24 +0200
 


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+debian/man/*.1


=====================================
debian/rules
=====================================
@@ -33,13 +33,6 @@ BUILD_DATE := $(shell LC_ALL=C date -u "+%d %B %Y" -d 
"@$(SOURCE_DATE_EPOCH)")
        dh $@ --with php,python3,pkgkde_symbolshelper \
              --buildsystem cmake
 
-override_dh_auto_clean:
-       dh_clean
-
-       -$(RM) -f $(CURDIR)/debian/man/*.1
-       -$(RM) -rf obj-*/
-       -$(RM) -rf build-ruby*/ debian/tmp-ruby*/
-
 override_dh_auto_configure:
        dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
                             -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
@@ -83,21 +76,17 @@ override_dh_auto_configure:
                             -DWITH_JAVA=1 \
                             -DWITH_CSHARP=0
 
-override_dh_auto_build:
+execute_before_dh_auto_build:
        # Create man pages from DocBook XML
        for x in $(MANPAGES) ; do \
          docbook2x-man --string-param header-3="$(BUILD_DATE)" $$x ; \
          mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
        done
 
-       dh_auto_build
-
 override_dh_auto_test:
        # msautotest submodule is not used
 
-override_dh_auto_install:
-       dh_auto_install
-
+execute_after_dh_auto_install:
        # removing embedded rpath in binaries
        -find $(CURDIR)/debian/tmp/usr/bin -type f -exec chrpath --delete {} \;
 



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/mapserver/-/commit/3e7eafbb564063cdbea33d395c47549ee70b1ed5

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/mapserver/-/commit/3e7eafbb564063cdbea33d395c47549ee70b1ed5
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