Bug#478367: cryptonit: diff for NMU version 0.9.7-2.2

[Chris Lamb]

Hi,

The attached file is the diff for my cryptonit 0.9.7-2.2 NMU. The associated
changelog entry is:

 cryptonit (0.9.7-2.2) unstable; urgency=medium

   * Non-maintainer upload.
   * Fix bashism in debian/rules (Closes: #478367)
   * Do not build with -j4 by default (Closes: #483018)
   * Migrate encoding of debian/copyright to UTF-8.
   * Don't ignore "make distclean" errors
   * debian/control:
     - Move upstream URL to Homepage: field
     - Bump Standards-Version to 3.8.0


Regards,

-- 
Chris Lamb, UK                                       [EMAIL PROTECTED]
                                                            GPG: 0x634F9A20

diff -Nru cryptonit-0.9.7/debian/changelog cryptonit-0.9.7/debian/changelog
--- cryptonit-0.9.7/debian/changelog    2008-06-07 19:25:42.000000000 +0100
+++ cryptonit-0.9.7/debian/changelog    2008-06-07 19:25:43.000000000 +0100
@@ -1,3 +1,16 @@
+cryptonit (0.9.7-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix bashism in debian/rules (Closes: #478367)
+  * Do not build with -j4 by default (Closes: #483018)
+  * Migrate encoding of debian/copyright to UTF-8.
+  * Don't ignore "make distclean" errors
+  * debian/control:
+    - Move upstream URL to Homepage: field
+    - Bump Standards-Version to 3.8.0
+
+ -- Chris Lamb <[EMAIL PROTECTED]>  Sat, 07 Jun 2008 19:05:34 +0100
+
 cryptonit (0.9.7-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru cryptonit-0.9.7/debian/control cryptonit-0.9.7/debian/control
--- cryptonit-0.9.7/debian/control      2008-06-07 19:25:42.000000000 +0100
+++ cryptonit-0.9.7/debian/control      2008-06-07 19:25:43.000000000 +0100
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Pierre Machard <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0), libldap2-dev (>= 2.1.22-1), libssl-dev 
(>= 0.9.7c-5), wx2.6-headers, libwxgtk2.6-dev, automake1.9, autoconf, libtool
-Standards-Version: 3.7.2.0
+Standards-Version: 3.8.0
+Homepage: http://www.cryptonit.org
 
 Package: cryptonit
 Architecture: any
@@ -26,5 +27,3 @@
  .
  Cryptonit provides a graphical user interface written in C++ with
  wxWidgets.
- .
- Homepage: http://www.cryptonit.org
diff -Nru cryptonit-0.9.7/debian/copyright cryptonit-0.9.7/debian/copyright
--- cryptonit-0.9.7/debian/copyright    2008-06-07 19:25:42.000000000 +0100
+++ cryptonit-0.9.7/debian/copyright    2008-06-07 19:25:43.000000000 +0100
@@ -9,7 +9,7 @@
 
 Upstream Authors:   Mathias Brossard <[EMAIL PROTECTED]>
                     Nicolas Justin <[EMAIL PROTECTED]>
-                   Grégory Kokanosky <[EMAIL PROTECTED]>
+                   Grégory Kokanosky <[EMAIL PROTECTED]>
                    Pierre Machard <[EMAIL PROTECTED]>
 
 
diff -Nru cryptonit-0.9.7/debian/rules cryptonit-0.9.7/debian/rules
--- cryptonit-0.9.7/debian/rules        2008-06-07 19:25:42.000000000 +0100
+++ cryptonit-0.9.7/debian/rules        2008-06-07 19:25:43.000000000 +0100
@@ -38,7 +38,7 @@
 build-stamp: config.status 
        dh_testdir
        if [ ! -f libtool ] ; then cp -f /usr/bin/libtool . ; fi
-       $(MAKE) -j4
+       $(MAKE)
        touch build-stamp
 
 clean: clean1 
@@ -46,7 +46,7 @@
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -75,7 +75,8 @@
        dh_compress 
        dh_installman 
        dh_link usr/bin/Cryptonit usr/bin/cryptonit
-       dh_install src/gui/pics/folder_locked.{xpm,png} usr/share/pixmaps
+       dh_install src/gui/pics/folder_locked.xpm usr/share/pixmaps
+       dh_install src/gui/pics/folder_locked.png usr/share/pixmaps
        dh_installmenu
        dh_installdocs
        dh_strip

signature.asc
Description: PGP signature