r12186 - in /packages/unstable/gnome-app-install/debian: changelog control patches.debian/ patches.debian/01_debian_distro.patch patches.debian/03_desktop.patch patches/01_debian_distro.patch patches/03_desktop.patch rules
jak-guest at users.alioth.debian.org
jak-guest at users.alioth.debian.org
Wed Aug 1 18:39:48 UTC 2007
Author: jak-guest
Date: Wed Aug 1 18:39:48 2007
New Revision: 12186
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12186
Log:
* Merge the changelog entries from Ubuntu (0.4.5-0ubuntu1, 0.4.4ubuntu1)
* New patch structure:
- debian/patches/: Patches common to Debian and Ubuntu
- debian/patches.debian/: Patches specific to Debian
- debian/patches.ubuntu/: Patches specific to Ubuntu
- 01_fixicons.patch: Add patch to fix icons ending in .png,.svg,.xpm
* debian/patches.debian:
- 02_debian_distro.patch: Update of 01_debian_distro.patch
- 02_software-properties.patch, 04_documentation.patch: fixed upstream
Added:
packages/unstable/gnome-app-install/debian/patches.debian/
packages/unstable/gnome-app-install/debian/patches.debian/01_debian_distro.patch
- copied unchanged from r12184, packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch
packages/unstable/gnome-app-install/debian/patches.debian/03_desktop.patch
- copied unchanged from r12184, packages/unstable/gnome-app-install/debian/patches/03_desktop.patch
Removed:
packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch
packages/unstable/gnome-app-install/debian/patches/03_desktop.patch
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=12186&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Wed Aug 1 18:39:48 2007
@@ -2,12 +2,17 @@
[ Julian Andres Klode ]
* New upstream release
- * Merge the changelog entries from Ubuntu
* Use ubuntu-get-source and b-d on gnome-pkg-tools (>= 0.12.3)
+ * Merge the changelog entries from Ubuntu (0.4.5-0ubuntu1, 0.4.4ubuntu1)
+ * New patch structure:
+ - debian/patches/: Patches common to Debian and Ubuntu
+ - debian/patches.debian/: Patches specific to Debian
+ - debian/patches.ubuntu/: Patches specific to Ubuntu
* debian/patches:
- - 01_debian_distro.patch: Updated
- - 02_software-properties.patch, 04_documentation.patch: removed
-
+ - 01_fixicons.patch: Add patch to fix icons ending in .png,.svg,.xpm
+ * debian/patches.debian:
+ - 02_debian_distro.patch: Update of 01_debian_distro.patch
+ - 02_software-properties.patch, 04_documentation.patch: fixed upstream
[ Loic Minier ]
* Update watch file to trach non-native upstream tarballs.
* Output a warning for unknown distributions and default to Debian if
Modified: packages/unstable/gnome-app-install/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/control?rev=12186&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control (original)
+++ packages/unstable/gnome-app-install/debian/control Wed Aug 1 18:39:48 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>, Loic Minier <lool at dooz.org>
+Uploaders: Sebastian Heinlein <glatzor at ubuntu.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.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=12186&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/rules (original)
+++ packages/unstable/gnome-app-install/debian/rules Wed Aug 1 18:39:48 2007
@@ -12,13 +12,14 @@
ifeq ($(DISTRIBUTION), Ubuntu)
# Building on Ubuntu
- DEB_PATCHDIRS := debian/patches.ubuntu
+ DEB_PATCHDIRS := debian/patches 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 or derivatives
ifneq ($(DISTRIBUTION), Debian)
$(warning Unknown distribution $(DISTRIBUTION), defaulting to Debian settings)
endif
+ DEB_PATCHDIRS := debian/patches debian/patches.debian
ADDITIONAL_DEPS := python-gnome2-extras, python-sexy, update-manager
endif
More information about the pkg-gnome-commits
mailing list