[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: magic-haskell git vs. archive

Hi Marco,

Am Freitag, den 06.08.2010, 15:56 -0300 schrieb Marco Túlio Gontijo e
Silva:
> Excerpts from Joachim Breitner's message of Sex Ago 06 12:03:01 -0300 2010:
> (...)
> > Am Freitag, den 06.08.2010, 11:25 -0300 schrieb Marco Túlio Gontijo e
> > Silva:
> > > Excerpts from Joachim Breitner's message of Qui Ago 05 10:48:18 -0300 2010:
> > > (...)
> > > > I think something went wrong with the magic-haskell package. 
> > > > 1.0.8-4 in the archive has
> > > > Conflicts: magic-haskell-doc
> > > > while the git repository has
> > > > Conflicts: magic-haskell-doc (<< 1.0.8-4)
> > > > and that is tagged 1.0.8-4
> > > > 
> > > > The latter is better and would prevent magic-haskell-doc from appearing
> > > > at
> > > > http://edos.debian.net/edos-debcheck/results/unstable/1280981021/alpha/list.php#magic-haskell-doc
> > > > 
> > > > Any idea what went wrong?
> > > 
> > > No, probably some mistake mine.  I've created a new revision, which only
> > > includes this change.  I was going to build it, but the network connection
> > > where I am now is not very good, so I'll do it latter.
> > 
> > haskell-src-exts went through to testing, after I contacted ftp-master
> > (instead of the buildd admins or the release team). Unfortunately,
> > haskell-dummy did not migrate, because of the reason above:
> > http://release.debian.org/migration/testing.pl?package=haskell-dummy
> > 
> > Please ask for a freeze exception from d-release after uploading the
> > fixed magic-haskell. We really want haskell-dummy in squeeze...
> 
> Ok, magic-haskell is uploaded.  debian-release: Can you make an exception for
> magic-haskell, to make it possible for haskell-dummy to reach squeeze?

looks like there went something more wrong with the git archive.
Attached is the diff between the sources as uploaded to the archive. It
seems you have overwritten some of your previous changes. Maybe you
forgot to check them in back then?

Can you try again and then provide the release team with a diff between
1.0.8-4 and (probably) 1.0.8-6 that looks cleaner than this one. I’m
sure they’d prefer that :-)

Thanks,
Joachim

-- 
Joachim "nomeata" Breitner
Debian Developer
  nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata

reverted:
--- magic-haskell-1.0.8/debian/libghc6-magic-doc.docs
+++ magic-haskell-1.0.8.orig/debian/libghc6-magic-doc.docs
@@ -1,2 +0,0 @@
-dist/doc/html/*
-README
diff -u magic-haskell-1.0.8/debian/control magic-haskell-1.0.8/debian/control
--- magic-haskell-1.0.8/debian/control
+++ magic-haskell-1.0.8/debian/control
@@ -6,10 +6,8 @@
  cdbs,
  haskell-devscripts (>= 0.7),
  ghc6,
- ghc6-prof,
  libmagic-dev
-Build-Depends-Indep: ghc6-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Section: haskell
 Vcs-Git: git://git.debian.org/git/pkg-haskell/magic-haskell.git
 Vcs-Browser: http://git.debian.org/?p=pkg-haskell/magic-haskell.git;a=summary
@@ -22,30 +20,13 @@
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
 Description: File type determination library for Haskell
- This package provides a library for the Haskell programming language.
- See http://www.haskell.org/ for more information on Haskell.
- .
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
  rather than its name.  The Haskell interface provides a full-featured
  binding.
-
-Package: libghc6-magic-prof
-Section: haskell
-Architecture: any
-Depends: ${misc:Depends}, ${haskell:Depends}, ${shlibs:Depends}
-Recommends: ${haskell:Recommends}
-Suggests: ${haskell:Suggests}
-Provides: ${haskell:Provides}
-Description: File type determination library for Haskell; profiling libraries
- This package provides a library for the Haskell programming language,
- compiled for profiling.
- See http://www.haskell.org/ for more information on Haskell.
  .
- This package provides a Haskell interface to the C libmagic library.
- With it, you can determine the type of a file by examining its contents
- rather than its name.  The Haskell interface provides a full-featured
- binding.
+ This package is built for GHC.  A Hugs package is also available
+ in libhugs-magic.
 
 #Package: libhugs-magic
 #Section: haskell
@@ -68,14 +49,11 @@
-Recommends: ${haskell:Recommends}
-Suggests: ${haskell:Suggests}
 Provides: magic-haskell-doc
-Replaces: magic-haskell-doc
-Conflicts: magic-haskell-doc
-Description: File type determination library for Haskell; documentation
- This package provides the documentation for a library for the Haskell
- programming language.
- See http://www.haskell.org/ for more information on Haskell.
- .
+Replaces: magic-haskell-doc (<< 1.0.8-4)
+Conflicts: magic-haskell-doc (<< 1.0.8-4)
+Description: File type determination library for Haskell
  This package provides a Haskell interface to the C libmagic library.
  With it, you can determine the type of a file by examining its contents
  rather than its name.  The Haskell interface provides a full-featured
  binding.
+ .
+ This package provides documentation for the Haskell magic binding.
+
diff -u magic-haskell-1.0.8/debian/changelog magic-haskell-1.0.8/debian/changelog
--- magic-haskell-1.0.8/debian/changelog
+++ magic-haskell-1.0.8/debian/changelog
@@ -1,15 +1,19 @@
+magic-haskell (1.0.8-5) unstable; urgency=low
+
+  * debian/control: Make libghc6-magic-doc conflict with magic-haskell-
+    doc (<< 1.0.8-4).
+  * control: Bump Standards-Version to 3.9.0, no changes required.
+
+ -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Fri, 06 Aug 2010 15:02:39 -0300
+
 magic-haskell (1.0.8-4) unstable; urgency=low
 
-  * debian/control: libghc6-magic-doc: Add ${haskell:Recommends} and
-    Suggests variables.
-  * debian/control: libghc6-magic-doc: Replaces, Provides and Conflicts
-    with magic-haskell-doc.
+  * Rename -doc package.
 
- -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Sun, 14 Mar 2010 17:30:59 -0300
+ -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Thu, 06 May 2010 20:40:12 -0300
 
 magic-haskell (1.0.8-3) unstable; urgency=low
 
-  [ Iain Lane ]
   * debian/control:
     + Disable hugs library as the DHG no longer supports Hugs, and it does not
       work with the new Cabal. (Closes: #571360)
@@ -18,14 +22,7 @@
     + Clean up build-deps
     + Standards-Version bump to 3.8.4, no changes required
 
-  [ Marco Túlio Gontijo e Silva ]
-  * debian/control: Include Haskell preface in Description:.
-  * debian/control: Remove mention to libhugs-magic.
-  * debian/control: Include -prof package.
-  * Rename -doc package.
-  * debian/control: Include Build-Depends-Indep: in ghc6-doc.
-
- -- Marco Túlio Gontijo e Silva <marcot@debian.org>  Thu, 11 Mar 2010 17:57:34 -0300
+ -- Iain Lane <laney@ubuntu.com>  Thu, 11 Mar 2010 18:59:38 +0000
 
 magic-haskell (1.0.8-2) unstable; urgency=low
 
only in patch2:
unchanged:
--- magic-haskell-1.0.8.orig/debian/magic-haskell-doc.docs
+++ magic-haskell-1.0.8/debian/magic-haskell-doc.docs
@@ -0,0 +1,2 @@
+dist/doc/html/*
+README

Attachment: signature.asc
Description: This is a digitally signed message part

Reply to: