From e3548e95d7413c441071a38748b0dbbb8da76a58 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:50:44 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for poppler-data --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 1ef2c4bdd92d60ad44c6a76f860bdb31c366a3c6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 1 May 2010 20:17:36 +0000 Subject: [PATCH 2/3] - poppler-data-0.4.2 --- .cvsignore | 2 +- poppler-data.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0b21167..2390bf9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -poppler-data-0.4.0.tar.gz +poppler-data-0.4.2.tar.gz diff --git a/poppler-data.spec b/poppler-data.spec index 99ab50e..29b2be5 100644 --- a/poppler-data.spec +++ b/poppler-data.spec @@ -1,7 +1,7 @@ Summary: Encoding files Name: poppler-data -Version: 0.4.0 +Version: 0.4.2 Release: 1%{?dist} # The cMap data files installed by the poppler-data package are # under the COPYING.adobe license @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 01 2010 Rex Dieter - 0.4.2-1 +- poppler-data-0.4.2 + * Mon Dec 14 2009 Rex Dieter - 0.4.0-1 - poppler-data-0.4.0 diff --git a/sources b/sources index 634be2c..5ccb66e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6975bf8e9ea2cfb42b9ecdbcc257cf57 poppler-data-0.4.0.tar.gz +4b7598072bb95686f58bdadc4f09715c poppler-data-0.4.2.tar.gz From d8d8c8e2e15fa8e7b0090f051ce9b9ef92c46650 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:36:04 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0284f50..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: poppler-data -# $Id: Makefile,v 1.1 2009/07/30 22:58:43 tibbs Exp $ -NAME := poppler-data -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index bd03d94..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -poppler-data-0_2_1-1_fc11:HEAD:poppler-data-0.2.1-1.fc11.src.rpm:1249316128