[Foo2zjs-commits] r166 - in trunk/foo2zjs_20081007dfsg/debian: . patches

[gismo at alioth.debian.org]

Author: gismo
Date: 2008-12-22 13:58:50 +0000 (Mon, 22 Dec 2008)
New Revision: 166

Added:
   trunk/foo2zjs_20081007dfsg/debian/patches/40-desktop-encoding-correction.dpatch
Modified:
   trunk/foo2zjs_20081007dfsg/debian/changelog
Log:
debian/*: remove Encoding key from *.desktop files

Part of this patch was erroneously included in the previous commit
r165 "debian/changelog: import version 20070718dfsg-9".


Modified: trunk/foo2zjs_20081007dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20081007dfsg/debian/changelog	2008-12-22 13:54:30 UTC (rev 165)
+++ trunk/foo2zjs_20081007dfsg/debian/changelog	2008-12-22 13:58:50 UTC (rev 166)
@@ -6,11 +6,15 @@
     - remove crd/qpdl/CLP* , because copyright is unclear
   * debian/*.1:
     - remove, use upstream instead.
+  * debian/hannah-package/hanna.desktop:
+    - remove now useless Encoding key, thanks to lintian.
   * debian/manpages:
     + install foo2zjs-icc2ps.1 only.
   * debian/patches/00list: update.
   * debian/patches/10-makefile.dpatch: refresh.
   * debian/patches/30-udevs-rules.dpatch: refresh.
+  * debian/patches/40-desktop-encoding-correction.dpatch:
+    - remove now useless Encoding key, thanks to lintian.
   * debian/patches/40-path-correction.dpatch: refresh.
   * debian/patches/50-fix-grotty-warnings:
     - do not apply, it requires a too long refresh and a better

Added: trunk/foo2zjs_20081007dfsg/debian/patches/40-desktop-encoding-correction.dpatch
===================================================================
--- trunk/foo2zjs_20081007dfsg/debian/patches/40-desktop-encoding-correction.dpatch	                        (rev 0)
+++ trunk/foo2zjs_20081007dfsg/debian/patches/40-desktop-encoding-correction.dpatch	2008-12-22 13:58:50 UTC (rev 166)
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+## 40-encoding-correction.dpatch by Luca Capello <luca at pca.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the now useless Encoding key
+
+if [ $# -lt 1 ]; then
+echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+      -patch) patch $patch_opts -p1 < $0;;
+      -unpatch) patch $patch_opts -p1 -R < $0;;
+      *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- foo2zjs-20081007dfsg/hplj1020.desktop.ORG	2008-10-18 01:20:33.000000000 +0200
++++ foo2zjs-20081007dfsg/hplj1020.desktop	2008-10-18 02:26:13.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=HPLJ 10xx Replaced Paper
+ Comment=HP LaserJet 1018, 1020
+ zExec=usb_printerid /dev/usb/lp0


Property changes on: trunk/foo2zjs_20081007dfsg/debian/patches/40-desktop-encoding-correction.dpatch
___________________________________________________________________
Name: svn:executable
   + *