[topmenu-gtk] 05/05: debian/rules: Update mate-applet-topmenu to build against GTK3. Get upstream release tarball only.

Martin Wimpress flexiondotorg-guest at moszumanska.debian.org
Tue Aug 23 16:36:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository topmenu-gtk.

commit 1acf23f65964bdd4ef73b822ac6a9b3aaa5616fc
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Aug 23 17:34:57 2016 +0100

    debian/rules: Update mate-applet-topmenu to build against GTK3. Get upstream release tarball only.
---
 debian/rules | 71 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1f8f1ba..5b9fd8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,6 @@
 #!/usr/bin/make -f
 
 NULL  =
-PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
-PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
-DTYPE =
-VER  ?= $(subst $(DTYPE),,$(UVER))
-
-UURL = https://git.javispedro.com/topmenu-gtk.git
-UREV = $(shell echo $(VER) | cut -d"." -f5)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -28,6 +20,7 @@ DEB_DESTDIR_libtopmenu-client-gtk3-0 := $(CURDIR)/debian/libtopmenu-client-gtk3-
 DEB_DESTDIR_libtopmenu-server-gtk3-0 := $(CURDIR)/debian/libtopmenu-server-gtk3-0
 DEB_DESTDIR_libtopmenu-client-gtk3-dev := $(CURDIR)/debian/libtopmenu-client-gtk3-dev
 DEB_DESTDIR_libtopmenu-server-gtk3-dev := $(CURDIR)/debian/libtopmenu-server-gtk3-dev
+DEB_DESTDIR_mate-applet-topmenu := $(CURDIR)/debian/mate-applet-topmenu
 
 DEB_DH_MAKESHLIBS_ARGS_topmenu-gtk2 += --no-act
 DEB_DH_MAKESHLIBS_ARGS_topmenu-gtk3 += --no-act
@@ -51,10 +44,9 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	    --with-gtk=2 \
 	    --with-wnck=wnck1 \
 	    --disable-static \
-	    --enable-mate-applet=yes \
-	    --libexecdir=/usr/lib/mate-applets \
-	    --enable-xfce-applet=yes \
-	    --enable-lxpanel-plugin=yes \
+	    --disable-mate-applet \
+	    --enable-xfce-applet \
+	    --enable-lxpanel-plugin \
 	    $(NULL)
 
 configure/topmenu-gtk3:: $(DEB_BUILDDIR_topmenu-gtk3)/config.status
@@ -67,9 +59,11 @@ $(DEB_BUILDDIR_topmenu-gtk3)/config.status:
 	        $(cdbs_configure_flags) \
 	        --prefix=/usr \
 	        --includedir=/usr/include/topmenu-gtk3 \
+	        --libexecdir=/usr/lib/mate-applets \
 	        --with-gtk=3 \
 	        --with-wnck=wnck3 \
 	        --disable-static \
+	        --enable-mate-applet \
 	        $(DEB_CONFIGURE_USER_FLAGS)
 
 cleanbuilddir/topmenu-gtk3::
@@ -84,6 +78,9 @@ install/topmenu-gtk3::
 	rm -f   $(DEB_DESTDIR_topmenu-gtk3)/usr/lib/*.so*
 	rm -f   $(DEB_DESTDIR_topmenu-gtk3)/usr/lib/*.la
 	rm -f   $(DEB_DESTDIR_topmenu-gtk3)/usr/lib/*/gtk-3.0/modules/*.la
+	rm -Rf  $(DEB_DESTDIR_topmenu-gtk3)/usr/lib/mate-applets/
+	rm -Rf  $(DEB_DESTDIR_topmenu-gtk3)/usr/share/dbus-1/
+	rm -Rf  $(DEB_DESTDIR_topmenu-gtk3)/usr/share/mate-panel/
 	rm -Rf  $(DEB_DESTDIR_topmenu-gtk3)/usr/share/icons/
 	mkdir -p $(DEB_DESTDIR_topmenu-gtk3)/usr/share/doc/topmenu-gtk3/
 	cp         README.md $(DEB_DESTDIR_topmenu-gtk3)/usr/share/doc/topmenu-gtk3/
@@ -97,6 +94,9 @@ install/libtopmenu-client-gtk3-0::
 	rm -f   $(DEB_DESTDIR_libtopmenu-client-gtk3-0)/usr/lib/*.so
 	rm -f   $(DEB_DESTDIR_libtopmenu-client-gtk3-0)/usr/lib/*.la
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-0)/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/lib/mate-applets/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/share/dbus-1/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/share/mate-panel/
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-0)/usr/share/icons/
 
 install/libtopmenu-server-gtk3-0::
@@ -106,6 +106,9 @@ install/libtopmenu-server-gtk3-0::
 	rm -f   $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/lib/*.so
 	rm -f   $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/lib/*.la
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/lib/mate-applets/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/share/dbus-1/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/share/mate-panel/
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-0)/usr/share/icons/
 
 install/libtopmenu-client-gtk3-dev::
@@ -116,6 +119,9 @@ install/libtopmenu-client-gtk3-dev::
 	rm -f   $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/lib/*.la
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/share/icons/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/lib/mate-applets/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/share/dbus-1/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/share/mate-panel/
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/include/topmenu-gtk3/topmenu-server.h
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-client-gtk3-dev)/usr/include/topmenu-gtk3/topmenu-widget.h
 
@@ -127,10 +133,24 @@ install/libtopmenu-server-gtk3-dev::
 	rm -f   $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/lib/*.la
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/
 	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/share/icons/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/lib/mate-applets/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/share/dbus-1/
+	rm -Rf  $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/share/mate-panel/
 	rm -f   $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/include/topmenu-gtk3/topmenu-client.h
 	rm -f   $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/include/topmenu-gtk3/topmenu-monitor.h
 	rm -f   $(DEB_DESTDIR_libtopmenu-server-gtk3-dev)/usr/include/topmenu-gtk3/topmenu-appmenubar.h
 
+install/mate-applet-topmenu::
+	make -C $(DEB_BUILDDIR_topmenu-gtk3) install DESTDIR=$(DEB_DESTDIR_mate-applet-topmenu)
+	rm -Rf  $(DEB_DESTDIR_mate-applet-topmenu)/usr/include/
+	rm -Rf  $(DEB_DESTDIR_mate-applet-topmenu)/usr/lib/*/gtk-3.0/
+	rm -f   $(DEB_DESTDIR_mate-applet-topmenu)/usr/lib/*client*
+	rm -f   $(DEB_DESTDIR_mate-applet-topmenu)/usr/lib/*server*
+	rm -f   $(DEB_DESTDIR_mate-applet-topmenu)/usr/lib/*.so
+	rm -f   $(DEB_DESTDIR_mate-applet-topmenu)/usr/lib/*.la
+	rm -Rf  $(DEB_DESTDIR_mate-applet-topmenu)/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/
+	rm -Rf  $(DEB_DESTDIR_mate-applet-topmenu)/usr/share/icons/
+
 common-install-indep:: remove-cruft
 common-install-arch:: remove-cruft
 
@@ -140,28 +160,5 @@ remove-cruft::
 	rm -f  debian/tmp/usr/lib/xfce4/panel-plugins/libtopmenu.la
 	rm -f  debian/tmp/usr/lib/*/lxpanel/plugins/libtopmenu.la
 
-## http://wiki.debian.org/onlyjob/get-orig-source
-.PHONY: get-orig-source
-get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
-$(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(info I: GIT Revision=$(UREV))
-	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
-	@echo "# Downloading..."
-	git clone $(UURL) $(PKG)-$(VER) \
-	    || $(RM) -r $(PKG)-$(VER)
-	cd $(PKG)-$(VER) \
-	    && git checkout "$(UREV)" \
-	    && ( echo "# Generating ChangeLog..." \
-	   ; git --no-pager log --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog \
-	       ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
-	    && echo "# Setting times..." \
-	    && for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
-	    && $(RM) -r .git .git*
-#	    && echo "# Cleaning-up..." \
-#	    && rm -rf \
-#	        # NOTHING TO BE REMOVED
-	@echo "# Packing..."
-	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	    | XZ_OPT="-6v" tar -caf "../$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
-	    && $(RM) -r "$(PKG)-$(VER)"
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/topmenu-gtk.git



More information about the pkg-mate-commits mailing list