This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pale-moon. from 6f331da debian/rules: replace hardcoded locations with $(LIB_DIR). new 9bc4041 debian/rules: /usr/lib/palemoon-devel/include is a symlink by default, so make sure to properly check for and remove it. new 5d15a22 debian/rules: /usr/lib/palemoon-devel/idl also is a symlink by default, dito. new 2794c75 debian/rules: removal of duplicated /usr/lib/palemoon/palemoon-bin file (duplicate of /usr/lib/palemoon/palemoon) still necessary, so uncomment. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 9 +++++++++ debian/rules | 15 +++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 5d15a229dd3e5b1069c93cb37c0a29e42e1f20f6 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 05:57:29 2018 +0200 debian/rules: /usr/lib/palemoon-devel/idl also is a symlink by default, dito. Additionally, stage idl from /usr/share/idl/palemoon-* to /usr/lib/palemoon-devel/idl instead of /usr/lib/palemoon-devel/share/idl. Make sure to remove directories we no longer need to not end up with empty installed directories. --- debian/changelog | 5 +++++ debian/rules | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46988b4..e49de98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,11 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Replace hardcoded locations with $(LIB_DIR). - /usr/lib/palemoon-devel/include is a symlink by default, so make sure to properly check for and remove it. + - /usr/lib/palemoon-devel/idl also is a symlink by default, dito. + Additionally, stage idl from /usr/share/idl/palemoon-* to + /usr/lib/palemoon-devel/idl instead of + /usr/lib/palemoon-devel/share/idl. Make sure to remove directories we no + longer need to not end up with empty installed directories. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: diff --git a/debian/rules b/debian/rules index 167ed0e..3f55962 100755 --- a/debian/rules +++ b/debian/rules @@ -239,9 +239,14 @@ endif # Palemoon-specific hacks. - # Stage idl into $(LIB_DIR)-devel/share. - install -d -m 755 debian/tmp$(LIB_DIR)-devel/share - mv debian/tmp/usr/share/idl debian/tmp$(LIB_DIR)-devel/share/ + # Stage idl into $(LIB_DIR)-devel/. + test -L debian/tmp/$(LIB_DIR)-devel/idl # Fail if it's not a symlink. + rm -f debian/tmp/$(LIB_DIR)-devel/idl + install -d -m 755 debian/tmp$(LIB_DIR)-devel/idl + mv debian/tmp/usr/share/idl/palemoon-*/* debian/tmp$(LIB_DIR)-devel/idl/ + rmdir debian/tmp/usr/share/idl/palemoon-* + rmdir debian/tmp/usr/share/idl + rmdir debian/tmp/usr/share # remove vestigial duplicate file #rm -rf debian/tmp$(LIB_DIR)/palemoon-bin -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 9bc40419884658cfda597a16cf04494ba74cc94d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 05:53:04 2018 +0200 debian/rules: /usr/lib/palemoon-devel/include is a symlink by default, so make sure to properly check for and remove it. --- debian/changelog | 2 ++ debian/rules | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7260092..46988b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium /usr/include/palemoon-$VER directory to /usr/include/palemoon and afterwards its contents to /usr/lib/palemoon-devel/include/. - Replace hardcoded locations with $(LIB_DIR). + - /usr/lib/palemoon-devel/include is a symlink by default, so make sure to + properly check for and remove it. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: diff --git a/debian/rules b/debian/rules index 2fbd47b..167ed0e 100755 --- a/debian/rules +++ b/debian/rules @@ -202,6 +202,8 @@ endif mv debian/tmp/usr/include/palemoon-* debian/tmp/usr/include/palemoon # Stage headers into $(LIB_DIR)-devel/include. + test -L debian/tmp/$(LIB_DIR)-devel/include # Fail if it's not a symlink. + rm -f debian/tmp/$(LIB_DIR)-devel/include install -d -m 755 debian/tmp$(LIB_DIR)-devel/include mv debian/tmp/usr/include/palemoon/* debian/tmp$(LIB_DIR)-devel/include/ rmdir debian/tmp/usr/include/palemoon -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 2794c7587caf53d4f01f291a9845e52977ace271 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 05:59:03 2018 +0200 debian/rules: removal of duplicated /usr/lib/palemoon/palemoon-bin file (duplicate of /usr/lib/palemoon/palemoon) still necessary, so uncomment. --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e49de98..21706f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -91,6 +91,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium /usr/lib/palemoon-devel/idl instead of /usr/lib/palemoon-devel/share/idl. Make sure to remove directories we no longer need to not end up with empty installed directories. + - Removal of duplicated /usr/lib/palemoon/palemoon-bin file (duplicate of + /usr/lib/palemoon/palemoon) still necessary, so uncomment. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: diff --git a/debian/rules b/debian/rules index 3f55962..dbe9043 100755 --- a/debian/rules +++ b/debian/rules @@ -249,7 +249,7 @@ endif rmdir debian/tmp/usr/share # remove vestigial duplicate file - #rm -rf debian/tmp$(LIB_DIR)/palemoon-bin + rm -rf debian/tmp$(LIB_DIR)/palemoon-bin MPL-1.1: gfx/cairo/cairo/COPYING-MPL-1.1 cp -f $< $@ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
-
git-admin＠x2go.org