r12198 - in /packages/unstable/gnome-app-install/debian: changelog control control.in patches.debian/ patches.ubuntu/ patches/02_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 21:17:04 UTC 2007 

Author: jak-guest
Date: Wed Aug  1 21:17:04 2007
New Revision: 12198

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12198
Log:
* remove ubuntu stuff

Added:
    packages/unstable/gnome-app-install/debian/patches/02_debian_distro.patch
      - copied unchanged from r12197, packages/unstable/gnome-app-install/debian/patches.debian/02_debian_distro.patch
    packages/unstable/gnome-app-install/debian/patches/03_desktop.patch
      - copied unchanged from r12197, packages/unstable/gnome-app-install/debian/patches.debian/03_desktop.patch
Removed:
    packages/unstable/gnome-app-install/debian/patches.debian/
    packages/unstable/gnome-app-install/debian/patches.ubuntu/
Modified:
    packages/unstable/gnome-app-install/debian/changelog
    packages/unstable/gnome-app-install/debian/control
    packages/unstable/gnome-app-install/debian/control.in
    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=12198&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Wed Aug  1 21:17:04 2007
@@ -3,17 +3,16 @@
   [ Julian Andres Klode ]
   * New upstream release
   * 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_fixicons.patch: Add patch to fix icons ending in .png,.svg,.xpm
-  * debian/patches.debian:
+  * Merge the changelog entries from Ubuntu:
+    - 0.4.5-0ubuntu1
+    - 0.4.4ubuntu1
+  * New/updated patches:
+    - 01_fixicons.patch: Add patch to fix icons ending in png,svg,xpm
     - 02_debian_distro.patch: Update of 01_debian_distro.patch
-    - 02_software-properties.patch, 04_documentation.patch: fixed upstream
-
+  * Removed patches:
+    - 02_software-properties.patch
+    - 04_documentation.patch
+    
   [ 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=12198&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control (original)
+++ packages/unstable/gnome-app-install/debian/control Wed Aug  1 21:17:04 2007
@@ -8,7 +8,6 @@
                gettext,
                gnome-pkg-tools (>= 0.12.3),
                intltool,
-               lsb-release,
                python,
                python-central (>= 0.5),
                python-distutils-extra (>= 1.90)
@@ -19,7 +18,6 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         ${distro:Depends},
          app-install-data (>= 0.4.0),
          gksu,
          gnome-icon-theme,
@@ -27,10 +25,13 @@
          python-dbus,
          python-gdbm,
          python-glade2 (>= 2.4.0),
+         python-gnome2-extras,
          python-gst0.10,
          python-gtk2 (>= 2.10.1),
+         python-sexy,
          python-xdg (>= 0.8),
-         synaptic (>= 0.57.8)
+         synaptic (>= 0.57.8),
+         update-manager   
 XB-Python-Version: ${python:Versions}
 Description: GNOME Application Installer
  A pretty application installer for GNOME. It can also search for mime

Modified: packages/unstable/gnome-app-install/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/control.in?rev=12198&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control.in (original)
+++ packages/unstable/gnome-app-install/debian/control.in Wed Aug  1 21:17:04 2007
@@ -8,7 +8,6 @@
                gettext,
                gnome-pkg-tools (>= 0.12.3),
                intltool,
-               lsb-release,
                python,
                python-central (>= 0.5),
                python-distutils-extra (>= 1.90)
@@ -19,7 +18,6 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         ${distro:Depends},
          app-install-data (>= 0.4.0),
          gksu,
          gnome-icon-theme,
@@ -27,10 +25,13 @@
          python-dbus,
          python-gdbm,
          python-glade2 (>= 2.4.0),
+         python-gnome2-extras,
          python-gst0.10,
          python-gtk2 (>= 2.10.1),
+         python-sexy,
          python-xdg (>= 0.8),
-         synaptic (>= 0.57.8)
+         synaptic (>= 0.57.8),
+         update-manager   
 XB-Python-Version: ${python:Versions}
 Description: GNOME Application Installer
  A pretty application installer for GNOME. It can also search for mime

Modified: packages/unstable/gnome-app-install/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/rules?rev=12198&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/rules (original)
+++ packages/unstable/gnome-app-install/debian/rules Wed Aug  1 21:17:04 2007
@@ -1,20 +1,6 @@
 #!/usr/bin/make -f
 DEB_AUTO_CLEANUP_RCS := yes
 DEB_PYTHON_SYSTEM    := pycentral
-DISTRIBUTION         := $(shell lsb_release -si)
-
-ifeq ($(DISTRIBUTION), Ubuntu)
-# Building on 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
 
 # Include CDBS Stuff
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -23,14 +9,11 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
 
-
-
 clean::
 	rm -rf build
 	rm -f AppInstall/Version.py
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	echo "distro:Depends=$(ADDITIONAL_DEPS)" >> debian/$(cdbs_curpkg).substvars
 	dh_scrollkeeper -p$(cdbs_curpkg) $(DEB_DH_SCROLLKEEPER_ARGS)
 	dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS)
 	dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)

More information about the pkg-gnome-commits mailing list