Skip to content

Commit 385e2bd

Browse files
committed
read symlink directly
1 parent 2aa7106 commit 385e2bd

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
ruby3.4 (3.4.1-1ppa11) focal; urgency=medium
2+
3+
[ Aaron Ogata ]
4+
* read symlink directly
5+
6+
-- root <aogata@instructure.com> Wed, 05 Feb 2025 11:25:17 -0800
7+
18
ruby3.4 (3.4.1-1ppa10) focal; urgency=medium
29

310
[ Aaron Ogata ]

debian/rules

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,12 @@ override_dh_auto_install-arch:
137137
$(MAKE) install-nodoc V=1 DESTDIR=$(CURDIR)/debian/tmp
138138
find $(CURDIR)/debian/tmp -ls
139139
# restore previous behaviour from ruby 3.3
140-
# rm -f $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION)
141-
# cp $(CURDIR)/debian/tmp/usr/$(DEB_HOST_MULTIARCH)/bin/ruby$(RUBY_VERSION) $(CURDIR)/debian/tmp/usr/bin/
140+
# replace the symlink with the actual file - /usr/x86_64-pc-linux-gnu/bin
141+
if [ -L $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION) ]; then \
142+
TARGET=$$(readlink -f $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION)); \
143+
rm -f $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION); \
144+
cp $$TARGET $(CURDIR)/debian/tmp/usr/bin/ruby$(RUBY_VERSION); \
145+
fi
142146
# handle embedded copy of jquery
143147
$(RM) $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBY_API_VERSION)/rdoc/generator/template/darkfish/js/jquery.js
144148
dh_link -plibruby$(RUBY_VERSION) /usr/share/javascript/jquery/jquery.min.js /usr/lib/ruby/$(RUBY_API_VERSION)/rdoc/generator/template/darkfish/js/jquery.js

0 commit comments

Comments
 (0)