forked from pool/devscripts
81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
|
diff -ur devscripts-2.11.7.orig/Makefile devscripts-2.11.7/Makefile
|
||
|
--- devscripts-2.11.7.orig/Makefile 2012-05-07 02:08:21.000000000 +0200
|
||
|
+++ devscripts-2.11.7/Makefile 2012-06-27 01:25:57.172666259 +0200
|
||
|
@@ -11,7 +11,7 @@
|
||
|
DOCDIR ?= $(PREFIX)/share/doc/devscripts
|
||
|
MAN1DIR ?= $(PREFIX)/share/man/man1
|
||
|
|
||
|
-all: version make_scripts $(EXAMPLES) translated_manpages
|
||
|
+all: version scripts $(EXAMPLES)
|
||
|
|
||
|
version:
|
||
|
rm -f version
|
||
|
@@ -40,7 +40,7 @@
|
||
|
install: all install_scripts
|
||
|
cp -a $(PERL_MODULES) $(DESTDIR)$(PERLMOD_DIR)
|
||
|
cp $(EXAMPLES) $(DESTDIR)$(EXAMPLES_DIR)
|
||
|
- install -D README $(DESTDIR)$(DOCDIR)/README
|
||
|
+ install -D -m644 README $(DESTDIR)$(DOCDIR)/README
|
||
|
install -dD $(DESTDIR)$(MAN1DIR)
|
||
|
cp doc/*.1 $(DESTDIR)$(MAN1DIR)
|
||
|
ln -sf edit-patch.1 $(DESTDIR)$(MAN1DIR)/add-patch.1
|
||
|
diff -ur devscripts-2.11.7.orig/Makefile.common devscripts-2.11.7/Makefile.common
|
||
|
--- devscripts-2.11.7.orig/Makefile.common 2012-05-07 02:08:21.000000000 +0200
|
||
|
+++ devscripts-2.11.7/Makefile.common 2012-06-27 01:25:57.173666386 +0200
|
||
|
@@ -6,3 +6,4 @@
|
||
|
PERLMOD_DIR = /usr/share/devscripts
|
||
|
EXAMPLES_DIR = /usr/share/devscripts
|
||
|
|
||
|
+XSL_STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
|
||
|
diff -ur devscripts-2.11.7.orig/po4a/Makefile devscripts-2.11.7/po4a/Makefile
|
||
|
--- devscripts-2.11.7.orig/po4a/Makefile 2012-05-07 02:08:21.000000000 +0200
|
||
|
+++ devscripts-2.11.7/po4a/Makefile 2012-06-27 01:25:57.175666640 +0200
|
||
|
@@ -22,8 +22,7 @@
|
||
|
podchecker $<
|
||
|
pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@
|
||
|
fr/%.fr.1: fr/%.fr.dbk translate
|
||
|
- xsltproc --nonet -o $@ \
|
||
|
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
||
|
+ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $<
|
||
|
# xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
|
||
|
# to rename the file after it's generated
|
||
|
mv fr/$*.1 $@
|
||
|
diff -ur devscripts-2.11.7.orig/scripts/Makefile devscripts-2.11.7/scripts/Makefile
|
||
|
--- devscripts-2.11.7.orig/scripts/Makefile 2012-05-07 02:08:21.000000000 +0200
|
||
|
+++ devscripts-2.11.7/scripts/Makefile 2012-06-27 01:26:52.589709476 +0200
|
||
|
@@ -24,7 +24,7 @@
|
||
|
LIBDIR = /usr/lib/devscripts
|
||
|
BIN_LIBDIR = /usr/lib/devscripts
|
||
|
|
||
|
-all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS) $(COMPLETION)
|
||
|
+all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS)
|
||
|
|
||
|
$(VERSION_FILE):
|
||
|
$(MAKE) -C .. version
|
||
|
@@ -36,7 +36,6 @@
|
||
|
bash -n $@
|
||
|
%.tmp: %.pl $(VERSION_FILE)
|
||
|
sed -e "s/###VERSION###/$(VERSION)/" $< > $@
|
||
|
- perl -I.. -c $@
|
||
|
%: %.tmp
|
||
|
cp $< $@
|
||
|
chmod +x $@
|
||
|
@@ -45,8 +44,7 @@
|
||
|
podchecker $<
|
||
|
pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
|
||
|
%.1: %.dbk
|
||
|
- xsltproc --nonet -o $@ \
|
||
|
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
||
|
+ xsltproc --nonet -o $@ $(XSL_STYLESHEET) $<
|
||
|
|
||
|
# There is a slight chance this gets called twice, once here from here and once
|
||
|
# from ../po4a/Makefile. Treat files with care.
|
||
|
@@ -82,7 +80,6 @@
|
||
|
ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
|
||
|
cp $(LIBS) $(DESTDIR)$(LIBDIR)
|
||
|
install -dD $(DESTDIR)/etc/bash_completion.d
|
||
|
- cp $(COMPLETION) $(DESTDIR)/etc/bash_completion.d
|
||
|
# Special treatment for debpkg
|
||
|
install -dD $(DESTDIR)$(PERLMOD_DIR)
|
||
|
mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)
|