Merge branch 'macosx-app-bundle-1' of git://github.com/henrik242/subsurface

* 'macosx-app-bundle-1' of git://github.com/henrik242/subsurface:
  Use the new packaging directory for MacOSX specific files, and provide shell script workaround to make the svg icon reachable.
  Ignore process serial number argument when run as native MacOSX app
  Add basic MacOSX app bundle install target

diff --git a/Makefile b/Makefile
index 638758cd93aa546a62dcf142ebdf45f0252c3deb..ab7df0003b493071c777bd310e0dccdfce3f63ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,9 @@ install: $(NAME)
        $(INSTALL) $(DESKTOPFILE) $(DESKTOPDIR)
        $(INSTALL) -d -m 755 $(ICONDIR)
        $(INSTALL) $(ICONFILE) $(ICONDIR)
-       $(gtk_update_icon_cache)
+       @-if test -z "$(DESTDIR)"; then \
+               $(gtk_update_icon_cache); \
+       fi
        $(INSTALL) -d -m 755 $(MANDIR)
        $(INSTALL) -m 644 $(MANFILES) $(MANDIR)
 

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
new file mode 100644 (file)
index 0000000..875e3eb
--- /dev/null
+++ b/packaging/debian/changelog
@@ -0,0 +1,5 @@
+subsurface (1.1-20111026-git036fccd3-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Roland Dreier <roland@digitalvampire.org>  Tue, 25 Oct 2011 14:24:12 -0700

diff --git a/packaging/debian/compat b/packaging/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
+++ b/packaging/debian/compat
@@ -0,0 +1 @@
+8

diff --git a/packaging/debian/control b/packaging/debian/control
new file mode 100644 (file)
index 0000000..7c2aa36
--- /dev/null
+++ b/packaging/debian/control
@@ -0,0 +1,15 @@
+Source: subsurface
+Priority: optional
+Maintainer: Roland Dreier <roland@digitalvampire.org>
+Build-Depends: autoconf, automake, libtool, debhelper (>= 8), dh-autoreconf,
+ pkg-config, libgtk2.0-dev, libgconf2-dev, libxml2-dev, libdivecomputer-dev
+Standards-Version: 3.9.2
+Section: utils
+Homepage: http://subsurface.hohndel.org
+
+Package: subsurface
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: simple dive log program written in C
+ Subsurface is a simple dive log program written in C.

diff --git a/packaging/debian/copyright b/packaging/debian/copyright
new file mode 100644 (file)
index 0000000..cd049e0
--- /dev/null
+++ b/packaging/debian/copyright
@@ -0,0 +1,17 @@
+Initial Debianization:
+This package was debianized by Roland Dreier <roland@digitalvampire.org> on
+Tue, 25 Oct 2011 04:22:07 -0700.
+
+It was downloaded from git://subsurface.hohndel.org/subsurface.git
+
+Copyright:
+
+Copyright 2011 Linus Torvalds
+Copyright 2011 Dirk Hohndel
+
+License:
+
+GPLv2
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in the file '/usr/share/common-licenses/GPL-2'

diff --git a/packaging/debian/rules b/packaging/debian/rules
new file mode 100755 (executable)
index 0000000..e984e9b
--- /dev/null
+++ b/packaging/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+%:
+       dh $@

diff --git a/packaging/debian/source/format b/packaging/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/packaging/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)