[Pkg-sugar-commit] [sugar-datastore] 02/09: 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-0.104
in repository sugar-datastore.

commit 280f3e3d7b65fe9afbc20f4036ebba74f933973b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 14 18:00:02 2015 -0500

    Drop branch from source and binary package.
---
 debian/control.in    | 10 +++-------
 debian/control.in.in | 37 -------------------------------------
 debian/rules         | 17 ++---------------
 3 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 21279ee..19fac16 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: sugar-datastore-0.104
+Source: sugar-datastore
 Section: python
 Priority: optional
 Maintainer: Debian Sugar Team <pkg-sugar-devel at lists.alioth.debian.org>
@@ -11,7 +11,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-datastore.git
 Homepage: http://wiki.sugarlabs.org/go/Sugar
 XS-Python-Version: >= 2.7
 
-Package: python-carquinyol-0.104
+Package: python-carquinyol
 Architecture: any
 Depends: ${cdbs:Depends},
  ${misc:Depends},
@@ -19,11 +19,7 @@ Depends: ${cdbs:Depends},
  ${shlibs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
-Provides: ${cdbs:Provides},
- ${python:Provides}
-Breaks: ${cdbs:Breaks}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
+Provides: ${python:Provides}
 Description: Sugar Learning Platform - datastore
  Sugar Learning Platform promotes collaborative learning through Sugar
  Activities that encourage critical thinking, the heart of a quality
diff --git a/debian/control.in.in b/debian/control.in.in
deleted file mode 100644
index af607c9..0000000
--- a/debian/control.in.in
+++ /dev/null
@@ -1,37 +0,0 @@
-Source: sugar-datastore-__BRANCH__
-Section: python
-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-datastore.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-sugar/sugar-datastore.git
-Homepage: http://wiki.sugarlabs.org/go/Sugar
-XS-Python-Version: >= 2.7
-
-Package: python-carquinyol-__BRANCH__
-Architecture: any
-Depends: ${cdbs:Depends},
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Recommends: ${cdbs:Recommends}
-Suggests: ${cdbs:Suggests}
-Provides: ${cdbs:Provides},
- ${python:Provides}
-Breaks: ${cdbs:Breaks}
-Conflicts: ${cdbs:Conflicts}
-Replaces: ${cdbs:Replaces}
-Description: Sugar Learning Platform - datastore
- 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 a simple log like datastore able to connect with
- multiple backends.  The datastore supports connecting and disconnecting
- from backends on the fly to help the support the limit space/memory
- characteristics of the OLPC system and the fact that network services
- may become unavailable at times.
diff --git a/debian/rules b/debian/rules
index c8a769e..386eeb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,21 +16,13 @@
 # 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
-DEB_BUILDDIR = build
-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/class/python-autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-pkgbase = python-carquinyol
 pkgbranch = $(basename $(DEB_UPSTREAM_VERSION))
-pkg = $(pkgbase)-$(pkgbranch)
+pkg = python-carquinyol
 
 # Adapt packaging in maintainer mode when targeting experimental branch:
 #  * Switch git packaging branch
@@ -49,7 +41,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/sugar-datastore
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.xz
 
@@ -58,11 +50,6 @@ CDBS_DEPENDS_$(pkg) = python-gi, python-dbus, python-xapian, python-sugar3
 CDBS_DEPENDS_$(pkg) +=, gir1.2-glib-2.0
 CDBS_RECOMMENDS_$(pkg) = dbus
 
-# Ensure only one variant is installed at a time (Debian Policy 7.6.2)
-CDBS_PROVIDES_$(pkg) = $(pkgbase)
-CDBS_CONFLICTS_$(pkg) = $(pkgbase)
-CDBS_REPLACES_$(pkg) = $(pkgbase)
-
 # Ensure optimal hash-bang + dependency for scripts (see Python Policy)
 #  * TODO: drop cdbs_python_binary fallback when cdbs 0.5 is stable
 CDBS_DEPENDS_$(pkg) +=, python

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