Package: gerbv Version: 2.0.1-1 Hi, I've attached a debdiff with some improvements to the packaging for 2.0.1. This version now installs its own icons and .desktop file, so we don't need to install them manually from debian/rules any more.
(It uses /usr/share/icons/hicolor/.... to install various icons sizes, so we also need a call do dh_icons to update the icon cache after install / removal.) A final improvement, is that since extra-xdg-menus was approved for Debian, we can "Depends" on that to get an "Electronics" menu. This makes the unnecessary the inclusion of a bogus "Education" category, so I've included a patch to remove that.
diff -u gerbv-2.0.1/debian/changelog gerbv-2.0.1/debian/changelog --- gerbv-2.0.1/debian/changelog +++ gerbv-2.0.1/debian/changelog @@ -1,3 +1,14 @@ +gerbv (2.0.1-2) unstable; urgency=low + + * debian/rules: Added dpatch infrastructure + * debian/control: Added build dependancy on dpatch + * patches/01_remove_education.dpatch: Removed "Education" category from .desktop file + * Add dependancy on extra-xdg-menus, to provide an "Electronics" menu + * Removed manual copying of .desktop and icon file (install now does this) + * Added call to dh_icons, and bumped debhelper build-depends to 5.0.51 + + -- Peter Clifton <[EMAIL PROTECTED]> Mon, 11 Feb 2008 15:35:47 +0000 + gerbv (2.0.1-1) unstable; urgency=low * New upstream release diff -u gerbv-2.0.1/debian/compat gerbv-2.0.1/debian/compat --- gerbv-2.0.1/debian/compat +++ gerbv-2.0.1/debian/compat @@ -1 +1 @@ -4 +5 diff -u gerbv-2.0.1/debian/control gerbv-2.0.1/debian/control --- gerbv-2.0.1/debian/control +++ gerbv-2.0.1/debian/control @@ -4,11 +4,11 @@ Maintainer: Debian Electronics Team <[EMAIL PROTECTED]> Uploaders: Hamish Moffatt <[EMAIL PROTECTED]>, Wesley J. Landaker <[EMAIL PROTECTED]>, Ramakrishnan Muthukrishnan <[EMAIL PROTECTED]> Standards-Version: 3.7.3 -Build-Depends: debhelper (>= 4), libgtk2.0-dev, libglib2.0-dev, libpng12-dev, libcairo2-dev +Build-Depends: debhelper (>= 5.0.51), libgtk2.0-dev, libglib2.0-dev, libpng12-dev, libcairo2-dev, dpatch Package: gerbv Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, extra-xdg-menus Description: Gerber file viewer for PCB design gerbv is a utility for viewing Gerber files. Gerber files are used for communicating printed circuit board (PCB) designs to PCB manufacturers. diff -u gerbv-2.0.1/debian/rules gerbv-2.0.1/debian/rules --- gerbv-2.0.1/debian/rules +++ gerbv-2.0.1/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f -config.status: configure +config.status: patch configure dh_testdir # Add here commands to configure the package. @@ -20,7 +20,8 @@ $(MAKE) touch $@ -clean: +clean: clean-patched unpatch +clean-patched: dh_testdir dh_testroot @@ -31,6 +32,15 @@ dh_clean +patch: patch-stamp +patch-stamp: + dpatch apply-all + dpatch cat-all > patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + binary-indep: build dh_testroot dh_testdir @@ -45,10 +55,9 @@ dh_installdirs $(MAKE) install DESTDIR=`pwd`/debian/gerbv - cp desktop/gerbv.png debian/gerbv/usr/share/pixmaps/ - cp desktop/gerbv.desktop debian/gerbv/usr/share/applications/ dh_desktop + dh_icons dh_installdocs AUTHORS README TODO doc/*.txt dh_installexamples example/* dh_installchangelogs ChangeLog only in patch2: unchanged: --- gerbv-2.0.1.orig/debian/patches/00list +++ gerbv-2.0.1/debian/patches/00list @@ -0,0 +1 @@ +01_remove_education only in patch2: unchanged: --- gerbv-2.0.1.orig/debian/patches/01_remove_education.dpatch +++ gerbv-2.0.1/debian/patches/01_remove_education.dpatch @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_remove_education.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + [EMAIL PROTECTED]@ +diff -urNad gerbv-2.0-trunk~/desktop/gerbv.desktop gerbv-2.0-trunk/desktop/gerbv.desktop +--- gerbv-2.0-trunk~/desktop/gerbv.desktop 2008-01-29 23:05:22.000000000 +0000 ++++ gerbv-2.0-trunk/desktop/gerbv.desktop 2008-01-29 23:07:19.000000000 +0000 +@@ -8,4 +8,4 @@ + Exec=gerbv %F + Icon=gerbv + MimeType=application/x-gerber;application/x-excellon; +-Categories=Education;Electronics;Engineering; ++Categories=Electronics;Engineering;