[mate-sensors-applet] 07/12: debian/control: remove mate-sensors-applet-ati

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-sensors-applet.

commit cd29a7e5bd92e5a714a0d9f887737c51094fc9c6
Author: Martin Wimpress <code at flexion.org>
Date:   Sat Aug 1 23:17:15 2015 +0100

    debian/control: remove mate-sensors-applet-ati
---
 debian/changelog |  2 --
 debian/control   | 17 +----------------
 debian/rules     | 11 -----------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98e1352..cddd54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,10 @@ mate-sensors-applet (1.10.4-1~exp1) UNRELEASED; urgency=medium
     help is dfsg compliant.
   * debian/control:
     + Remove cdbs.
-    + Add mate-sensors-applet-ati package.
   * debian/mate-sensors-applet-common.install:
     + Add usr/share/help.
   * debian/rules:
     + Remove cdbs.
-    + Update to support mate-sesnors-applet-ati.
     + Remove dfsg suffix.
   * debian/watch:
     + Remove dfsg suffix.
diff --git a/debian/control b/debian/control
index 2b7cea7..f73e09c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Uploaders: Mike Gabriel <sunweaver at debian.org>,
            Martin Wimpress <code at flexion.org>,
 Build-Depends: debhelper (>= 9),
                docbook-xml,
-               fglrx | fglrx-driver,
                intltool,
                libatasmart-dev [!kfreebsd-i386 !kfreebsd-amd64],
                libcairo2-dev,
@@ -36,8 +35,7 @@ Depends: libmate-sensors-applet-plugin0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Recommends: hddtemp,
-Suggests: mate-sensors-applet-ati,
-          mate-sensors-applet-nvidia,
+Suggests: mate-sensors-applet-nvidia,
 Description: Display readings from hardware sensors in your MATE panel
  MATE Sensors Applet is an applet for the MATE panel that displays
  readings from hardware sensors, including temperatures, fan speeds and
@@ -86,19 +84,6 @@ Description: Display readings from hardware sensors in your MATE panel (NVIDIA s
  .
  This package contains plugin for NVIDIA graphics cards.
 
-Package: mate-sensors-applet-ati
-Architecture: any
-Depends: fglrx | fglrx-driver,
-         mate-sensors-applet (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Display readings from hardware sensors in your MATE panel (ATI sensors)
- MATE Sensors Applet is an applet for the MATE panel that displays
- readings from hardware sensors, including temperatures, fan speeds and
- voltage readings.
- .
- This package contains plugin for ATI graphics cards.
-
 Package: libmate-sensors-applet-plugin0
 Architecture: any
 Section: libs
diff --git a/debian/rules b/debian/rules
index 5673b7a..c346484 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,5 @@
 #!/usr/bin/make -f
 
-# add appropriate flags for Debian
-DEB_CONFIGURE_EXTRA_FLAGS =
-ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes)
-	DEB_CONFIGURE_EXTRA_FLAGS += --with-aticonfig=yes
-endif
-# add appropriate flags for Ubuntu
-ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
-	DEB_CONFIGURE_EXTRA_FLAGS += --with-aticonfig=/usr/lib/fglrx/bin/aticonfig
-endif
-
 DHFLAGS=--parallel
 
 %:
@@ -26,7 +16,6 @@ override_dh_auto_configure:
 	NOCONFIGURE=1 ./autogen.sh
 	dh_auto_configure $(DHFLAGS) -- \
 		--libexecdir=/usr/lib/mate-sensors-applet \
-		$(DEB_CONFIGURE_EXTRA_FLAGS) \
 		--with-nvidia=yes \
 		--with-gtk=2.0
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-sensors-applet.git