simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #308 from a-detiste/master

Browse source 
clean up debian/rules
This commit is contained in:
Luka Krajger 2015-05-16 18:14:18 +02:00
commit 89d4a87c53
5 changed files with 24 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1 +0,0 @@
Please see CHANGELOG.md

1
ChangeLog Symbolic link
View file

@ -0,0 +1 @@
CHANGELOG.md

17
Makefile.am
View file

@ -12,17 +12,12 @@ noinst_HEADERS = libhttp/http.h
dist_doc_DATA = AUTHORS \ dist_doc_DATA = AUTHORS \
COPYING \ COPYING \
GPL-2 \ GPL-2 \
CHANGELOG.md \ NEWS
INSTALL \
NEWS \
README \
TODO \
shellinabox/white-on-black.css \
shellinabox/black-on-white.css \
shellinabox/monochrome.css \
shellinabox/color.css
EXTRA_DIST = INSTALL.Debian \ EXTRA_DIST = INSTALL.Debian \
README.Fedora \ README.Fedora \
INSTALL \
README \
TODO \
demo/beep.wav \ demo/beep.wav \
demo/favicon.ico \ demo/favicon.ico \
demo/demo.html \ demo/demo.html \
@ -44,6 +39,10 @@ EXTRA_DIST = INSTALL.Debian \
shellinabox/shell_in_a_box.js \ shellinabox/shell_in_a_box.js \
shellinabox/vt100.js \ shellinabox/vt100.js \
shellinabox/cgi-mode-example.sh \ shellinabox/cgi-mode-example.sh \
shellinabox/white-on-black.css \
shellinabox/black-on-white.css \
shellinabox/monochrome.css \
shellinabox/color.css \
debian/README \ debian/README \
debian/README.available \ debian/README.available \
debian/README.enabled \ debian/README.enabled \

1
debian/changelog vendored
View file

@ -5,6 +5,7 @@ shellinabox (2.15-1) UNRELEASED; urgency=medium
* Bump debhelper compat to 9 * Bump debhelper compat to 9
* move lintian exception in d/shellinabox.lintian * move lintian exception in d/shellinabox.lintian
* change urls to new GitHub repos * change urls to new GitHub repos
* Closing release coordination metabug (Closes: #785181)
-- Alexandre Detiste <alexandre.detiste@gmail.com> Tue, 12 May 2015 14:06:55 +0200 -- Alexandre Detiste <alexandre.detiste@gmail.com> Tue, 12 May 2015 14:06:55 +0200

52
debian/rules vendored
View file

@ -1,10 +1,5 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# -*- makefile -*- # -*- makefile -*-
# Sample debian/rules that uses debhelper.
# This file was originally written by Joey Hess and Craig Small.
# As a special exception, when this file is copied by dh-make into a
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
@ -20,38 +15,19 @@
override_dh_auto_configure: override_dh_auto_configure:
dh_auto_configure -- --disable-runtime-loading dh_auto_configure -- --disable-runtime-loading
# elf-2012.03.24: This work should be done in the Makefile install AVAILABLE=debian/shellinabox/etc/shellinabox/options-available
# target instead of debian/rules. ENABLED=debian/shellinabox/etc/shellinabox/options-enabled
DESTDIR=$(CURDIR)/debian/tmp
override_dh_install: override_dh_install:
dh_testdir
dh_testroot
dh_prep
dh_installdirs
# We need to install some files for the benefit of Debian that aren't
# going into the program instal target. So, we install into
# debian/tmp the things that need to be included in the package.
$(MAKE) install DESTDIR=$(DESTDIR)
# Set up system-wide user CSS style options
mkdir -p "$(DESTDIR)/etc/shellinabox/options-available"
mkdir -p "$(DESTDIR)/etc/shellinabox/options-enabled"
for i in \
"00+Black On White" \
"00_White On Black" \
"01_Monochrome" \
"01+Color Terminal"; do \
cp "$(DESTDIR)/usr/share/doc/shellinabox/$$(echo "$$i"| \
sed -e 's/[0-9]*[_+]\([^ ]*\).*/\1/'| \
tr A-Z a-z)"*.css \
"$(DESTDIR)/etc/shellinabox/options-available/$$i.css"; \
done
cd "$(DESTDIR)/etc/shellinabox/options-enabled" \
&& ln -s ../options-available/*.css .
cp "$(CURDIR)/debian/README.available" \
"$(DESTDIR)/etc/shellinabox/options-available/README"
cp "$(CURDIR)/debian/README.enabled" \
"$(DESTDIR)/etc/shellinabox/options-enabled/README"
# Shellinabox home directory
# mkdir -p "$(DESTDIR)/var/lib/shellinabox"
# Now perform the normal debhelper install.
dh_install dh_install
install -D -m644 shellinabox/black-on-white.css "$(AVAILABLE)/00+Black on White.css"
install -D -m644 shellinabox/white-on-black.css "$(AVAILABLE)/00_White on Black.css"
install -D -m644 shellinabox/color.css "$(AVAILABLE)/01+Color Terminal.css"
install -D -m644 shellinabox/monochrome.css "$(AVAILABLE)/01_Monochrome.css"
install -D -m644 debian/README.available "$(AVAILABLE)/README"
install -D -m644 debian/README.enabled "$(ENABLED)/README"
cd "$(ENABLED)" && ln -s ../options-available/*.css .
# info duplicated in debian/copyright
# and /usr/share/common-licenses/GPL-2
rm debian/shellinabox/usr/share/doc/shellinabox/COPYING
rm debian/shellinabox/usr/share/doc/shellinabox/GPL-2

4
debian/shellinabox.install vendored
View file

@ -1,4 +0,0 @@
etc/shellinabox/options-available
etc/shellinabox/options-enabled
usr/bin
usr/share/man/man1