Add python to depends, add lintian-overrides file

diff --git a/debian/control b/debian/control
index be57bd3..878f391 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.grml.org/?p=grml2usb.git
 
 Package: grml2usb
 Architecture: all
 
 Package: grml2usb
 Architecture: all

-Depends: ${shlibs:Depends}, ${misc:Depends}, syslinux
+Depends: ${shlibs:Depends}, ${misc:Depends}, syslinux, python

 Description: install grml system to usb device
  This script installs a grml ISO to an USB device to be able to boot from it.
  Make sure you have at least one grml ISO or a running grml system (/live/image)
 Description: install grml system to usb device
  This script installs a grml ISO to an USB device to be able to boot from it.
  Make sure you have at least one grml ISO or a running grml system (/live/image)

diff --git a/debian/overrides b/debian/overrides
new file mode 100644 (file)
index 0000000..b4e7844
--- /dev/null
+++ b/debian/overrides
@@ -0,0 +1,6 @@
+grml2usb: arch-dependent-file-in-usr-share ./usr/share/grml2usb/lilo/lilo.static.amd64
+grml2usb: arch-dependent-file-in-usr-share ./usr/share/grml2usb/lilo/lilo.static.i386
+grml2usb: arch-independent-package-contains-binary-or-object ./usr/share/grml2usb/lilo/lilo.static.amd64
+grml2usb: arch-independent-package-contains-binary-or-object ./usr/share/grml2usb/lilo/lilo.static.i386
+grml2usb: statically-linked-binary ./usr/share/grml2usb/lilo/lilo.static.amd64
+grml2usb: statically-linked-binary ./usr/share/grml2usb/lilo/lilo.static.i386

diff --git a/debian/rules b/debian/rules
index cc6e494..25422bc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,16 +25,16 @@ clean:
 
        # Add here commands to clean up after the build process.
        $(MAKE) clean
 
        # Add here commands to clean up after the build process.
        $(MAKE) clean

-       dh_clean 
+       dh_clean

 
 install: build
        dh_testdir
        dh_testroot
 
 install: build
        dh_testdir
        dh_testroot

-       dh_clean -k 
+       dh_clean -k

        dh_installdirs usr/share/grml2usb/lilo usr/share/grml2usb/grub
 
        # Add here commands to install the package into debian/grml2usb.
        dh_installdirs usr/share/grml2usb/lilo usr/share/grml2usb/grub
 
        # Add here commands to install the package into debian/grml2usb.

-       install -m 755 grml2usb               debian/grml2usb/usr/sbin/
+       install -m 755 grml2usb.py            debian/grml2usb/usr/sbin/grml2usb

        install -m 755 lilo/lilo.static.i386  debian/grml2usb//usr/share/grml2usb/lilo/lilo.static.i386
        install -m 755 lilo/lilo.static.amd64 debian/grml2usb//usr/share/grml2usb/lilo/lilo.static.amd64
        install -m 644 grub/splash.xpm.gz     debian/grml2usb/usr/share/grml2usb/grub/splash.xpm.gz
        install -m 755 lilo/lilo.static.i386  debian/grml2usb//usr/share/grml2usb/lilo/lilo.static.i386
        install -m 755 lilo/lilo.static.amd64 debian/grml2usb//usr/share/grml2usb/lilo/lilo.static.amd64
        install -m 644 grub/splash.xpm.gz     debian/grml2usb/usr/share/grml2usb/grub/splash.xpm.gz


@@ -48,12 +48,14 @@ binary-arch: build install
 binary-indep: build install
        dh_testdir
        dh_testroot
 binary-indep: build install
        dh_testdir
        dh_testroot

-       dh_installchangelogs 
+       dh_installchangelogs

        dh_installdocs
        dh_installman grml2usb.8
        dh_link
        dh_strip
        dh_compress
        dh_installdocs
        dh_installman grml2usb.8
        dh_link
        dh_strip
        dh_compress

+       mkdir -p debian/grml2usb/usr/share/lintian/overrides/
+       cp -av debian/overrides debian/grml2usb/usr/share/lintian/overrides/grml2usb

        dh_fixperms
        dh_installdeb
        dh_shlibdeps
        dh_fixperms
        dh_installdeb
        dh_shlibdeps