[Pkg-kde-commits] rev 1746 - in kde-extras: . digikam/tags digikam/tags/0.7.4-5/debian digikamimageplugins/branches/upstream digikamimageplugins/trunk/debian

[Mark Purcell]

Author: msp
Date: 2005-09-08 22:09:53 +0000 (Thu, 08 Sep 2005)
New Revision: 1746

Added:
   kde-extras/digikam/tags/0.7.4-5/
   kde-extras/digikamimageplugins/branches/upstream/0.8.0-beta1/
Removed:
   kde-extras/digikamimageplugins/branches/upstream/0beta1/
Modified:
   kde-extras/README
   kde-extras/digikam/tags/0.7.4-5/debian/changelog
   kde-extras/digikam/tags/0.7.4-5/debian/control
   kde-extras/digikamimageplugins/trunk/debian/changelog
Log:
Provide ubuntu example

Modified: kde-extras/README
===================================================================
--- kde-extras/README	2005-09-08 16:33:03 UTC (rev 1745)
+++ kde-extras/README	2005-09-08 22:09:53 UTC (rev 1746)
@@ -32,9 +32,16 @@
 The repository layout is:
 
 - packagename/
-    - trunk/
-    - branches/
-    - tags/
+    - trunk/
+    - branches/
+    - tags/
+        - 0.7.2-1/
+        - 0.7.2-2/
+        - 0.7.2-2ubuntu1/
+        - 0.7.2-2ubuntu2/
+        - 0.7.2-2ubuntu3/
+        - 0.8.0/
+        ...
 
 If only one version of the package is available at the time, development must 
 be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
@@ -43,8 +50,9 @@
 When, at some point, the need to have two different versions at the same time 
 arises (for example, if we need a version to be in unstable and a different one
 to be in experimental), experimental development will be made in trunk/ and 
-if a new unstable package needs to be cooked, copying tag/'latest_version_in_sid' 
-to tag/'latest_version_in_sid'+1 will make the trick.
+if a new unstable package needs to be cooked, copying 
+tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
+trick.
 
 3. Using svn-buildpackage
 --------------------------

Copied: kde-extras/digikam/tags/0.7.4-5 (from rev 1690, kde-extras/digikam/tags/0.7.4-4)

Modified: kde-extras/digikam/tags/0.7.4-5/debian/changelog
===================================================================
--- kde-extras/digikam/tags/0.7.4-4/debian/changelog	2005-09-05 15:09:23 UTC (rev 1690)
+++ kde-extras/digikam/tags/0.7.4-5/debian/changelog	2005-09-08 22:09:53 UTC (rev 1746)
@@ -1,3 +1,20 @@
+digikam (0.7.4-5) unstable; urgency=low
+
+  * Needs stuff from libdigikam-dev package - should depend on it
+    (Closes: #326786)
+  * debian/rules enable DEB_CONFIGURE_USER_FLAGS
+  * Renable debian/patches/visibility.diff for 0.7.4
+
+ -- Mark Purcell <msp at debian.org>  Mon,  5 Sep 2005 22:14:53 +0100
+
+digikam (0.8.0-0beta1-1) experimental; urgency=low
+
+  * New upstream release
+  * Beta package to experimental
+  * Backout Package split: libdigikam-dev & libdigikam0 (See #324592)
+
+ -- Mark Purcell <msp at debian.org>  Fri,  2 Sep 2005 22:06:04 +0100
+
 digikam (0.7.4-4) unstable; urgency=low
 
   * Add Depends: to libdigikam0 package as requested by NEW

Modified: kde-extras/digikam/tags/0.7.4-5/debian/control
===================================================================
--- kde-extras/digikam/tags/0.7.4-4/debian/control	2005-09-05 15:09:23 UTC (rev 1690)
+++ kde-extras/digikam/tags/0.7.4-5/debian/control	2005-09-08 22:09:53 UTC (rev 1746)
@@ -1,7 +1,7 @@
 Source: digikam
 Priority: optional
-Maintainer: Paul Telford <pxt at debian.org>
-Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>
 Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev (>= 4:3.4.2-1), libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libgdbm-dev, libkexif1-dev (>= 0.2.1-5), libkipi0-dev (>= 0.1.1-3), automake1.9
 Standards-Version: 3.6.2
 
@@ -11,7 +11,8 @@
 Depends: ${shlibs:Depends}
 Recommends: kdebase, digikamimageplugins, kipi-plugins
 Suggests: digikam-doc
-Conflicts: digikamimageplugins (<< 0.7.2.9999), kipi-plugins (<< 0.1+beta2-20)
+Conflicts: digikamimageplugins (<< 0.7.2.9999), kipi-plugins (<< 0.1+beta2-20), libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
+Replaces: libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating
@@ -29,34 +30,3 @@
  very useful extentions.
  .
  Homepage: http://www.digikam.org
-
-Package: libdigikam-dev
-Architecture: any
-Section: libdevel
-Conflicts: digikam (= 0.7.4-1)
-Replaces: digikam (= 0.7.4-1)
-Depends: libdigikam0 (= ${Source-Version})
-Description: digital photo management application for KDE
- Digikam is an easy to use and powerful digital photo management
- application, which makes importing, organizing and manipulating
- digital photos a "snap".  An easy to use interface is provided
- to connect to your digital camera, preview the images and download
- and/or delete them.
- .
- This package includes the development support files.
-
-Package: libdigikam0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: digikam (= 0.7.4-1)
-Replaces: digikam (= 0.7.4-1)
-Description: library for KDE to read/display/edit EXIF informations (runtime)
- Digikam is an easy to use and powerful digital photo management
- application, which makes importing, organizing and manipulating
- digital photos a "snap".  An easy to use interface is provided
- to connect to your digital camera, preview the images and download
- and/or delete them.
- .
- This package includes the necessary files to run programs linked against
- libdigikam.

Copied: kde-extras/digikamimageplugins/branches/upstream/0.8.0-beta1 (from rev 1696, kde-extras/digikamimageplugins/branches/upstream/0beta1)

Modified: kde-extras/digikamimageplugins/trunk/debian/changelog
===================================================================
--- kde-extras/digikamimageplugins/trunk/debian/changelog	2005-09-08 16:33:03 UTC (rev 1745)
+++ kde-extras/digikamimageplugins/trunk/debian/changelog	2005-09-08 22:09:53 UTC (rev 1746)
@@ -1,3 +1,9 @@
+digikamimageplugins (0.8.0-0beta1-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Mark Purcell <msp at debian.org>  Mon,  5 Sep 2005 18:43:58 +0100
+
 digikamimageplugins (0.8.0-0beta1-1) experimental; urgency=low
 
   * New Upstream Release