Package: pretzel
Version: 2.0n-2-0.3
Followup-For: Bug #800198
User: [email protected]
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/compat: Indicate compatibility level of 9.
* debian/control:
- Build-depend on debhelper (>= 9).
- Bump Standards-Version to 3.9.8.
- Depend on ${misc:Depends}.
* debian/rules:
- Add recommended build-arch and build-indep targets.
- Remove obsolete dh_installmanpages.
- Use dh_prep instead of dh_clean -k.
- Use $(CURDIR) instead of $(PWD).
- Install into debian/pretzel instead of debian/tmp.
* debian/{postinst,postrm}: Remove paths from commands.
* debian/copyright:
- Fix reference to symlink license.
- Update FSF address.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru pretzel-2.0n-2/debian/compat pretzel-2.0n-2/debian/compat
--- pretzel-2.0n-2/debian/compat 1969-12-31 19:00:00.000000000 -0500
+++ pretzel-2.0n-2/debian/compat 2016-07-10 21:06:18.000000000 -0400
@@ -0,0 +1 @@
+9
diff -Nru pretzel-2.0n-2/debian/control pretzel-2.0n-2/debian/control
--- pretzel-2.0n-2/debian/control 2004-08-21 13:10:55.000000000 -0400
+++ pretzel-2.0n-2/debian/control 2016-07-11 13:40:28.000000000 -0400
@@ -2,12 +2,12 @@
Section: devel
Priority: extra
Maintainer: Anthony Towns <[email protected]>
-Standards-Version: 3.1.1
-Build-Depends: nowebm, flex (>= 2.4.6), bison (>= 1.19), debhelper
+Standards-Version: 3.9.8
+Build-Depends: nowebm, flex (>= 2.4.6), bison (>= 1.19), debhelper (>= 9)
Package: pretzel
Architecture: any
-Depends: ${shlibs:Depends}, flex (>= 2.4.6), bison (>= 1.19)
+Depends: ${misc:Depends}, ${shlibs:Depends}, flex (>= 2.4.6), bison (>= 1.19)
Recommends: noweb | nowebm
Description: Prettyprinter generator for noweb
Pretzel is a system that builds prettyprinters; that is programs that
diff -Nru pretzel-2.0n-2/debian/copyright pretzel-2.0n-2/debian/copyright
--- pretzel-2.0n-2/debian/copyright 2004-08-21 13:10:55.000000000 -0400
+++ pretzel-2.0n-2/debian/copyright 2016-07-11 13:34:33.000000000 -0400
@@ -21,8 +21,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian systems, a copy of the GPL is available as
-/usr/share/common-licenses/GPL .
+/usr/share/common-licenses/GPL-2 .
diff -Nru pretzel-2.0n-2/debian/postinst pretzel-2.0n-2/debian/postinst
--- pretzel-2.0n-2/debian/postinst 2004-08-21 13:10:55.000000000 -0400
+++ pretzel-2.0n-2/debian/postinst 2016-07-11 13:32:03.000000000 -0400
@@ -3,8 +3,8 @@
set -e
if [ "$1" = "configure" ]; then
- if [ -x /usr/bin/texhash ]; then
- /usr/bin/texhash >/dev/null
+ if [ -x texhash ]; then
+ texhash >/dev/null
fi
fi
diff -Nru pretzel-2.0n-2/debian/postrm pretzel-2.0n-2/debian/postrm
--- pretzel-2.0n-2/debian/postrm 2004-08-21 13:10:55.000000000 -0400
+++ pretzel-2.0n-2/debian/postrm 2016-07-11 13:32:12.000000000 -0400
@@ -3,8 +3,8 @@
set -e
if [ "$1" = "remove" ]; then
- if [ -x /usr/bin/texhash ]; then
- /usr/bin/texhash >/dev/null
+ if [ -x texhash ]; then
+ texhash >/dev/null
fi
fi
diff -Nru pretzel-2.0n-2/debian/rules pretzel-2.0n-2/debian/rules
--- pretzel-2.0n-2/debian/rules 2008-03-09 14:33:04.000000000 -0400
+++ pretzel-2.0n-2/debian/rules 2016-07-11 13:40:26.000000000 -0400
@@ -6,7 +6,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
@@ -32,19 +34,19 @@
binary-indep: build
# We have nothing to do by default.
-DST := $(PWD)/debian/tmp
+DST := $(CURDIR)/debian/pretzel
# Build architecture-dependent files here.
binary-arch: build
# dh_testversion
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
- # Add here commands to install the files into debian/tmp
- $(MAKE) install DESTDIR=`pwd`/debian/tmp
- cp doc/pretzelbook/pretzelbook.dvi debian/tmp/usr/share/doc/pretzel/
+ # Add here commands to install the files into debian/pretzel
+ $(MAKE) install DESTDIR=`pwd`/debian/pretzel
+ cp doc/pretzelbook/pretzelbook.dvi debian/pretzel/usr/share/doc/pretzel/
mkdir -p $(DST)/usr/share/doc/pretzel/examples/simpas
cp -a languages/examples $(DST)/usr/share/doc/pretzel/examples/simpas
@@ -55,7 +57,7 @@
mkdir $(DST)/usr/share/doc/pretzel/examples/contrib
cp -r contrib/* $(DST)/usr/share/doc/pretzel/examples/contrib/
- rm -f debian/tmp/usr/share/doc/pretzel/examples/*/index.html debian/tmp/usr/share/doc/pretzel/examples/*/index.list
+ rm -f debian/pretzel/usr/share/doc/pretzel/examples/*/index.html debian/pretzel/usr/share/doc/pretzel/examples/*/index.list
# for a in cee pascal; do \
# mkdir tmp$$a; cd tmp$$a; \
@@ -71,7 +73,7 @@
dh_installmenu
# dh_installinit
dh_installcron
- dh_installmanpages
+# dh_installmanpages
# dh_undocumented
dh_installchangelogs diary diary-1.1
dh_strip
