[Pkg-sugar-commit] [sugar-artwork] 03/07: Drop branch from source and binary package.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar-artwork.

commit 71eaf2df80da496d61b428ef814bb85fb254b1e3
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 14 19:14:09 2015 -0500

    Drop branch from source and binary package.
---
 debian/control.in    |  8 +++---
 debian/control.in.in | 69 ----------------------------------------------------
 debian/rules         | 21 ++++------------
 3 files changed, 9 insertions(+), 89 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index c07813c..cdee562 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: sugar-artwork-0.104
+Source: sugar-artwork
 Section: x11
 Priority: optional
 Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
@@ -10,7 +10,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-sugar/sugar-artwork
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-artwork.git
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 
-Package: sugar-0.104-themes
+Package: sugar-themes
 Architecture: all
 Multi-Arch: foreign
 Depends: ${cdbs:Depends},
@@ -29,7 +29,7 @@ Description: Sugar Learning Platform - artwork
  .
  This package contains the artwork for Sugar.
 
-Package: sugar-0.104-icon-theme
+Package: sugar-icon-theme
 Architecture: all
 Multi-Arch: foreign
 Depends: ${cdbs:Depends},
@@ -48,7 +48,7 @@ Description: Sugar Learning Platform - icon theme
  .
  This package contains the icon theme used with Sugar.
 
-Package: gtk2-engines-sugar-0.104
+Package: gtk2-engines-sugar
 Section: oldlibs
 Architecture: any
 Multi-Arch: same
diff --git a/debian/control.in.in b/debian/control.in.in
deleted file mode 100644
index dd0a0cc..0000000
--- a/debian/control.in.in
+++ /dev/null
@@ -1,69 +0,0 @@
-Source: sugar-artwork-__BRANCH__
-Section: x11
-Priority: optional
-Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr at jones.dk>,
- Santiago Ruano Rincón <santiago at debian.org>
-Build-Depends: @cdbs@
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-sugar/sugar-artwork
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-artwork.git
-Homepage: http://wiki.sugarlabs.org/go/Sugar
-
-Package: sugar-__BRANCH__-themes
-Architecture: all
-Multi-Arch: foreign
-Depends: ${cdbs:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: ${cdbs:Recommends}
-Suggests: ${cdbs:Suggests}
-Provides: ${cdbs:Provides}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
-Description: Sugar Learning Platform - artwork
- Sugar Learning Platform promotes collaborative learning through Sugar
- Activities that encourage critical thinking, the heart of a quality
- education.  Designed from the ground up especially for children, Sugar
- offers an alternative to traditional “office-desktop” software.
- .
- This package contains the artwork for Sugar.
-
-Package: sugar-__BRANCH__-icon-theme
-Architecture: all
-Multi-Arch: foreign
-Depends: ${cdbs:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: ${cdbs:Recommends}
-Provides: ${cdbs:Provides}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
-Breaks: ${cdbs:Breaks}
-Description: Sugar Learning Platform - icon theme
- Sugar Learning Platform promotes collaborative learning through Sugar
- Activities that encourage critical thinking, the heart of a quality
- education.  Designed from the ground up especially for children, Sugar
- offers an alternative to traditional “office-desktop” software.
- .
- This package contains the icon theme used with Sugar.
-
-Package: gtk2-engines-sugar-__BRANCH__
-Section: oldlibs
-Architecture: any
-Multi-Arch: same
-Depends: ${cdbs:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: ${cdbs:Recommends}
-Provides: ${cdbs:Provides}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
-Breaks: ${cdbs:Breaks}
-Description: Sugar Learning Platform - GTK+ 2.x theme engine
- Sugar Learning Platform promotes collaborative learning through Sugar
- Activities that encourage critical thinking, the heart of a quality
- education.  Designed from the ground up especially for children, Sugar
- offers an alternative to traditional “office-desktop” software.
- .
- This package contains the GTK+ theme engine for Sugar.
diff --git a/debian/rules b/debian/rules
index 0b11aa0..55887db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,22 +16,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# These need to be declared/run before CDBS includes
-pkgbranch = $(basename $(DEB_UPSTREAM_VERSION))
-debian/control:: debian/control.in
-DEB_PHONY_RULES += debian/control.in
-debian/control.in::
-	sed -e 's/__BRANCH__/$(pkgbranch)/g' <debian/control.in.in >debian/control.in
-
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-pkg = sugar-$(pkgbranch)-themes
-pkg-icon = sugar-$(pkgbranch)-icon-theme
-pkg-gtk2 = gtk2-engines-sugar-$(pkgbranch)
+pkgbranch = $(basename $(DEB_UPSTREAM_VERSION))
+pkg = sugar-themes
+pkg-icon = sugar-icon-theme
+pkg-gtk2 = gtk2-engines-sugar
 
 # Adapt packaging in maintainer mode when targeting experimental branch:
 #  * Switch git packaging branch
@@ -50,7 +44,7 @@ clean::
 		debian/gbp.conf
 endif
 
-DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE:%-$(pkgbranch)=%)
+DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
 DEB_UPSTREAM_URL = http://download.sugarlabs.org/sources/sucrose/glucose/$(DEB_UPSTREAM_PACKAGE)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.xz
 
@@ -85,11 +79,6 @@ CDBS_SUGGESTS_$(pkg) = $(suggests)
 
 define sugar-relations
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES_$($1) = $(subst -$(pkgbranch),,$($1))
-CDBS_CONFLICTS_$($1) = $(subst -$(pkgbranch),,$($1))
-CDBS_REPLACES_$($1) = $(subst -$(pkgbranch),,$($1))
-
 # Transitional quirk: split into engine and theme packages
 #  * needed only until Wheezy. TODO: Drop when Wheezy no longer supported
 CDBS_REPLACES_$($1) +=, $(obsoletes)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-artwork.git