r12177 - in /packages/unstable/gnome-app-install/debian: changelog control rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jul 31 15:58:42 2007
New Revision: 12177

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12177
Log:
* Output a warning for unknown distributions and default to Debian if
  lsb_release -si returns an empty string.

Modified:
    packages/unstable/gnome-app-install/debian/changelog
    packages/unstable/gnome-app-install/debian/control
    packages/unstable/gnome-app-install/debian/rules

Modified: packages/unstable/gnome-app-install/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/changelog?rev=12177&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Tue Jul 31 15:58:42 2007
@@ -10,8 +10,10 @@
 
   [ Loic Minier ]
   * Update watch file to trach non-native upstream tarballs.
-
- -- Loic Minier <lool at dooz.org>  Tue, 31 Jul 2007 17:54:27 +0200
+  * Output a warning for unknown distributions and default to Debian if
+    lsb_release -si returns an empty string.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 31 Jul 2007 17:58:15 +0200
  
 gnome-app-install (0.4.5-0ubuntu1) gutsy; urgency=low
 

Modified: packages/unstable/gnome-app-install/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/control?rev=12177&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control (original)
+++ packages/unstable/gnome-app-install/debian/control Tue Jul 31 15:58:42 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Julian Andres Klode <jak at jak-linux.org>
-Uploaders: Sebastian Heinlein <glatzor at ubuntu.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Sebastian Heinlein <glatzor at ubuntu.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
 Build-Depends: cdbs,
                debhelper (>= 5.0.38),
                gettext,

Modified: packages/unstable/gnome-app-install/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/rules?rev=12177&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/rules (original)
+++ packages/unstable/gnome-app-install/debian/rules Tue Jul 31 15:58:42 2007
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
 DEB_AUTO_CLEANUP_RCS := yes
 DEB_PYTHON_SYSTEM    := pycentral
-DISTRIBUTION         := $(shell lsb_release -i -s)
+DISTRIBUTION         := $(shell lsb_release -si)
+# defaults to Debian
+ifeq ($(DISTRIBUTION),)
+DISTRIBUTION := Debian
+endif
 
 # Include CDBS Stuff
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -15,7 +19,10 @@
 	DEB_PATCHDIRS   := debian/patches.ubuntu
 	ADDITIONAL_DEPS := app-install-data-commercial, python-gconf, python-gtkhtml2, python-launchpad-integration, sexy-python, software-properties-gtk
 else
-#Building on Debian
+# Building on Debian or derivatives
+ifneq ($(DISTRIBUTION), Debian)
+$(warning Unknown distribution $(DISTRIBUTION), defaulting to Debian settings)
+endif
 	ADDITIONAL_DEPS := python-gnome2-extras, python-sexy, update-manager
 endif